From e9c8dcf96c455707a804dd7821fd6910b8822c93 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Sat, 10 Oct 2009 08:13:01 -0500
Subject: [PATCH] [master] Revised pngconf.h to make it easier to enable iTXt
 support

by defining PNG_iTXT_SUPPORTED
---
 ANNOUNCE  |  1 +
 CHANGES   |  1 +
 pngconf.h | 18 ++++++++++--------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 6bad3967..5e262654 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -61,6 +61,7 @@ version 1.2.41beta04 [October 7, 2009]
   Eliminated a shadowed declaration of "pp" in png_handle_sPLT().
 
 version 1.2.41beta05 [October 10, 2009]
+  Revised pngconf.h to make it easier to enable iTXt support.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 
diff --git a/CHANGES b/CHANGES
index 045254ef..e01a4b89 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2491,6 +2491,7 @@ version 1.2.41beta04 [October 7, 2009]
   Eliminated a shadowed declaration of "pp" in png_handle_sPLT().
 
 version 1.2.41beta05 [October 10, 2009]
+  Revised pngconf.h to make it easier to enable iTXt support.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngconf.h b/pngconf.h
index ca813584..47932a0e 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -494,14 +494,16 @@
  */
 
 #if defined(PNG_1_0_X) || defined (PNG_1_2_X)
-#  ifndef PNG_NO_iTXt_SUPPORTED
-#    define PNG_NO_iTXt_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_iTXt
-#    define PNG_NO_READ_iTXt
-#  endif
-#  ifndef PNG_NO_WRITE_iTXt
-#    define PNG_NO_WRITE_iTXt
+#  ifndef PNG_iTXt_SUPPORTED
+#    ifndef PNG_NO_iTXt_SUPPORTED
+#      define PNG_NO_iTXt_SUPPORTED
+#    endif
+#    ifndef PNG_NO_READ_iTXt
+#      define PNG_NO_READ_iTXt
+#    endif
+#    ifndef PNG_NO_WRITE_iTXt
+#      define PNG_NO_WRITE_iTXt
+#    endif
 #  endif
 #endif