]> granicus.if.org Git - imagemagick/commitdiff
Disable new libpng-1.5.10 palette-checking feature
authorglennrp <glennrp@git.imagemagick.org>
Wed, 6 Jun 2012 21:03:14 +0000 (21:03 +0000)
committerglennrp <glennrp@git.imagemagick.org>
Wed, 6 Jun 2012 21:03:14 +0000 (21:03 +0000)
coders/png.c

index 53a769800f0430ed48db7166ce4953835e5bada3..cdf0e8a4f431f51d379fd690ed238c5d13572a7f 100644 (file)
@@ -2259,6 +2259,11 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
   png_set_read_user_chunk_fn(ping, image, read_vpag_chunk_callback);
 #endif
 
+#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
+    /* Disable new libpng-1.5.10 feature */
+    png_set_check_for_invalid_index (ping, 0);
+#endif
+
 #if (PNG_LIBPNG_VER < 10400)
 #  if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) && \
    (PNG_LIBPNG_VER >= 10200) && (PNG_LIBPNG_VER < 10220) && defined(__i386__)
@@ -8969,6 +8974,12 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
   /*
     Prepare PNG for writing.
   */
+
+#ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
+    /* Disable new libpng-1.5.10 feature */
+    png_set_check_for_invalid_index (ping, 0);
+#endif
+
 #if defined(PNG_MNG_FEATURES_SUPPORTED)
   if (mng_info->write_mng)
      (void) png_permit_mng_features(ping,PNG_ALL_MNG_FEATURES);