From 88c5a2a068171684eb27d53770f3cd2361b19556 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Sun, 10 Feb 2013 16:39:55 -0600
Subject: [PATCH] [libpng16] Fixed typo in png.h #ifdef

---
 ANNOUNCE               | 1 +
 CHANGES                | 1 +
 png.h                  | 6 ++----
 scripts/pnglibconf.dfa | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 8fa986a3f..d31121c52 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -622,6 +622,7 @@ Version 1.6.0rc07 [February 10, 2013]
     block, and revised pnglibconf.h and pnglibconf.h.prebuilt accordingly.
 
 Version 1.6.0rc08 [February 10, 2013]
+  Fix typo in png.h #ifdef
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index a1e1e1b23..a2442585d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4376,6 +4376,7 @@ Version 1.6.0rc07 [February 10, 2013]
     block, and revised pnglibconf.h and pnglibconf.h.prebuilt accordingly.
 
 Version 1.6.0rc08 [February 10, 2013]
+  Fix typo in png.h #ifdef
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/png.h b/png.h
index 951e5aeb1..0e993afa2 100644
--- a/png.h
+++ b/png.h
@@ -3199,12 +3199,10 @@ PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
  *  END OF SIMPLIFIED API
  ******************************************************************************/
 
-#if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \
-    defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)
+#if defined(PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED)
 PNG_EXPORT(242, void, png_set_check_for_invalid_index,
     (png_structrp png_ptr, int allowed));
-#if defined(PNG_READ_GET_PALETTE_MAX_SUPPORTED) || \
-    defined(PNG_READ_GET_PALETTE_MAX_SUPPORTED)
+#if defined(PNG_GET_PALETTE_MAX_SUPPORTED)
 PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
     png_const_infop info_ptr));
 #endif
diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa
index 1422ae370..abcdd4469 100644
--- a/scripts/pnglibconf.dfa
+++ b/scripts/pnglibconf.dfa
@@ -780,8 +780,8 @@ option WRITE_CHECK_FOR_INVALID_INDEX requires WRITE CHECK_FOR_INVALID_INDEX
 # added at libpng-1.5.15
 option GET_PALETTE_MAX enables READ_GET_PALETTE_MAX
 option GET_PALETTE_MAX enables WRITE_GET_PALETTE_MAX
-option READ_GET_PALETTE_MAX requires CHECK_FOR_INVALID_INDEX
-option WRITE_GET_PALETTE_MAX requires CHECK_FOR_INVALID_INDEX
+option READ_GET_PALETTE_MAX requires READ_CHECK_FOR_INVALID_INDEX
+option WRITE_GET_PALETTE_MAX requires WRITE_CHECK_FOR_INVALID_INDEX
 
 # Simplified API options (added at libpng-1.6.0)
 # Read:
-- 
GitLab