Changeset 8510

Timestamp:

06/27/12 07:35:17 (12 months ago)

Author:

glennrp

Message:

Don't try to use Z_RLE compression strategy with old zlib that does not

support it.

Location:

ImageMagick/branches/ImageMagick-6

Files:

• ChangeLog (modified) (1 diff)
• coders/png.c (modified) (1 diff)

ImageMagick/branches/ImageMagick-6/ChangeLog

@@ +1 @@
+2012-06-26  6.7.7-10 Glenn Randers-Pehrson <glennrp@image...>
+  * Don't attempt to use Z_RLE compression strategy with old zlib (prior to
+    zlib-1.2.0) that does not support it.
+
 2012-06-25  6.7.7-10 Cristy  <quetzlzacatenango@image...>
   * Permit linear RGB for PNM and TIFF image formats.

ImageMagick/branches/ImageMagick-6/coders/png.c

@@ -9819 +9819 @@
     {
         if ((quality %10) == 8 || (quality %10) == 9)
-            mng_info->write_png_compression_strategy=Z_RLE;
+#ifdef Z_RLE  /* Z_RLE was added to zlib-1.2.0 */
+          mng_info->write_png_compression_strategy=Z_RLE+1;
+#else
+          mng_info->write_png_compression_strategy = Z_DEFAULT_STRATEGY+1;
+#endif
     }