From: glennrp <glennrp@git.imagemagick.org>
Date: Wed, 6 Jun 2012 21:03:14 +0000 (+0000)
Subject: Disable new libpng-1.5.10 palette-checking feature
X-Git-Tag: 7.0.1-0~5484
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9bf97b6c2143eb20c330346b01e82102cc082725;p=imagemagick

Disable new libpng-1.5.10 palette-checking feature
---

diff --git a/coders/png.c b/coders/png.c
index 53a769800..cdf0e8a4f 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -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);