diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-02-26 21:40:37 -0600 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-02-26 21:51:19 -0600 |
commit | b40411882acc2f9391a294413f12c96ddc7e79c4 (patch) | |
tree | 78d8df82db685d681aef78122bacd5c7331d2d67 | |
parent | 755c39725e8d898d53c4a5b05237098e9bac89fd (diff) | |
download | libpng-1.5.10beta02.tar.gz |
[libpng15] Imported from libpng-1.5.10beta02.tarv1.5.10beta02
-rw-r--r-- | ANNOUNCE | 4 | ||||
-rw-r--r-- | CHANGES | 2 | ||||
-rw-r--r-- | LICENSE | 4 | ||||
-rw-r--r-- | Makefile.in | 8 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | libpng-manual.txt | 6 | ||||
-rw-r--r-- | libpng.3 | 14 | ||||
-rw-r--r-- | libpngpf.3 | 2 | ||||
-rw-r--r-- | png.5 | 2 | ||||
-rw-r--r-- | png.c | 4 | ||||
-rw-r--r-- | png.h | 10 | ||||
-rw-r--r-- | pngconf.h | 2 | ||||
-rw-r--r-- | pngusr.dfa | 14 | ||||
-rw-r--r-- | projects/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
-rw-r--r-- | scripts/README.txt | 2 | ||||
-rwxr-xr-x | scripts/options.awk | 2 | ||||
-rw-r--r-- | scripts/pnglibconf.h.prebuilt | 2 |
18 files changed, 49 insertions, 35 deletions
@@ -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 @@ Version 1.5.10beta01 [February 24, 2012] 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: @@ -3827,7 +3827,7 @@ Version 1.5.10beta01 [February 24, 2012] 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 @@ -10,7 +10,7 @@ this sentence. 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 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 24, 2012 +February 27, 2012 diff --git a/Makefile.in b/Makefile.in index ebc8bc61c..2ff35f74a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -102,7 +102,7 @@ am__libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES_DIST = 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 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 @@ 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 $(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 @@ contrib/libtests/pngvalid.o pngtest.o: pnglibconf.h 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 $@ @@ -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 3f287ef24..fafab356d 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 @@ libpng-manual.txt - A description on how to use and modify libpng 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 @@ Other rules can be inferred by inspecting the libpng source. 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. @@ -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 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .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 @@ libpng-manual.txt - A description on how to use and modify libpng 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 @@ Other rules can be inferred by inspecting the libpng source. .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 @@ possible without all of you. 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 sentence. 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 @@ certification mark of the Open Source Initiative. 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 50ab7ec4a..2dfef3ff0 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) @@ -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 @@ -655,13 +655,13 @@ png_get_copyright(png_const_structp png_ptr) #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."; @@ -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 @@ -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 000000000..9d39564b5 --- /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 8532f99c5..a504a4531 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 bd8b477a1..30b6f80d9 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 4ba37e26d..4442de310 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 a8dff044a..9ef98bc8e 100755 --- a/scripts/options.awk +++ b/scripts/options.awk @@ -42,7 +42,7 @@ BEGIN{ 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 8e81d80a2..5846fac49 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 */ |