From 395ddbd3189b290bd28a3ac4aafa52108bca8e7d Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@acm.org>
Date: Sun, 10 Feb 2013 17:24:46 -0600
Subject: [PATCH] [libpng17] Fix typos of PNG_GET_PALLETE_MAX_SUPPORTED

in png.h and pnglibconf.dfa
---
 png.h                  | 6 +++---
 scripts/pnglibconf.dfa | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/png.h b/png.h
index 08e8fa74e..36968be86 100644
--- a/png.h
+++ b/png.h
@@ -3204,14 +3204,14 @@ PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
  *  END OF SIMPLIFIED API
  ******************************************************************************/
 
-#if defined(PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED)
+#ifdef 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_GET_PALETTE_MAX_SUPPORTED)
+#  ifdef PNG_GET_PALETTE_MAX_SUPPORTED
 PNG_EXPORT(243, int, png_get_palette_max, (png_const_structrp png_ptr,
     png_const_inforp info_ptr));
 #  endif
-#endif
+#endif /* CHECK_FOR_INVALID_INDEX */
 
 /* Maintainer: Put new public prototypes here ^, in libpng.3, and project
  * defs
diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa
index 309bd342e..2d6289812 100644
--- a/scripts/pnglibconf.dfa
+++ b/scripts/pnglibconf.dfa
@@ -809,13 +809,13 @@ option INFO_IMAGE
 
 option CHECK_FOR_INVALID_INDEX enables READ_CHECK_FOR_INVALID_INDEX
 option CHECK_FOR_INVALID_INDEX enables WRITE_CHECK_FOR_INVALID_INDEX
-option READ_CHECK_FOR_INVALID_INDEX requires READ, CHECK_FOR_INVALID_INDEX
-option WRITE_CHECK_FOR_INVALID_INDEX requires WRITE, CHECK_FOR_INVALID_INDEX
+option READ_CHECK_FOR_INVALID_INDEX requires READ disabled
+option WRITE_CHECK_FOR_INVALID_INDEX requires WRITE disabled
 
 # added at libpng-1.5.15
 option GET_PALETTE_MAX enables READ_GET_PALETTE_MAX, WRITE_GET_PALETTE_MAX
-option READ_GET_PALETTE_MAX requires READ_CHECK_FOR_INVALID_INDEX
-option WRITE_GET_PALETTE_MAX requires WRITE_CHECK_FOR_INVALID_INDEX
+option READ_GET_PALETTE_MAX requires READ_CHECK_FOR_INVALID_INDEX disabled
+option WRITE_GET_PALETTE_MAX requires WRITE_CHECK_FOR_INVALID_INDEX disabled
 
 # Simplified API options (added at libpng-1.6.0)
 # Read: