diff --git a/ANNOUNCE b/ANNOUNCE index 366ace588b82463e6f7cbce92b99f1f0abdcdc52..0f5dd9ef7a4325311cc9458eb4753a71fa8dae63 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,45 +1,33 @@ -Libpng 1.6.23 - June 9, 2016 +Libpng 1.6.24beta01 - June 11, 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.23.tar.xz (LZMA-compressed, recommended) - libpng-1.6.23.tar.gz + 1.6.24beta01.tar.xz (LZMA-compressed, recommended) + 1.6.24beta01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lpng1623.7z (LZMA-compressed, recommended) - lpng1623.zip + lp1624b01.7z (LZMA-compressed, recommended) + lp1624b01.zip Other information: - libpng-1.6.23-README.txt - libpng-1.6.23-LICENSE.txt - libpng-1.6.23-*.asc (armored detached GPG signatures) - -Changes since the last public release (1.6.22): - - Stop a potential memory leak in png_set_tRNS() (Bug report by Ted Ying). - Fixed the progressive reader to handle empty first IDAT chunk properly - (patch by Timothy Nikkel). This bug was introduced in libpng-1.6.0 and - only affected the libpng16 branch. - Added tests in pngvalid.c to check zero-length IDAT chunks in various - positions. Fixed the sequential reader to handle these more robustly - (John Bowler). - Corrected progressive read input buffer in pngvalid.c. The previous version - the code invariably passed just one byte at a time to libpng. The intent - was to pass a random number of bytes in the range 0..511. - Moved sse2 prototype from pngpriv.h to contrib/intel/intel_sse.patch. - Added missing ")" in pngerror.c (Matt Sarrett). - Fixed undefined behavior in png_push_save_buffer(). Do not call - memcpy() with a null source, even if count is zero (Leon Scroggins III). - Fixed bad link to RFC2083 in png.5 (Nikola Forro). + 1.6.24beta01-README.txt + 1.6.24beta01-LICENSE.txt + libpng-1.6.24beta01-*.asc (armored detached GPG signatures) +Changes since the last public release (1.6.23): + +Version 1.6.24beta01 [June 11, 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 0d6180ffad1d7e810ebb48e219ca1090c625b2da..965714f083d908bf388538e1e054451f1ae29a40 100644 --- a/CHANGES +++ b/CHANGES @@ -5596,6 +5596,8 @@ Version 1.6.23rc02 [June 4, 2016] Version 1.6.23 [June 9, 2016] Fixed bad link to RFC2083 in png.5 (Nikola Forro). +Version 1.6.24beta01 [June 11, 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 6eb3781496b1ac74950747e702c236eae9e4f9b8..66f368e731799afa53095ef4984a91ced1750e77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 6) -set(PNGLIB_RELEASE 23) +set(PNGLIB_RELEASE 24) 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.23 +# VERSION 16.${PNGLIB_RELEASE}.1.6.24beta01 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index b7ad4b9eaf3e796210c443fed07f55b1cfeaf86f..81dbb09c3e226406761120697e7479835ad87447 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.23, June 9, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.24beta01, June 11, 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 @@ -127,4 +127,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 9, 2016 +June 11, 2016 diff --git a/README b/README index 38e9a14f5c9658b7ebfe24aeaab306ca2b0b1b5f..02f85ed2a7403016952f50960627563e2ca68716 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.23 - June 9, 2016 (shared library 16.0) +README for libpng version 1.6.24beta01 - June 11, 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/arm/arm_init.c b/arm/arm_init.c index 52c3f31fede9715047e6a606c0698b9e15817b35..02df812e775fafcd10b3dc7c514275c6b5565405 100644 --- a/arm/arm_init.c +++ b/arm/arm_init.c @@ -3,7 +3,7 @@ * * Copyright (c) 2014,2016 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.22 [June 9, 2016] + * Last changed in libpng 1.6.22 [May 26, 2016] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/arm/filter_neon_intrinsics.c b/arm/filter_neon_intrinsics.c index be5ccc7107665b692a5da3aa976eac31dcf4edb2..ea7e356bccf296af9e7fac01f81fa3e4f242aa6d 100644 --- a/arm/filter_neon_intrinsics.c +++ b/arm/filter_neon_intrinsics.c @@ -5,7 +5,7 @@ * Written by James Yu , October 2013. * Based on filter_neon.S, written by Mans Rullgard, 2011. * - * Last changed in libpng 1.6.22 [June 9, 2016] + * Last changed in libpng 1.6.22 [May 26, 2016] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/configure.ac b/configure.ac index 82a4097b4107a323a34489c267f6dcd4b09d4fe6..d90e57b32c82afe102ed2d51151bb47807dea6f1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # configure.ac # Copyright (c) 2004-2015 Glenn Randers-Pehrson -# Last changed in libpng 1.6.22 [June 9, 2016] +# Last changed in libpng 1.6.22 [(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.23],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.24beta01],[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.23 +PNGLIB_VERSION=1.6.24beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 -PNGLIB_RELEASE=23 +PNGLIB_RELEASE=24 dnl End of version number stuff diff --git a/libpng-manual.txt b/libpng-manual.txt index 541a264302a1498d9070b6e722cdd4f0079b2ab6..6df47afd0ca732aa60b58cdcc5923acfbf16ef7d 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.23 - June 9, 2016 + libpng version 1.6.24beta01 - June 11, 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.23 - June 9, 2016 + libpng versions 0.97, January 1998, through 1.6.24beta01 - June 11, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5345,7 +5345,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.23 are Y2K compliant. It is my belief that earlier +upward through 1.6.24beta01 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 86a2945209db571ac00b9806305f011ecc8d942e..46e88b959383614a7d1465272993b1e3be2d4c9c 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "June 9, 2016" +.TH LIBPNG 3 "June 11, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.23 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta01 .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.23 - June 9, 2016 + libpng version 1.6.24beta01 - June 11, 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.23 - June 9, 2016 + libpng versions 0.97, January 1998, through 1.6.24beta01 - June 11, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5855,7 +5855,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.23 are Y2K compliant. It is my belief that earlier +upward through 1.6.24beta01 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 @@ -5957,7 +5957,7 @@ the first widely used release: ... 1.5.27 15 10527 15.so.15.27[.0] ... - 1.6.23 16 10623 16.so.16.23[.0] + 1.6.24 16 10624 16.so.16.24[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6013,7 +6013,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.23 - June 9, 2016: +Libpng version 1.6.24beta01 - June 11, 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). @@ -6038,7 +6038,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.23, June 9, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.24beta01, June 11, 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 @@ -6163,7 +6163,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 9, 2016 +June 11, 2016 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index ea1a4657fc6be53d0a65a9baf8a5a079836966da..1e47368379c694b59a0678394b6f277288a53a4a 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "June 9, 2016" +.TH LIBPNGPF 3 "June 11, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.23 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 8ff1639e812f3c822dd2ee3887a326cd3325e1a5..4cb767eb491abc42a86bc8027be9e4a19a2c635c 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "June 9, 2016" +.TH PNG 5 "June 11, 2016" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 1720ca0eae9b7d5eb0ac54ddf5f1ae1e717f1d43..55ce4071e1af8383c4efb268295f0f5518005f9e 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_23 Your_png_h_is_not_version_1_6_23; +typedef png_libpng_version_1_6_24beta01 Your_png_h_is_not_version_1_6_24beta01; /* 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.23 - June 9, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.6.24beta01 - June 11, 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.23 - June 9, 2016\ + return "libpng version 1.6.24beta01 - June 11, 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 1efb0b02a93ed8f0175ea189dffd337818346430..7164d48d41b9482d1c77609d6348e80121c5368d 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.23, June 9, 2016 + * libpng version 1.6.24beta01, June 11, 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.23, June 9, 2016: + * libpng versions 0.97, January 1998, through 1.6.24beta01, June 11, 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.23, June 9, 2016 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.24beta01, June 11, 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 @@ -217,7 +217,7 @@ * ... * 1.5.27 15 10527 15.so.15.27[.0] * ... - * 1.6.23 16 10623 16.so.16.23[.0] + * 1.6.24 16 10624 16.so.16.24[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -245,13 +245,13 @@ * Y2K compliance in libpng: * ========================= * - * June 9, 2016 + * June 11, 2016 * * 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.23 are Y2K compliant. It is my belief that + * upward through 1.6.24beta01 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 @@ -313,9 +313,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.23" +#define PNG_LIBPNG_VER_STRING "1.6.24beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.23 - June 9, 2016\n" + " libpng version 1.6.24beta01 - June 11, 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 23 +#define PNG_LIBPNG_VER_RELEASE 24 /* 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 10623 /* 1.6.23 */ +#define PNG_LIBPNG_VER 10624 /* 1.6.24 */ /* 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_23; +typedef char* png_libpng_version_1_6_24beta01; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index b0ccc8c25ee271caf86cfb2db8669903e21eab15..77ce9a65ab5fa1c4e982666833ed0d3519903e5a 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.23, June 9, 2016 + * libpng version 1.6.24beta01, June 11, 2016 * * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 37e2209e6875efcd386589b1656a8fd2bec3f16e..97fe7c0e87accee4c24164d5d7e67bcb4a9f2912 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2079,4 +2079,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_23 Your_png_h_is_not_version_1_6_23; +typedef png_libpng_version_1_6_24beta01 Your_png_h_is_not_version_1_6_24beta01; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index e2751731ba61462d161b526575ee8538a44b9491..65c87244e6c550765d96d74424bc8a69dac964e7 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.23 - June 9, 2016 +libpng version 1.6.24beta01 - June 11, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index f64a2276517aff85d27fdb9ac0bda4bb1c529a3a..acdcd235e1a16b35648ff2c3925393f189c07699 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@