diff --git a/LICENSE b/LICENSE index ce35504016729981742e3fd1e5468b9dd60329eb..c6c233edea9e0629e2590ef77430d34c0f53aff9 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0beta13, February 19, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta13, February 24, 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 19, 2012 +February 24, 2012 diff --git a/README b/README index ddf1d49c96533115d83a3339eebdbbcbd41fd3ea..6f2ef2cb49f95fdf26f7574a4990462bb4f29c9f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.0beta13 - February 19, 2012 (shared library 16.0) +README for libpng version 1.6.0beta13 - February 24, 2012 (shared library 16.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/contrib/pngminim/decoder/pngusr.dfa b/contrib/pngminim/decoder/pngusr.dfa index 70d528bc9f98ec80c60111627154a2fe58b35152..e8f200238d3b2cee7b81241285e6267f91e8105e 100644 --- a/contrib/pngminim/decoder/pngusr.dfa +++ b/contrib/pngminim/decoder/pngusr.dfa @@ -37,3 +37,5 @@ option SETJMP on option STDIO on option READ_EXPAND on option READ_STRIP_16_TO_8 on +option USER_LIMITS on +@#define PNG_SECURE diff --git a/libpng-manual.txt b/libpng-manual.txt index 693d7df82ab97b283273a1142e96f980f3193d67..64d897566a444c157a0e5e80d0888b75dfc7c6af 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.0beta13 - February 19, 2012 + libpng version 1.6.0beta13 - February 24, 2012 Updated and distributed by Glenn Randers-Pehrson 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.6.0beta13 - February 19, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta13 - February 24, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4979,7 +4979,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -February 19, 2012 +February 24, 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 4187f364b2ad4e1c447e130971fa2581da5d1a5a..22a313e23c6b14fbd4b3c80278e934d0fb46b86d 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "February 19, 2012" +.TH LIBPNG 3 "February 24, 2012" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta13 .SH SYNOPSIS @@ -1003,7 +1003,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.6.0beta13 - February 19, 2012 + libpng version 1.6.0beta13 - February 24, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -1014,7 +1014,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.0beta13 - February 19, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta13 - February 24, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5983,7 +5983,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -February 19, 2012 +February 24, 2012 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6251,7 +6251,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.0beta13 - February 19, 2012: +Libpng version 1.6.0beta13 - February 24, 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 +6274,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0beta13, February 19, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta13, February 24, 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 +6373,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 19, 2012 +February 24, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 77f30e27b910b5c8d8f7bb1c5cf86c01490ac550..4a4f702284b924f9c3674d1e97fe9be077df7fe0 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "February 19, 2012" +.TH LIBPNGPF 3 "February 24, 2012" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta13 (private functions) diff --git a/png.5 b/png.5 index ec587cd231bde4cf81d35c7a33dd609aeb5eeb1a..7f607f38ef90ae4ce473cbe6c8f916b97e9f5944 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "February 19, 2012" +.TH PNG 5 "February 24, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index e21c04c1ce91a0e684bfe6bb5e60728702334189..170f1f9cb9ce28f7696b474ed651bcc57182e46e 100644 --- a/png.c +++ b/png.c @@ -762,13 +762,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.0beta13 - February 19, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.6.0beta13 - February 24, 2012" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2012 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.6.0beta13 - February 19, 2012\ + return "libpng version 1.6.0beta13 - February 24, 2012\ Copyright (c) 1998-2012 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 bf49bf84c5fcc5e2563876db4e0d635381c6aca2..42b8e5ec797e25a1fac31a9e7da7e6a7e383d9e7 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.0beta13 - February 19, 2012 + * libpng version 1.6.0beta13 - February 24, 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.6.0beta13 - February 19, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.6.0beta13 - February 24, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -198,7 +198,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta13, February 19, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta13, February 24, 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: @@ -310,7 +310,7 @@ * Y2K compliance in libpng: * ========================= * - * February 19, 2012 + * February 24, 2012 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -376,7 +376,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.0beta13" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.0beta13 - February 19, 2012\n" + " libpng version 1.6.0beta13 - February 24, 2012\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngusr.dfa b/pngusr.dfa index f366cd6d65e5e04f6e4560a04f259fbfc69393c0..9d39564b51de632bbcb5a80ec12de73b99903a00 100644 --- a/pngusr.dfa +++ b/pngusr.dfa @@ -5,12 +5,10 @@ # 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) -@#ifdef PNG_SECURE -@ /* Relatively secure values */ -@# 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 -@#endif +# 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 60f11f253846c3b3fc02cc9a0d89daafce6c7a9a..d60b2e78aaed3ec90872b6eccd5a7ef48f5e3057 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.0beta13 - February 19, 2012 +libpng version 1.6.0beta13 - February 24, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 806e42c6e7363b74750807639b14eb519d0396fb..aa87aebf60eedd014542db72cb5f53da861fda10 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@