From 66c1ec5a26eaacbfaf86336afba8e8e23cfdf42d Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Tue, 23 Dec 2014 14:18:36 -0600
Subject: [PATCH] [libpng16] Removed duplicate PNG_SAFE_LIMITS_SUPPORTED
 handling from pngconf.h

---
 ANNOUNCE  |  5 +++--
 CHANGES   |  3 ++-
 pngconf.h | 22 +---------------------
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 30b31dce4..946b53f87 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.17beta01 - December 22, 2014
+Libpng 1.6.17beta01 - December 23, 2014
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -25,7 +25,8 @@ Other information:
 
 Changes since the last public release (1.6.16):
 
-Version 1.6.17beta01 [December 22, 2014]
+Version 1.6.17beta01 [December 23, 2014]
+  Removed duplicate PNG_SAFE_LIMITS_SUPPORTED handling from pngconf.h
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 55085d8eb..f2ddc1a18 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5125,7 +5125,8 @@ Version 1.6.16rc03 [December 21, 2014]
 Version 1.6.16 [December 22, 2014]
   No changes.
 
-Version 1.6.17beta01 [December 22, 2014]
+Version 1.6.17beta01 [December 23, 2014]
+  Removed duplicate PNG_SAFE_LIMITS_SUPPORTED handling from pngconf.h
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngconf.h b/pngconf.h
index b84ec2162..798518ae7 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.6.17beta01,December 22, 2014
+ * libpng version 1.6.17beta01,December 23, 2014
  *
  * Copyright (c) 1998-2014 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -22,26 +22,6 @@
 #ifndef PNGCONF_H
 #define PNGCONF_H
 
-/* To do: Do all of this in scripts/pnglibconf.dfa */
-#ifdef PNG_SAFE_LIMITS_SUPPORTED
-#  ifdef PNG_USER_WIDTH_MAX
-#    undef PNG_USER_WIDTH_MAX
-#    define PNG_USER_WIDTH_MAX 1000000L
-#  endif
-#  ifdef PNG_USER_HEIGHT_MAX
-#    undef PNG_USER_HEIGHT_MAX
-#    define PNG_USER_HEIGHT_MAX 1000000L
-#  endif
-#  ifdef PNG_USER_CHUNK_MALLOC_MAX
-#    undef PNG_USER_CHUNK_MALLOC_MAX
-#    define PNG_USER_CHUNK_MALLOC_MAX 4000000L
-#  endif
-#  ifdef PNG_USER_CHUNK_CACHE_MAX
-#    undef PNG_USER_CHUNK_CACHE_MAX
-#    define PNG_USER_CHUNK_CACHE_MAX 128
-#  endif
-#endif
-
 #ifndef PNG_BUILDING_SYMBOL_TABLE /* else includes may cause problems */
 
 /* From libpng 1.6.0 libpng requires an ANSI X3.159-1989 ("ISOC90") compliant C