r145 - in trunk/debian: . patches

[Ludovic Rousseau]

Author: rousseau
Date: 2012-06-09 15:32:10 +0000 (Sat, 09 Jun 2012)
New Revision: 145

Added:
   trunk/debian/patches/35_bins_jpeg
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
Fix "Original .png files result in .jpg files but containing PNG
data" convert any input file format as "JPEG" output (Closes: #235272)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-01-03 15:00:54 UTC (rev 144)
+++ trunk/debian/changelog	2012-06-09 15:32:10 UTC (rev 145)
@@ -1,3 +1,10 @@
+bins (1.1.29-14) unstable; urgency=low
+
+  * Fix "Original .png files result in .jpg files but containing PNG
+    data" convert any input file format as "JPEG" output (Closes: #235272)
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Sat, 09 Jun 2012 17:19:28 +0200
+
 bins (1.1.29-13) unstable; urgency=low
 
   * debian/control: add Depends: ${misc:Depends}

Added: trunk/debian/patches/35_bins_jpeg
===================================================================
--- trunk/debian/patches/35_bins_jpeg	                        (rev 0)
+++ trunk/debian/patches/35_bins_jpeg	2012-06-09 15:32:10 UTC (rev 145)
@@ -0,0 +1,28 @@
+Author: bur ito <buritomath at yahoo.com>
+Description: convert any input file format as "JPEG" output
+Bug-Debian: http://bugs.debian.org/235272
+
+--- a/bins
++++ b/bins
+@@ -3566,6 +3566,13 @@
+                 # make it writable in case $origName was r/o
+                 chmod(0644, "$albumdir$newName") == 1
+                     or die("\nCannot set write permission on $albumdir$newName: $?");
++
++                my($preview_tmp) = Image::Magick->new;
++                my($x_tmp) = $preview_tmp->Read("$albumdir$newName"); # read in the picture
++                $preview_tmp->Set("magick" => "JPEG");
++                $x = $preview_tmp->Write("$albumdir$newName");
++                warn "$x" if "$x";
++
+                 beVerboseN("done.", 2);
+                 return 1;
+             }
+@@ -3593,6 +3600,7 @@
+         warn "$x" if "$x";
+     }
+     beVerbose("\n    Writing scaled image $albumdir$newName... ", 3);
++    $preview->Set("magick" => "JPEG");
+     $x = $preview->Write("$albumdir$newName");
+     warn "$x" if "$x";
+     beVerboseN("done.", 2);

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2010-01-03 15:00:54 UTC (rev 144)
+++ trunk/debian/patches/series	2012-06-09 15:32:10 UTC (rev 145)
@@ -19,3 +19,4 @@
 21_bins-trim
 22_bins-hash-ref
 34_bins.1
+35_bins_jpeg