diff --git a/ANNOUNCE b/ANNOUNCE index 422939bdd..6c28092c4 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.25beta02 - November 23, 2015 +Libpng 1.5.25beta03 - November 24, 2015 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. @@ -9,21 +9,21 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.5.25beta02.tar.xz (LZMA-compressed, recommended) - 1.5.25beta02.tar.gz - 1.5.25beta02.tar.bz2 + 1.5.25beta03.tar.xz (LZMA-compressed, recommended) + 1.5.25beta03.tar.gz + 1.5.25beta03.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1525b02.7z (LZMA-compressed, recommended) - lp1525b02.zip + lp1525b03.7z (LZMA-compressed, recommended) + lp1525b03.zip Other information: - 1.5.25beta02-README.txt - 1.5.25beta02-LICENSE.txt - libpng-1.5.25beta02-*.asc (armored detached GPG signatures) + 1.5.25beta03-README.txt + 1.5.25beta03-LICENSE.txt + libpng-1.5.25beta03-*.asc (armored detached GPG signatures) Changes since the last public release (1.5.24): @@ -31,10 +31,13 @@ version 1.5.25beta01 [November 20, 2015] Avoid potential pointer overflow in png_handle_iTXt(), png_handle_zTXt(), png_handle_sPLT(), and png_handle_pCAL() (Bug report by John Regehr). -version 1.5.25beta02 [(PENDING RELEASE)] +version 1.5.25beta02 [November 23, 2015] Fixed bug recently introduced in png_set_PLTE() that uses png_ptr not info_ptr. +version 1.5.25beta03 [(PENDING RELEASE)] + Backported tests from libpng-1.7.0beta69. + 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 6dc5d5620..a01e4c136 100644 --- a/CHANGES +++ b/CHANGES @@ -4428,10 +4428,13 @@ version 1.5.25beta01 [November 20, 2015] Avoid potential pointer overflow in png_handle_iTXt(), png_handle_zTXt(), png_handle_sPLT(), and png_handle_pCAL() (Bug report by John Regehr). -version 1.5.25beta02 [(PENDING RELEASE)] +version 1.5.25beta02 [November 23, 2015] Fixed bug recently introduced in png_set_PLTE() that uses png_ptr not info_ptr. +version 1.5.25beta03 [(PENDING RELEASE)] + Backported tests from libpng-1.7.0beta69. + 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 f7e1c5d58..176205da9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,7 +224,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.25beta02 +# VERSION 15.${PNGLIB_RELEASE}.1.5.25beta03 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 218b1798a..4dee399cd 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.5.25beta02, November 23, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.5.25beta03, November 24, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 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 @@ -108,4 +108,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 23, 2015 +November 24, 2015 diff --git a/README b/README index 9e0955ef0..ce4a63cd5 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.25beta02 - November 23, 2015 (shared library 15.0) +README for libpng version 1.5.25beta03 - November 24, 2015 (shared library 15.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 b/configure index 0c0b4d730..e4e060c90 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libpng 1.5.25beta02. +# Generated by GNU Autoconf 2.69 for libpng 1.5.25beta03. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.25beta02' -PACKAGE_STRING='libpng 1.5.25beta02' +PACKAGE_VERSION='1.5.25beta03' +PACKAGE_STRING='libpng 1.5.25beta03' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1354,7 +1354,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libpng 1.5.25beta02 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.25beta03 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1424,7 +1424,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.25beta02:";; + short | recursive ) echo "Configuration of libpng 1.5.25beta03:";; esac cat <<\_ACEOF @@ -1579,7 +1579,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.25beta02 +libpng configure 1.5.25beta03 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2002,7 +2002,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libpng $as_me 1.5.25beta02, which was +It was created by libpng $as_me 1.5.25beta03, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2865,7 +2865,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.25beta02' + VERSION='1.5.25beta03' cat >>confdefs.h <<_ACEOF @@ -2982,7 +2982,7 @@ fi -PNGLIB_VERSION=1.5.25beta02 +PNGLIB_VERSION=1.5.25beta03 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=25 @@ -14124,7 +14124,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpng $as_me 1.5.25beta02, which was +This file was extended by libpng $as_me 1.5.25beta03, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14190,7 +14190,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libpng config.status 1.5.25beta02 +libpng config.status 1.5.25beta03 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index d5b057420..029a5ee5a 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.5.25beta02], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.25beta03], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE([1.13 serial-tests subdir-objects]) dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.25beta02 +PNGLIB_VERSION=1.5.25beta03 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=25 diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index ad1a5f785..4d8da5f01 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.24 [(PENDING RELEASE)] + * Last changed in libpng 1.5.25 [RDATE%] * Copyright (c) 2014-2015 Glenn Randers-Pehrson * Written by John Cunningham Bowler * diff --git a/libpng-manual.txt b/libpng-manual.txt index ebcc2fa97..e13c15661 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.5.25beta02 - November 23, 2015 + libpng version 1.5.25beta03 - November 24, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.5.25beta02 - November 23, 2015 + libpng versions 0.97, January 1998, through 1.5.25beta03 - November 24, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4510,7 +4510,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.5.25beta02 are Y2K compliant. It is my belief that earlier +upward through 1.5.25beta03 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 4ec2ce750..707c76e6a 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "November 23, 2015" +.TH LIBPNG 3 "November 24, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.25beta02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.25beta03 .SH SYNOPSIS \fB #include \fP @@ -496,7 +496,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.5.25beta02 - November 23, 2015 + libpng version 1.5.25beta03 - November 24, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -507,7 +507,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.25beta02 - November 23, 2015 + libpng versions 0.97, January 1998, through 1.5.25beta03 - November 24, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5006,7 +5006,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.5.25beta02 are Y2K compliant. It is my belief that earlier +upward through 1.5.25beta03 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 @@ -5161,7 +5161,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.25beta02 - November 23, 2015: +Libpng version 1.5.25beta03 - November 24, 2015: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5186,7 +5186,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.5.25beta02, November 23, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.5.25beta03, November 24, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 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 @@ -5284,7 +5284,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 23, 2015 +November 24, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 7d4690f42..ded9d4991 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "November 23, 2015" +.TH LIBPNGPF 3 "November 24, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.25beta02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.25beta03 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 5b3daab0e..0fca673b5 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 23, 2015" +.TH PNG 5 "November 24, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index c98ce7c71..ab2087647 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_5_25beta02 Your_png_h_is_not_version_1_5_25beta02; +typedef png_libpng_version_1_5_25beta03 Your_png_h_is_not_version_1_5_25beta03; /* 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 @@ -655,13 +655,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.25beta02 - November 23, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.5.25beta03 - November 24, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 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.5.25beta02 - November 23, 2015\ + return "libpng version 1.5.25beta03 - November 24, 2015\ Copyright (c) 1998-2015 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 3fb616afe..9e6555605 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.25beta02, November 23, 2015 + * libpng version 1.5.25beta03, November 24, 2015 * * Copyright (c) 1998-2015 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.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.5.25beta02, November 23, 2015: + * libpng versions 0.97, January 1998, through 1.5.25beta03, November 24, 2015: * 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.5.25beta02, November 23, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.5.25beta03, November 24, 2015, are * Copyright (c) 2000-2002, 2004, 2006-2015 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 @@ -211,13 +211,13 @@ * Y2K compliance in libpng: * ========================= * - * November 23, 2015 + * November 24, 2015 * * 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.5.25beta02 are Y2K compliant. It is my belief that + * upward through 1.5.25beta03 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 @@ -278,9 +278,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.25beta02" +#define PNG_LIBPNG_VER_STRING "1.5.25beta03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.25beta02 - November 23, 2015\n" + " libpng version 1.5.25beta03 - November 24, 2015\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -294,7 +294,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 02 +#define PNG_LIBPNG_VER_BUILD 03 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -441,7 +441,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_5_25beta02; +typedef char* png_libpng_version_1_5_25beta03; /* Three color definitions. The order of the red, green, and blue, (and the * exact size) is not important, although the size of the fields need to diff --git a/pngconf.h b/pngconf.h index 448f331e7..ca4216fae 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.25beta02, November 23, 2015 + * libpng version 1.5.25beta03, November 24, 2015 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpread.c b/pngpread.c index a1470f12b..91ade7f6e 100644 --- a/pngpread.c +++ b/pngpread.c @@ -127,7 +127,7 @@ png_process_some_data(png_structp png_ptr, png_infop info_ptr) void /* PRIVATE */ png_push_read_sig(png_structp png_ptr, png_infop info_ptr) { - png_size_t num_checked = png_ptr->sig_bytes, /* SAFE, does not exceed 8 */ + png_size_t num_checked = png_ptr->sig_bytes, /* SAFE, does not exceed 8 */ num_to_check = 8 - num_checked; if (png_ptr->buffer_size < num_to_check) diff --git a/pngtest.c b/pngtest.c index b2fb68ce4..1c10252c3 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.7.0 [(PENDING RELEASE)] + * Last changed in libpng 1.5.25 [(PENDING RELEASE)] * Copyright (c) 1998-2015 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.) @@ -1422,7 +1422,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) { # ifdef calc_pass_height png_uint_32 pass_height; - + if (num_passes == 7) /* interlaced */ { if (PNG_PASS_COLS(width, pass) > 0) @@ -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_5_25beta02 Your_png_h_is_not_version_1_5_25beta02; +typedef png_libpng_version_1_5_25beta03 Your_png_h_is_not_version_1_5_25beta03; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 93af58c24..b24fd6f6f 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.25beta02 - November 23, 2015 +libpng version 1.5.25beta03 - November 24, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 3f2546aa8..4ec6152f3 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@