From f97ed91eadd92a05d7e6c05e198a7949046a9efe Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Thu, 23 Feb 2012 23:06:07 -0600
Subject: [PATCH] [libpng15] Always set the "safe" limits in pngconf.h when
 SAFE_LIMITS is

even if pnglibconf.h has been edited to remove the limits.
---
 pngconf.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pngconf.h b/pngconf.h
index e11862452..82cd6ef15 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -26,20 +26,23 @@
 #ifdef PNG_SAFE_LIMITS_SUPPORTED
 #  ifdef PNG_USER_WIDTH_MAX
 #    undef PNG_USER_WIDTH_MAX
-#    define PNG_USER_WIDTH_MAX 1000000L
 #  endif
+#  define PNG_USER_WIDTH_MAX 1000000L
+
 #  ifdef PNG_USER_HEIGHT_MAX
 #    undef PNG_USER_HEIGHT_MAX
-#    define PNG_USER_HEIGHT_MAX 1000000L
 #  endif
+#  define PNG_USER_HEIGHT_MAX 1000000L
+
 #  ifdef PNG_USER_CHUNK_MALLOC_MAX
 #    undef PNG_USER_CHUNK_MALLOC_MAX
-#    define PNG_USER_CHUNK_MALLOC_MAX 4000000L
 #  endif
+#  define PNG_USER_CHUNK_MALLOC_MAX 4000000L
+
 #  ifdef PNG_USER_CHUNK_CACHE_MAX
 #    undef PNG_USER_CHUNK_CACHE_MAX
-#    define PNG_USER_CHUNK_CACHE_MAX 128
 #  endif
+#  define PNG_USER_CHUNK_CACHE_MAX 128
 #endif
 
 #ifndef PNG_BUILDING_SYMBOL_TABLE