[libpng15] Imported from libpng-1.5.10beta02.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index bafd00e..355cc1f 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.5.10beta02 - February 25, 2012
+Libpng 1.5.10beta02 - February 27, 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.
@@ -42,7 +42,7 @@
Revised the SAFE_LIMITS feature to be the same as the feature in libpng16.
Added information about the new limits in the manual.
-Version 1.5.10beta02 [February 25, 2012]
+Version 1.5.10beta02 [February 27, 2012]
Updated Makefile.in
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
diff --git a/CHANGES b/CHANGES
index efe4d47..f7ab968 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3827,7 +3827,7 @@
Revised the SAFE_LIMITS feature to be the same as the feature in libpng16.
Added information about the new limits in the manual.
-Version 1.5.10beta02 [February 25, 2012]
+Version 1.5.10beta02 [February 27, 2012]
Updated Makefile.in
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
diff --git a/LICENSE b/LICENSE
index bae3062..8779a1e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.5.10beta02, February 24, 2012, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.10beta02, February 27, 2012, are
Copyright (c) 2004, 2006-2011 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
@@ -108,4 +108,4 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-February 24, 2012
+February 27, 2012
diff --git a/Makefile.in b/Makefile.in
index ebc8bc6..2ff35f7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -102,7 +102,7 @@
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 arm/filter_neon.S
+ pngpriv.h pngstruct.h arm/filter_neon.S pngusr.dfa
@PNG_ARM_NEON_TRUE@am__objects_1 = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la-filter_neon.lo
am_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS = \
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la-png.lo \
@@ -356,7 +356,7 @@
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 $(am__append_1)
+ pngstruct.h pngusr.dfa $(am__append_1)
nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_CPPFLAGS = @LIBPNG_DEFINES@
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined \
@@ -1373,11 +1373,11 @@
mv dfn3.out $@
# The .dfn file for pnglibconf.h is machine generated
-pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
+pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA)
rm -f $@ dfn?.out
$(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out version=search\
${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
- $(DFA_XTRA) 1>&2
+ ${srcdir}/pngusr.dfa $(DFA_XTRA) 1>&2
$(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2
rm dfn1.out
mv dfn2.out $@
diff --git a/README b/README
index 6f15a72..c66c5bf 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.5.10beta02 - February 24, 2012 (shared library 15.0)
+README for libpng version 1.5.10beta02 - February 27, 2012 (shared library 15.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
diff --git a/libpng-manual.txt b/libpng-manual.txt
index 3f287ef..fafab35 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.5.10beta02 - February 25, 2012
+ libpng version 1.5.10beta02 - February 27, 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.5.10beta02 - February 25, 2012
+ libpng versions 0.97, January 1998, through 1.5.10beta02 - February 27, 2012
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -4587,7 +4587,7 @@
XIV. Y2K Compliance in libpng
-February 25, 2012
+February 27, 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 e559672..127538c 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "February 25, 2012"
+.TH LIBPNG 3 "February 27, 2012"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.10beta02
.SH SYNOPSIS
@@ -977,7 +977,7 @@
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.5.10beta02 - February 25, 2012
+ libpng version 1.5.10beta02 - February 27, 2012
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -988,7 +988,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.5.10beta02 - February 25, 2012
+ libpng versions 0.97, January 1998, through 1.5.10beta02 - February 27, 2012
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -5565,7 +5565,7 @@
.SH XIV. Y2K Compliance in libpng
-February 25, 2012
+February 27, 2012
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -5839,7 +5839,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.5.10beta02 - February 25, 2012:
+Libpng version 1.5.10beta02 - February 27, 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).
@@ -5862,7 +5862,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.5.10beta02, February 25, 2012, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.10beta02, February 27, 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
@@ -5961,7 +5961,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-February 25, 2012
+February 27, 2012
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 50ab7ec..2dfef3f 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "February 24, 2012"
+.TH LIBPNGPF 3 "February 27, 2012"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.10beta02
(private functions)
diff --git a/png.5 b/png.5
index 7f607f3..a1f376a 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "February 24, 2012"
+.TH PNG 5 "February 27, 2012"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 6b0dac5..e840d84 100644
--- a/png.c
+++ b/png.c
@@ -655,13 +655,13 @@
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.5.10beta02 - February 24, 2012" PNG_STRING_NEWLINE \
+ "libpng version 1.5.10beta02 - February 27, 2012" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE;
# else
- return "libpng version 1.5.10beta02 - February 24, 2012\
+ return "libpng version 1.5.10beta02 - February 27, 2012\
Copyright (c) 1998-2011 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
diff --git a/png.h b/png.h
index ca940f6..9deee51 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.5.10beta02 - February 24, 2012
+ * libpng version 1.5.10beta02 - February 27, 2012
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -11,7 +11,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- * libpng versions 0.97, January 1998, through 1.5.10beta02 - February 24, 2012: Glenn
+ * libpng versions 0.97, January 1998, through 1.5.10beta02 - February 27, 2012: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -204,7 +204,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.5.10beta02, February 24, 2012, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.5.10beta02, February 27, 2012, are
* Copyright (c) 2004, 2006-2012 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:
@@ -316,7 +316,7 @@
* Y2K compliance in libpng:
* =========================
*
- * February 24, 2012
+ * February 27, 2012
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -382,7 +382,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.5.10beta02"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.5.10beta02 - February 24, 2012\n"
+ " libpng version 1.5.10beta02 - February 27, 2012\n"
#define PNG_LIBPNG_VER_SONUM 15
#define PNG_LIBPNG_VER_DLLNUM 15
diff --git a/pngconf.h b/pngconf.h
index b171877..cb64ffa 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.5.10beta02 - February 24, 2012
+ * libpng version 1.5.10beta02 - February 27, 2012
*
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngusr.dfa b/pngusr.dfa
new file mode 100644
index 0000000..9d39564
--- /dev/null
+++ b/pngusr.dfa
@@ -0,0 +1,14 @@
+# pngusr.dfa
+#
+# Build time configuration of libpng
+#
+# Enter build configuration options in this file
+#
+# Security settings: by default these limits are unset, you can change them
+# here by entering the appropriate values as #defines preceded by '@' (to cause,
+# them to be passed through to the build of pnglibconf.h), for example:
+#
+# @# define PNG_USER_WIDTH_MAX 1000000
+# @# define PNG_USER_HEIGHT_MAX 1000000
+# @# define PNG_USER_CHUNK_CACHE_MAX 128
+# @# define PNG_USER_CHUNK_MALLOC_MAX 8000000
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 8532f99..a504a45 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.5.10beta02 - February 24, 2012
+libpng version 1.5.10beta02 - February 27, 2012
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index bd8b477..30b6f80 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
- * libpng version 1.5.10beta02 - February 24, 2012
+ * libpng version 1.5.10beta02 - February 27, 2012
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 4ba37e2..4442de3 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.5.10beta02 - February 24, 2012
+Makefiles for libpng version 1.5.10beta02 - February 27, 2012
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
diff --git a/scripts/options.awk b/scripts/options.awk
index a8dff04..9ef98bc 100755
--- a/scripts/options.awk
+++ b/scripts/options.awk
@@ -42,7 +42,7 @@
comment=start cx # Comment start
cend="*/" end # Comment end
def=start "#define PNG_" ct # Arbitrary define
- sup=ct "_SUPPORTED" end # end supported option
+ sup=ct "_SUPPORTED 1" end # end supported option
und=comment "#undef PNG_" ct # Unsupported option
une=ct "_SUPPORTED" cend # end unsupported option
error=start "ERROR:" # error message
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 8e81d80..5846fac 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -3,7 +3,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng 1.5.10beta02 - February 25, 2012 */
+/* Libpng 1.5.10beta02 - February 27, 2012 */
/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
