Upgraded ImageMagick on cirkus, so no problems with PDF output from ImageMagick anymore.

diff --git a/createpdf.pl b/createpdf.pl
index 34cd9f425ccddc682e2bd77c904a8d1deb884f27..8bece1ce8182857e30952eb6a617c8186c5a3cc6 100755 (executable)
--- a/createpdf.pl
+++ b/createpdf.pl
@@ -70,7 +70,7 @@ if ($filename =~ /(.*)\.(?:e?ps|pdf)$/i) {
        $outname = "$1.pdf";
 
        # Run through ImageMagick first of all, then gs
-       open PIPE, "| convert $2:- ps:- | gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - >&2"
+       open PIPE, "| convert $2:- pdf:- | gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - >&2"
                 or die "convert: $!";
 
        my ($buf, $ret);

diff --git a/index.html b/index.html
index fbc5ed0a830dcf5cf192f5e8983443cad5c86a74..beb72c84da333b4836c6f876a07521c64e7bf64a 100644 (file)
--- a/index.html
+++ b/index.html
@@ -80,9 +80,7 @@
     <ul>
       <li>PostScript (.ps) and Encapsulated PostScript (.pdf), via GS directly</li>
       <li>Plain text (.txt), via mpage</li>
-      <li>BMP (.bmp), PNG (.png), JPEG (.jpg/.jpeg), XPM (.xpm), via <a href="http://www.imagemagick.com">ImageMagick</a>
-        (somewhat odd image placement for now due to bugs in Debian sarge's
-       version of ImageMagick).</li>
+      <li>BMP (.bmp), PNG (.png), JPEG (.jpg/.jpeg), XPM (.xpm), via <a href="http://www.imagemagick.com">ImageMagick</a>.</li>
       <li>Microsoft Word (.doc), Excel (.xls) and PowerPoint (.ppt), via
         <a href="http://www.openoffice.org">OpenOffice.org</a> (could be
        slightly sketchy at times, let me know if it's broken).</li>