diff --git a/ANNOUNCE b/ANNOUNCE index c3edcfb6136fc2e06f9a143b77ee61a19fb704e0..ce15b862ba13da7d02e680e3821b90af2579a828 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.26beta06 - October 7, 2016 +Libpng 1.6.26beta07 - October 7, 2016 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. @@ -8,20 +8,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.26beta06.tar.xz (LZMA-compressed, recommended) - 1.6.26beta06.tar.gz + 1.6.26beta07.tar.xz (LZMA-compressed, recommended) + 1.6.26beta07.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1626b06.7z (LZMA-compressed, recommended) - lp1626b06.zip + lp1626b07.7z (LZMA-compressed, recommended) + lp1626b07.zip Other information: - 1.6.26beta06-README.txt - 1.6.26beta06-LICENSE.txt - libpng-1.6.26beta06-*.asc (armored detached GPG signatures) + 1.6.26beta07-README.txt + 1.6.26beta07-LICENSE.txt + libpng-1.6.26beta07-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.25): @@ -65,10 +65,12 @@ Version 1.6.26beta05 [October 6, 2016] Changed integer constant 4294967294 to unsigned 4294967294U in pngconf.h to avoid a signed/unsigned compare in the preprocessor. -Version 1.6.26beta05 [October 7, 2016] +Version 1.6.26beta06 [October 7, 2016] Use zlib-1.2.8.1 inflateValidate() instead of inflateReset2() to avoid ADLER32 evaluation. +Version 1.6.26beta07 [October 7, 2016] + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CHANGES b/CHANGES index ac901636d728090fc06c351d30aa42ec1ec7419a..e2c73c7a84ee0f3aed21d07b8a737454b08b73c5 100644 --- a/CHANGES +++ b/CHANGES @@ -5743,10 +5743,12 @@ Version 1.6.26beta05 [October 6, 2016] Changed integer constant 4294967294 to unsigned 4294967294U in pngconf.h to avoid a signed/unsigned compare in the preprocessor. -Version 1.6.26beta05 [October 7, 2016] +Version 1.6.26beta06 [October 7, 2016] Use zlib-1.2.8.1 inflateValidate() instead of inflateReset2() to avoid ADLER32 evaluation. +Version 1.6.26beta07 [October 7, 2016] + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CMakeLists.txt b/CMakeLists.txt index 434ddd0f6780ed373c11dc0492828344aba6dee9..98b6832520317756d061ecbc62198a193b7e7cbe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -696,7 +696,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(png PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.26beta06 +# VERSION 16.${PNGLIB_RELEASE}.1.6.26beta07 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 5c9c0c362bd46aefc8232a2884d761abf88f64a3..dbfaf730a2c57c38e6713633128b276532e25cf4 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.26beta06, October 7, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.26beta07, October 7, 2016 are Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals diff --git a/README b/README index be136c937aded9068c763f5bac742109c39a4df2..054504dffbfc489cb35931a0729041db0f0c4a01 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.26beta06 - October 7, 2016 (shared library 16.0) +README for libpng version 1.6.26beta07 - October 7, 2016 (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/configure.ac b/configure.ac index c5d5608e8b469d06a39d841471505d95f5537ca8..479a5ff0feb286ceeabe4ea3abc56aa37ae38fdd 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.26beta06],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.26beta07],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -46,7 +46,7 @@ dnl automake, so the following is not necessary (and is not defined anyway): dnl AM_PREREQ([1.11.2]) dnl stop configure from automagically running automake -PNGLIB_VERSION=1.6.26beta06 +PNGLIB_VERSION=1.6.26beta07 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=26 diff --git a/libpng-manual.txt b/libpng-manual.txt index af0cf253279c9c700728d3806eea10b44af6287b..1a22cb75f31bd70ac9d56c764cfff7bcd76d4e0c 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.26beta06 - October 7, 2016 + libpng version 1.6.26beta07 - October 7, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 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.26beta06 - October 7, 2016 + libpng versions 0.97, January 1998, through 1.6.26beta07 - October 7, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5354,7 +5354,7 @@ Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.26beta06 are Y2K compliant. It is my belief that earlier +upward through 1.6.26beta07 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer diff --git a/libpng.3 b/libpng.3 index b382e08427d2868363b5db1fb8e8d2f637a7eb68..ad1157ddaeb2ab8ae35b1c3fee3c517aeac2464b 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "October 7, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.26beta06 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.26beta07 .SH SYNOPSIS \fB #include \fP @@ -510,7 +510,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.26beta06 - October 7, 2016 + libpng version 1.6.26beta07 - October 7, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -521,7 +521,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.26beta06 - October 7, 2016 + libpng versions 0.97, January 1998, through 1.6.26beta07 - October 7, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5864,7 +5864,7 @@ Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.26beta06 are Y2K compliant. It is my belief that earlier +upward through 1.6.26beta07 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer @@ -6022,7 +6022,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.26beta06 - October 7, 2016: +Libpng version 1.6.26beta07 - October 7, 2016: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6047,7 +6047,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.26beta06, October 7, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.26beta07, October 7, 2016 are Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals diff --git a/libpngpf.3 b/libpngpf.3 index 333b56dfe36405d16005355df604af7f90105351..187e4db8c0bcbba1524b719f8d22eda53a839714 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "October 7, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.26beta06 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.26beta07 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index a40c74154e17f14585ccd76c79da2b6073ce0d0d..bebc61017d508aef2a57a97eaf19e5abcfb65bc0 100644 --- a/png.c +++ b/png.c @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_26beta06 Your_png_h_is_not_version_1_6_26beta06; +typedef png_libpng_version_1_6_26beta07 Your_png_h_is_not_version_1_6_26beta07; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -775,14 +775,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.26beta06 - October 7, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.6.26beta07 - October 7, 2016" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2016 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.26beta06 - October 7, 2016\ + return "libpng version 1.6.26beta07 - October 7, 2016\ Copyright (c) 1998-2002,2004,2006-2016 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 d4dc0308b442269fc054fccf8deee8fb7463123a..cc79c62f3736a06f2bb023e2b20db3d6adab39c2 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.26beta06, October 7, 2016 + * libpng version 1.6.26beta07, October 7, 2016 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.26beta06, October 7, 2016: + * libpng versions 0.97, January 1998, through 1.6.26beta07, October 7, 2016: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -29,7 +29,7 @@ * files that are distributed with libpng have other copyright owners and * are released under other open source licenses. * - * libpng versions 1.0.7, July 1, 2000 through 1.6.26beta06, October 7, 2016 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.26beta07, October 7, 2016 are * Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are * derived from libpng-1.0.6, and are distributed according to the same * disclaimer and license as libpng-1.0.6 with the following individuals @@ -252,7 +252,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.26beta06 are Y2K compliant. It is my belief that + * upward through 1.6.26beta07 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has two year fields. One is a 2-byte unsigned integer @@ -314,8 +314,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.26beta06" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.26beta06 - October 7, 2016\n" +#define PNG_LIBPNG_VER_STRING "1.6.26beta07" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.26beta07 - October 7, 2016\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -329,7 +329,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 06 +#define PNG_LIBPNG_VER_BUILD 07 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -464,7 +464,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_6_26beta06; +typedef char* png_libpng_version_1_6_26beta07; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 67d98518c487a4c176e6b32045c4350200956ec9..3db0cd267e08ef234435c66cd2793d114af881d2 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.26beta06, October 7, 2016 + * libpng version 1.6.26beta07, October 7, 2016 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 2bfc3794612fc69faa87d86ae1c62c8f0ed82ff7..a8f475b99158f50fe19a4017d4cd008eab3e9f85 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2083,4 +2083,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_26beta06 Your_png_h_is_not_version_1_6_26beta06; +typedef png_libpng_version_1_6_26beta07 Your_png_h_is_not_version_1_6_26beta07; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 1c7aa46d21e989d532be3581e4c5e6524a17682f..91a9f6c0799ac318e9adc893c9079fddb67c112a 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.26beta06 - October 7, 2016 +libpng version 1.6.26beta07 - October 7, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 792a94ed7a2ccc92defa5ffb0de5bfa070a75b3d..6d14abc166060cd7af81fc2201a6a2a5d70d0868 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@