diff --git a/ANNOUNCE b/ANNOUNCE index 330fd1078..8f5191b61 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,36 +1,33 @@ -Libpng 1.6.25 - September 1, 2016 +Libpng 1.6.26beta01 - September 1, 2016 -This is a public release of libpng, intended for use in production codes. +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. Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.6.25.tar.xz (LZMA-compressed, recommended) - libpng-1.6.25.tar.gz + 1.6.26beta01.tar.xz (LZMA-compressed, recommended) + 1.6.26beta01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lpng1625.7z (LZMA-compressed, recommended) - lpng1625.zip + lp1626b01.7z (LZMA-compressed, recommended) + lp1626b01.zip Other information: - libpng-1.6.25-README.txt - libpng-1.6.25-LICENSE.txt - libpng-1.6.25-*.asc (armored detached GPG signatures) + 1.6.26beta01-README.txt + 1.6.26beta01-LICENSE.txt + libpng-1.6.26beta01-*.asc (armored detached GPG signatures) -Changes since the last public release (1.6.24): - Reject oversized iCCP profile immediately. - Cleaned up PNG_DEBUG compile of pngtest.c. - Conditionally compile png_inflate(). - Don't install pngcp; it conflicts with pngcp in the pngtools package. - Minor editing of INSTALL, (whitespace, added copyright line) - Added MIPS support (Mandar Sahastrabuddhe ). - Rebased contrib/intel/intel_sse.patch after the MIPS implementation. +Changes since the last public release (1.6.25): +Version 1.6.26beta01 [September 1, 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 to subscribe) diff --git a/CHANGES b/CHANGES index 923fc5054..dd96d6a0f 100644 --- a/CHANGES +++ b/CHANGES @@ -5703,6 +5703,8 @@ Version 1.6.25rc05 [August 30, 2016] Version 1.6.25 [September 1, 2016] No changes. +Version 1.6.26beta01 [September 1, 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 eb63b2bfe..090568116 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 6) -set(PNGLIB_RELEASE 25) +set(PNGLIB_RELEASE 26) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -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.25 +# VERSION 16.${PNGLIB_RELEASE}.1.6.26beta01 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index d48a293cd..f949fa22c 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.25, September 1, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.26beta01, September 1, 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/Makefile.am b/Makefile.am index fb209edd2..e339c647e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am, the source file for Makefile.in (and hence Makefile), is # # Copyright (c) 2004-2016 Glenn Randers-Pehrson -# Last changed in libpng 1.6.25 [September 1, 2016] +# Last changed in libpng 1.6.25 [(PENDING RELEASE)] # # This code is released under the libpng license. # For conditions of distribution and use, see the disclaimer diff --git a/README b/README index 17bca9a5f..af3df5cad 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.25 - September 1, 2016 (shared library 16.0) +README for libpng version 1.6.26beta01 - September 1, 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 83c5fc244..80b44d9e1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # configure.ac # Copyright (c) 2004-2016 Glenn Randers-Pehrson -# Last changed in libpng 1.6.25 [September 1, 2016] +# Last changed in libpng 1.6.25 [(PENDING RELEASE)] # This code is released under the libpng license. # For conditions of distribution and use, see the disclaimer @@ -25,7 +25,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.25],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.26beta01],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -46,10 +46,10 @@ 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.25 +PNGLIB_VERSION=1.6.26beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 -PNGLIB_RELEASE=25 +PNGLIB_RELEASE=26 dnl End of version number stuff diff --git a/libpng-manual.txt b/libpng-manual.txt index d969f96d3..b7a93f153 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.25 - September 1, 2016 + libpng version 1.6.26beta01 - September 1, 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.25 - September 1, 2016 + libpng versions 0.97, January 1998, through 1.6.26beta01 - September 1, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5350,7 +5350,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.25 are Y2K compliant. It is my belief that earlier +upward through 1.6.26beta01 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 4893dc9d7..a8643b5a7 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "September 1, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.25 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.26beta01 .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.25 - September 1, 2016 + libpng version 1.6.26beta01 - September 1, 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.25 - September 1, 2016 + libpng versions 0.97, January 1998, through 1.6.26beta01 - September 1, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5860,7 +5860,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.25 are Y2K compliant. It is my belief that earlier +upward through 1.6.26beta01 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 @@ -5962,7 +5962,7 @@ the first widely used release: ... 1.5.27 15 10527 15.so.15.27[.0] ... - 1.6.25 16 10625 16.so.16.25[.0] + 1.6.26 16 10626 16.so.16.26[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6018,7 +6018,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.25 - September 1, 2016: +Libpng version 1.6.26beta01 - September 1, 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). @@ -6043,7 +6043,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.25, September 1, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.26beta01, September 1, 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 3d6eab5dc..db8da2711 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "September 1, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.25 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.26beta01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/mips/filter_msa_intrinsics.c b/mips/filter_msa_intrinsics.c index 943bb3d05..685b974aa 100644 --- a/mips/filter_msa_intrinsics.c +++ b/mips/filter_msa_intrinsics.c @@ -3,7 +3,7 @@ * * Copyright (c) 2016 Glenn Randers-Pehrson * Written by Mandar Sahastrabuddhe, August 2016. - * Last changed in libpng 1.6.25 [September 1, 2016] + * Last changed in libpng 1.6.25 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/mips/mips_init.c b/mips/mips_init.c index 0bfb7a32e..bfebf0c33 100644 --- a/mips/mips_init.c +++ b/mips/mips_init.c @@ -3,7 +3,7 @@ * * Copyright (c) 2016 Glenn Randers-Pehrson * Written by Mandar Sahastrabuddhe, 2016. - * Last changed in libpng 1.6.25 [September 1, 2016] + * Last changed in libpng 1.6.25 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/png.c b/png.c index 33e8c8f21..452aefe08 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_25 Your_png_h_is_not_version_1_6_25; +typedef png_libpng_version_1_6_26beta01 Your_png_h_is_not_version_1_6_26beta01; /* 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.25 - September 1, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.6.26beta01 - September 1, 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.25 - September 1, 2016\ + return "libpng version 1.6.26beta01 - September 1, 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 e1f59c310..48380ff8f 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.25, September 1, 2016 + * libpng version 1.6.26beta01, September 1, 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.25, September 1, 2016: + * libpng versions 0.97, January 1998, through 1.6.26beta01, September 1, 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.25, September 1, 2016 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.26beta01, September 1, 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 @@ -218,7 +218,7 @@ * ... * 1.5.27 15 10527 15.so.15.27[.0] * ... - * 1.6.25 16 10625 16.so.16.25[.0] + * 1.6.26 16 10626 16.so.16.26[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -252,7 +252,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.25 are Y2K compliant. It is my belief that + * upward through 1.6.26beta01 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.25" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.25 - September 1, 2016\n" +#define PNG_LIBPNG_VER_STRING "1.6.26beta01" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.26beta01 - September 1, 2016\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -323,13 +323,13 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 6 -#define PNG_LIBPNG_VER_RELEASE 25 +#define PNG_LIBPNG_VER_RELEASE 26 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 0 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -346,7 +346,7 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -354,7 +354,7 @@ * version 1.0.0 was mis-numbered 100 instead of 10000). From * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ -#define PNG_LIBPNG_VER 10625 /* 1.6.25 */ +#define PNG_LIBPNG_VER 10626 /* 1.6.26 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -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_25; +typedef char* png_libpng_version_1_6_26beta01; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 08b423966..1f08ede9e 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.25, September 1, 2016 + * libpng version 1.6.26beta01, September 1, 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 9034d16fc..9d39cb557 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2088,4 +2088,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_25 Your_png_h_is_not_version_1_6_25; +typedef png_libpng_version_1_6_26beta01 Your_png_h_is_not_version_1_6_26beta01; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 0457c2df7..ed76863f5 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.25 - September 1, 2016 +libpng version 1.6.26beta01 - September 1, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 8adbd1e2c..1ff23cd40 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@