[libpng16] Updated Makefile.in
Added information about the new limits in the manual.
diff --git a/ANNOUNCE b/ANNOUNCE
index ef7d2db..7aebfb5 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.6.0beta14 - February 24, 2012
+Libpng 1.6.0beta14 - February 25, 2012
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.
@@ -224,12 +224,15 @@
pngpread.c and use the sequential png_handle_tEXt, etc., in pngrutil.c;
now that png_ptr->buffer is inaccessible to applications, the special
handling is no longer useful.
- Added PNG_SAFE_LIMITS feature to pnglibconf.dfa, pngpriv.h, and new pngusr.dfa
- to reset the user limits to safe ones if PNG_SAFE_LIMITS is defined.
- To enable, use CPPFLAGS=-DPNG_SAFE_LIMITS on the configure command
- or put #define PNG_SAFE_LIMITS_SUPPORTED in pnglibconf.h.prebuilt.
+ Added PNG_SAFE_LIMITS feature to pnglibconf.dfa, pngpriv.h, and new
+ pngusr.dfa to reset the user limits to safe ones if PNG_SAFE_LIMITS is
+ defined. To enable, use "CPPFLAGS=-DPNG_SAFE_LIMITS_SUPPORTED=1" on the
+ configure command or put #define PNG_SAFE_LIMITS_SUPPORTED in
+ pnglibconf.h.prebuilt and pnglibconf.h.
-Version 1.6.0beta14 [February 24, 2012]
+Version 1.6.0beta14 [February 25, 2012]
+ Added information about the new limits in the manual.
+ Updated Makefile.in
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 296edb3..465281d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3976,12 +3976,15 @@
pngpread.c and use the sequential png_handle_tEXt, etc., in pngrutil.c;
now that png_ptr->buffer is inaccessible to applications, the special
handling is no longer useful.
- Added PNG_SAFE_LIMITS feature to pnglibconf.dfa, pngpriv.h, and new pngusr.dfa
- to reset the user limits to safe ones if PNG_SAFE_LIMITS is defined.
- To enable, use CPPFLAGS=-DPNG_SAFE_LIMITS on the configure command
- or put #define PNG_SAFE_LIMITS_SUPPORTED in pnglibconf.h.prebuilt.
+ Added PNG_SAFE_LIMITS feature to pnglibconf.dfa, pngpriv.h, and new
+ pngusr.dfa to reset the user limits to safe ones if PNG_SAFE_LIMITS is
+ defined. To enable, use "CPPFLAGS=-DPNG_SAFE_LIMITS_SUPPORTED=1" on the
+ configure command or put #define PNG_SAFE_LIMITS_SUPPORTED in
+ pnglibconf.h.prebuilt and pnglibconf.h.
-Version 1.6.0beta14 [February 24, 2012]
+Version 1.6.0beta14 [February 25, 2012]
+ Added information about the new limits in the manual.
+ Updated Makefile.in
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/Makefile.am b/Makefile.am
index 035786c..0f48056 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,7 @@
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngerror.c\
pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c pngrutil.c\
pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c\
- png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h
+ png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h pngusr.dfa
if PNG_ARM_NEON
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += arm/filter_neon.S
@@ -184,11 +184,11 @@
mv $*.tf3 $@
# The .dfn file for pnglibconf.h is machine generated
-pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pnguser.dfa$(DFA_XTRA)
+pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA)
rm -f $@ $*.tf[45]
$(AWK) -f ${srcdir}/scripts/options.awk out=$*.tf4 version=search\
${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
- ${srcdir}/pngusr.dfa $(DFA_XTRA) 1>&2
+ ${srcdir}/pngusr.dfa $(DFA_XTRA) 1>&2
$(AWK) -f ${srcdir}/scripts/options.awk out=$*.tf5 $*.tf4 1>&2
rm $*.tf4
mv $*.tf5 $@
diff --git a/libpng-manual.txt b/libpng-manual.txt
index 829a075..ab49fc0 100644
--- a/libpng-manual.txt
+++ b/libpng-manual.txt
@@ -1,6 +1,6 @@
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.6.0beta14 - February 24, 2012
+ libpng version 1.6.0beta14 - February 25, 2012
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.6.0beta14 - February 24, 2012
+ libpng versions 0.97, January 1998, through 1.6.0beta14 - February 25, 2012
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -4639,6 +4639,20 @@
that it could be used to override them. Now this function will reduce or
increase the limits.
+Starting in libpng-1.5.10, the user limits can be set en masse with the
+configuration option PNG_SAFE_LIMITS_SUPPORTED. If this option is enabled,
+a set of "safe" limits is applied in pngpriv.h. These can be overridden by
+application calls to png_set_user_limits(), png_set_user_chunk_cache_max(),
+and/or png_set_user_malloc_max() that increase or decrease the limits. Also,
+in libpng-1.5.10 the default width and height limits were increased
+from 1,000,000 to 0x7ffffff (i.e., made unlimited). Therefore, the
+limits are now
+ default safe
+ png_user_width_max 0x7fffffff 1,000,000
+ png_user_height_max 0x7fffffff 1,000,000
+ png_user_chunk_cache_max 0 (unlimited) 128
+ png_user_chunk_malloc_max 0 (unlimited) 8,000,000
+
B. Changes to the build and configuration of libpng
Details of internal changes to the library code can be found in the CHANGES
@@ -4979,7 +4993,7 @@
XVI. Y2K Compliance in libpng
-February 24, 2012
+February 25, 2012
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
diff --git a/libpng.3 b/libpng.3
index 1017d13..1452b09 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "February 24, 2012"
+.TH LIBPNG 3 "February 25, 2012"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta14
.SH SYNOPSIS
@@ -1003,7 +1003,7 @@
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.6.0beta14 - February 24, 2012
+ libpng version 1.6.0beta14 - February 25, 2012
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -1014,7 +1014,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.6.0beta14 - February 24, 2012
+ libpng versions 0.97, January 1998, through 1.6.0beta14 - February 25, 2012
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -5643,6 +5643,20 @@
that it could be used to override them. Now this function will reduce or
increase the limits.
+Starting in libpng-1.5.10, the user limits can be set en masse with the
+configuration option PNG_SAFE_LIMITS_SUPPORTED. If this option is enabled,
+a set of "safe" limits is applied in pngpriv.h. These can be overridden by
+application calls to png_set_user_limits(), png_set_user_chunk_cache_max(),
+and/or png_set_user_malloc_max() that increase or decrease the limits. Also,
+in libpng-1.5.10 the default width and height limits were increased
+from 1,000,000 to 0x7ffffff (i.e., made unlimited). Therefore, the
+limits are now
+ default safe
+ png_user_width_max 0x7fffffff 1,000,000
+ png_user_height_max 0x7fffffff 1,000,000
+ png_user_chunk_cache_max 0 (unlimited) 128
+ png_user_chunk_malloc_max 0 (unlimited) 8,000,000
+
B. Changes to the build and configuration of libpng
Details of internal changes to the library code can be found in the CHANGES
@@ -5983,7 +5997,7 @@
.SH XVI. Y2K Compliance in libpng
-February 24, 2012
+February 25, 2012
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -6251,7 +6265,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.6.0beta14 - February 24, 2012:
+Libpng version 1.6.0beta14 - February 25, 2012:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -6274,7 +6288,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.6.0beta14, February 24, 2012, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.0beta14, February 25, 2012, are
Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
@@ -6373,7 +6387,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-February 24, 2012
+February 25, 2012
.\" end of man page