diff --git a/ANNOUNCE b/ANNOUNCE index bc611c377..02183ae03 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.21rc01 - January 4, 2016 +Libpng 1.6.21rc02 - January 6, 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.21rc01.tar.xz (LZMA-compressed, recommended) - 1.6.21rc01.tar.gz + 1.6.21rc02.tar.xz (LZMA-compressed, recommended) + 1.6.21rc02.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - /scratch/glennrp/Libpng16/lp1621r01.7z (LZMA-compressed, recommended) - /scratch/glennrp/Libpng16/lp1621r01.zip + /scratch/glennrp/Libpng16/lp1621r02.7z (LZMA-compressed, recommended) + /scratch/glennrp/Libpng16/lp1621r02.zip Other information: - 1.6.21rc01-README.txt - 1.6.21rc01-LICENSE.txt - libpng-1.6.21rc01-*.asc (armored detached GPG signatures) + 1.6.21rc02-README.txt + 1.6.21rc02-LICENSE.txt + libpng-1.6.21rc02-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.20): @@ -54,6 +54,10 @@ Version 1.6.21beta03 [December 18, 2015] Version 1.6.21rc01 [January 4, 2016] In projects/vstudio, combined readme.txt and WARNING into README.txt +Version 1.6.21rc02 [January 6, 2016] + Relocated assert() in contrib/tools/pngfix.c, bug found by American + Fuzzy Lop, reported by Brian Carpenter. + 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 87f854bc9..404898fd2 100644 --- a/CHANGES +++ b/CHANGES @@ -5475,6 +5475,10 @@ Version 1.6.21beta03 [December 18, 2015] Version 1.6.21rc01 [January 4, 2016] In projects/vstudio, combined readme.txt and WARNING into README.txt +Version 1.6.21rc02 [January 6, 2016] + Relocated assert() in contrib/tools/pngfix.c, bug found by American + Fuzzy Lop, reported by Brian Carpenter. + 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 3a4eba56a..88ee4e9a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -261,7 +261,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.21rc01 +# VERSION 16.${PNGLIB_RELEASE}.1.6.21rc02 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index a12126a2c..8ab1376e0 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.21rc01, January 4, 2016, are +libpng versions 1.0.7, July 1, 2000, through 1.6.21rc02, January 6, 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 @@ -109,4 +109,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 4, 2016 +January 6, 2016 diff --git a/README b/README index 6613b79c1..f2cd10c6a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.21rc01 - January 4, 2016 (shared library 16.0) +README for libpng version 1.6.21rc02 - January 6, 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 709cb029e..779d20636 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.21rc01],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.21rc02],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -39,7 +39,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.21rc01 +PNGLIB_VERSION=1.6.21rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=21 diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index d9913dac0..36d80e901 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -1,7 +1,7 @@ /* pngvalid.c - validate libpng by constructing then reading png files. * - * Last changed in libpng 1.5.27 [(PENDING RELEASE)] + * Last changed in libpng 1.6.21 [(PENDING RELEASE)] * Copyright (c) 2014-2016 Glenn Randers-Pehrson * Written by John Cunningham Bowler * diff --git a/contrib/tools/pngfix.c b/contrib/tools/pngfix.c index 5135fd391..bcf35b0f4 100644 --- a/contrib/tools/pngfix.c +++ b/contrib/tools/pngfix.c @@ -1,8 +1,8 @@ /* pngfix.c * - * Copyright (c) 2014-2015 John Cunningham Bowler + * Copyright (c) 2014-2016 John Cunningham Bowler * - * Last changed in libpng 1.6.20 [(PENDING RELEASE)] + * Last changed in libpng 1.6.21 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -319,13 +319,13 @@ uarb_mult32(uarb acc, int a_digits, uarb num, int n_digits, png_uint_32 val) a_digits = uarb_mult_digit(acc, a_digits, num, n_digits, (png_uint_16)(val & 0xffff)); - /* Because n_digits and val are >0 the following must be true: */ - assert(a_digits > 0); - val >>= 16; if (val > 0) a_digits = uarb_mult_digit(acc+1, a_digits-1, num, n_digits, (png_uint_16)val) + 1; + + /* Because n_digits and val are >0 the following must be true: */ + assert(a_digits > 0); } return a_digits; diff --git a/libpng-manual.txt b/libpng-manual.txt index 09688c6c8..743e298be 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.21rc01 - January 4, 2016 + libpng version 1.6.21rc02 - January 6, 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.21rc01 - January 4, 2016 + libpng versions 0.97, January 1998, through 1.6.21rc02 - January 6, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5328,7 +5328,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.21rc01 are Y2K compliant. It is my belief that earlier +upward through 1.6.21rc02 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 b0bb7ad9a..78ad2e221 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "January 4, 2016" +.TH LIBPNG 3 "January 6, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.21rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.21rc02 .SH SYNOPSIS \fB #include \fP @@ -508,7 +508,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.21rc01 - January 4, 2016 + libpng version 1.6.21rc02 - January 6, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -519,7 +519,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.21rc01 - January 4, 2016 + libpng versions 0.97, January 1998, through 1.6.21rc02 - January 6, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5836,7 +5836,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.21rc01 are Y2K compliant. It is my belief that earlier +upward through 1.6.21rc02 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 @@ -5994,7 +5994,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.21rc01 - January 4, 2016: +Libpng version 1.6.21rc02 - January 6, 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). @@ -6019,7 +6019,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.6.21rc01, January 4, 2016, are +libpng versions 1.0.7, July 1, 2000, through 1.6.21rc02, January 6, 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 @@ -6118,7 +6118,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 4, 2016 +January 6, 2016 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index f679be7d4..e9a7e36cb 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "January 4, 2016" +.TH LIBPNGPF 3 "January 6, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.21rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.21rc02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 30e3782b1..5397eb24e 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "January 4, 2016" +.TH PNG 5 "January 6, 2016" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 0e1799438..30401b199 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_21rc01 Your_png_h_is_not_version_1_6_21rc01; +typedef png_libpng_version_1_6_21rc02 Your_png_h_is_not_version_1_6_21rc02; /* 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,7 +775,7 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.21rc01 - January 4, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.6.21rc02 - January 6, 2016" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson" \ PNG_STRING_NEWLINE \ @@ -783,7 +783,7 @@ png_get_copyright(png_const_structrp png_ptr) "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; # else - return "libpng version 1.6.21rc01 - January 4, 2016\ + return "libpng version 1.6.21rc02 - January 6, 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 88c88bf5f..60195d977 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.21rc01, January 4, 2016 + * libpng version 1.6.21rc02, January 6, 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.21rc01, January 4, 2016: + * libpng versions 0.97, January 1998, through 1.6.21rc02, January 6, 2016: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -25,7 +25,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.6.21rc01, January 4, 2016, are + * libpng versions 1.0.7, July 1, 2000, through 1.6.21rc02, January 6, 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 @@ -214,13 +214,13 @@ * Y2K compliance in libpng: * ========================= * - * January 4, 2016 + * January 6, 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.21rc01 are Y2K compliant. It is my belief that + * upward through 1.6.21rc02 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 @@ -282,9 +282,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.21rc01" +#define PNG_LIBPNG_VER_STRING "1.6.21rc02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.21rc01 - January 4, 2016\n" + " libpng version 1.6.21rc02 - January 6, 2016\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -298,7 +298,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 01 +#define PNG_LIBPNG_VER_BUILD 02 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -433,7 +433,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_21rc01; +typedef char* png_libpng_version_1_6_21rc02; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 9c7eb829c..20bd27f41 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.21rc01, January 4, 2016 + * libpng version 1.6.21rc02, January 6, 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 b440657c8..393469304 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2070,4 +2070,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_21rc01 Your_png_h_is_not_version_1_6_21rc01; +typedef png_libpng_version_1_6_21rc02 Your_png_h_is_not_version_1_6_21rc02; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 4ff9565bb..a9f398e05 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.21rc01 - January 4, 2016 +libpng version 1.6.21rc02 - January 6, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index a7fffc779..8945f2cc9 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@