X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=createpdf.pl;h=249b217e5afddc80fee5fdcb5db144009d40bbb9;hb=HEAD;hp=f33bbc5f6c95443fda34ef5168f6a22d7b5eb324;hpb=b943073892273418899c8187f9055d7faede1a0d;p=webpdf

diff --git a/createpdf.pl b/createpdf.pl
index f33bbc5..249b217 100755
--- a/createpdf.pl
+++ b/createpdf.pl
@@ -57,10 +57,15 @@ if ($cgi->param('preset') eq 'screen') {
 
 if ($url =~ /^http/i) {
 	$outname = "web.pdf";
+	my @options = ("-f");
+
+	if (defined($cgi->param('color'))) {
+		push @options, "-c";
+	}
 
 	# Render through Gecko
 	$ENV{'DISPLAY'} = $pdfweb::config::xserver;
-	system("gnome-web-print", $url, "$pdfweb::config::outputdir/$pdf_filename.ps");
+	system("gnome-web-print", @options, $url, "$pdfweb::config::outputdir/$pdf_filename.ps");
 	system("gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - < $pdfweb::config::outputdir/$pdf_filename.ps >&2");
 } elsif ($filename =~ /(.*)\.(?:e?ps|pdf)$/i) {
 	$outname = "$1.pdf";
@@ -153,24 +158,26 @@ EOF
 	exit;
 }
 
-# Make a thumbnail from the finished PDF, for later reference. (Output to
-# stdout is so we make sure we get only the first page; it's the simplest
-# hack I can find offhand. :-) )
-system("convert -resize 192x192 output/$pdf_filename png:- > output/$pdf_filename.png");
-open DESC, ">output/$pdf_filename.desc";
+my $size = -s "output/$pdf_filename";
 
-if ($url =~ /^http/i) {
-	$url =~ tr/\n//d;
-	print DESC "$url\n";
-} else {
-	$filename =~ tr/\n//d;
-	print DESC "$filename\n";
-}
+if (defined($size) && $size > 0) {
+	# Make a thumbnail from the finished PDF, for later reference. (Output to
+	# stdout is so we make sure we get only the first page; it's the simplest
+	# hack I can find offhand. :-) )
+	system("convert -resize 192x192 output/$pdf_filename png:- | convert png:- png:- > output/$pdf_filename.png");
+	open DESC, ">output/$pdf_filename.desc";
+
+	if ($url =~ /^http/i) {
+		$url =~ tr/\n//d;
+		print DESC "$url\n";
+	} else {
+		$filename =~ tr/\n//d;
+		print DESC "$filename\n";
+	}
 
-close DESC;
+	close DESC;
+}
 	
-my $size = -s "output/$pdf_filename";
-
 (my $sanitized_outname = $outname) =~ tr/a-zA-Z0-9. -/_/c;
 
 print "Content-type: application/pdf\n";