[Pgp-tools-commit] r900 - in trunk: debian gpgsigs

[Guilhem Moulin]

Author: guilhem
Date: 2018-01-29 10:33:26 +0000 (Mon, 29 Jan 2018)
New Revision: 900

Modified:
   trunk/debian/changelog
   trunk/gpgsigs/gpgsigs
Log:
gpgsigs: Set UAT density to 90dpi so XeLaTeX doesn't complain that the image is too large

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2017-08-10 15:48:31 UTC (rev 899)
+++ trunk/debian/changelog	2018-01-29 10:33:26 UTC (rev 900)
@@ -4,6 +4,9 @@
     + Add support for ECDH, ECDSA and EDDSA key types.
     + Align key type & size listing to the GnuPG 2.1.x output (e.g.,
       "rsa4096/DEADBEEF" instead of "4096R/DEADBEEF").
+  * gpgsigs:
+    + Set UAT (jpeg photos) density to 90dpi so XeLaTeX doesn't complain that
+      the image is too large.
 
  -- Guilhem Moulin <guilhem at debian.org>  Thu, 10 Aug 2017 11:40:03 -0400
 

Modified: trunk/gpgsigs/gpgsigs
===================================================================
--- trunk/gpgsigs/gpgsigs	2017-08-10 15:48:31 UTC (rev 899)
+++ trunk/gpgsigs/gpgsigs	2018-01-29 10:33:26 UTC (rev 900)
@@ -288,9 +288,11 @@
 
 	if ($latex) {
 		$uat->{file} = "${key}_".($#uats - $#found).".jpg";
-		open my $pic, '>:raw', $uat->{file} or die "Couldn't open: $!";
+		my $pid = open my $pic, '|-', 'convert', 'jpg:-', '-density', 90, $uat->{file} or die "Can't run convert(1)\n";
 		print $pic (substr $chunk, 16);
 		close $pic;
+		waitpid $pid, 0;
+		warn "convert(1) exited with value ".($? >> 8)."\n" if $?;
 	}
 }
 close $photosfd if $latex;
@@ -337,8 +339,10 @@
 
 sub getChecksum ($$) {
 	my ($algo, $infile) = @_;
-	open MD, '-|', $ENV{GNUPGBIN} // 'gpg', qw/--with-colons --print-md/, $algo, $infile or warn "Can't get gpg $algo digest\n";
+	my $pid = open MD, '-|', $ENV{GNUPGBIN} // 'gpg', qw/--with-colons --print-md/, $algo, $infile or warn "Can't get gpg $algo digest\n";
 	my $digest = <MD>;
+	waitpid $pid, 0;
+	warn "gpg(1) exited with value ".($? >> 8)."\n" if $?;
 	close MD;
 	return $1 if $digest and $digest =~ /:([0-9A-F]+):[^:]*$/;
 }