From 6db8e4dd11f4e496f41c70a3acca8a3fe1308bdc Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@acm.org>
Date: Sun, 10 Feb 2013 17:49:25 -0600
Subject: [PATCH] [libpng16] Fixed inconsistencies in png.h and pnglibconf.dfa

---
 png.h                  | 8 ++++----
 pngget.c               | 4 ++--
 scripts/pnglibconf.dfa | 7 +++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/png.h b/png.h
index 0e993afa2..155f761e7 100644
--- a/png.h
+++ b/png.h
@@ -3199,14 +3199,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_structp png_ptr,
     png_const_infop info_ptr));
-#endif
-#endif
+#  endif
+#endif /* CHECK_FOR_INVALID_INDEX */
 
 /* Maintainer: Put new public prototypes here ^, in libpng.3, and project
  * defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt
diff --git a/pngget.c b/pngget.c
index b93ed43ea..dfecce785 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1162,7 +1162,7 @@ png_get_io_chunk_type (png_const_structrp png_ptr)
 #endif /* ?PNG_IO_STATE_SUPPORTED */
 
 #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#ifdef PNG_GET_PALETTE_MAX_SUPPORTED
+#  ifdef PNG_GET_PALETTE_MAX_SUPPORTED
 int PNGAPI
 png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr)
 {
@@ -1171,7 +1171,7 @@ png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr)
 
    return (-1);
 }
-#endif
+#  endif
 #endif
 
 #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa
index abcdd4469..60f6e2bb3 100644
--- a/scripts/pnglibconf.dfa
+++ b/scripts/pnglibconf.dfa
@@ -778,10 +778,9 @@ option READ_CHECK_FOR_INVALID_INDEX requires READ CHECK_FOR_INVALID_INDEX
 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 READ_CHECK_FOR_INVALID_INDEX
-option WRITE_GET_PALETTE_MAX requires WRITE_CHECK_FOR_INVALID_INDEX
+option GET_PALETTE_MAX enables READ_GET_PALETTE_MAX WRITE_GET_PALETTE_MAX
+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: