From b6ec5eb74e389b59935c686c17aef782423eff4d Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 5 Nov 2015 06:48:32 -0600 Subject: [PATCH] [libpng15] Imported from libpng-1.5.24rc04.tar --- ANNOUNCE | 24 +++++++++++++++--------- CHANGES | 6 ++++++ CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure | 22 +++++++++++----------- configure.ac | 4 ++-- libpng-manual.txt | 8 +++----- libpng.3 | 21 +++++++++------------ libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 21 ++++++++++----------- pngconf.h | 2 +- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 10 +++++----- scripts/def.c | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 4 ++-- scripts/symbols.def | 2 +- 26 files changed, 84 insertions(+), 78 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 0402bc9ff..97db0437f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.24rc02 - November 3, 2015 +Libpng 1.5.24rc04 - November 5, 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.24rc02.tar.xz (LZMA-compressed, recommended) - 1.5.24rc02.tar.gz - 1.5.24rc02.tar.bz2 + 1.5.24rc04.tar.xz (LZMA-compressed, recommended) + 1.5.24rc04.tar.gz + 1.5.24rc04.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1524r02.7z (LZMA-compressed, recommended) - lp1524r02.zip + lp1524r04.7z (LZMA-compressed, recommended) + lp1524r04.zip Other information: - 1.5.24rc02-README.txt - 1.5.24rc02-LICENSE.txt - libpng-1.5.24rc02-*.asc (armored detached GPG signatures) + 1.5.24rc04-README.txt + 1.5.24rc04-LICENSE.txt + libpng-1.5.24rc04-*.asc (armored detached GPG signatures) Changes since the last public release (1.5.23): @@ -68,6 +68,12 @@ Version 1.5.24rc02 [November 3, 2015] Removed much of the long list of previous versions from png.h and libpng.3. +Version 1.5.24rc03 [omitted] + +Version 1.5.24rc04 [November 5, 2015] + Fixed new bug with CRC error after reading an over-length palette + (bug report by Cosmin Truta). + 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 54e39b895..4a2ec2f15 100644 --- a/CHANGES +++ b/CHANGES @@ -4415,6 +4415,12 @@ Version 1.5.24rc02 [November 3, 2015] Removed much of the long list of previous versions from png.h and libpng.3. +Version 1.5.24rc03 [omitted] + +Version 1.5.24rc04 [November 5, 2015] + Fixed new bug with CRC error after reading an over-length palette + (bug report by Cosmin Truta). + 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 b9c7df5a3..ff1e1d735 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.24rc02 +# VERSION 15.${PNGLIB_RELEASE}.1.5.24rc04 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index a3e8dc33f..e255ad163 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.24rc02, November 3, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.5.24rc04, November 5, 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 3, 2015 +November 5, 2015 diff --git a/README b/README index 8f05e7405..d651cb7ac 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.24rc02 - November 3, 2015 (shared library 15.0) +README for libpng version 1.5.24rc04 - November 5, 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 14ae612c4..4ae48cccf 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.24rc02. +# Generated by GNU Autoconf 2.69 for libpng 1.5.24rc04. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.24rc02' -PACKAGE_STRING='libpng 1.5.24rc02' +PACKAGE_VERSION='1.5.24rc04' +PACKAGE_STRING='libpng 1.5.24rc04' 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.24rc02 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.24rc04 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.24rc02:";; + short | recursive ) echo "Configuration of libpng 1.5.24rc04:";; 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.24rc02 +libpng configure 1.5.24rc04 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.24rc02, which was +It was created by libpng $as_me 1.5.24rc04, 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.24rc02' + VERSION='1.5.24rc04' cat >>confdefs.h <<_ACEOF @@ -2982,7 +2982,7 @@ fi -PNGLIB_VERSION=1.5.24rc02 +PNGLIB_VERSION=1.5.24rc04 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=24 @@ -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.24rc02, which was +This file was extended by libpng $as_me 1.5.24rc04, 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.24rc02 +libpng config.status 1.5.24rc04 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 654b6c49f..2a409dd05 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.24rc02], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.24rc04], [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.24rc02 +PNGLIB_VERSION=1.5.24rc04 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=24 diff --git a/libpng-manual.txt b/libpng-manual.txt index 10dac788c..235f21fb3 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.24rc02 - November 3, 2015 + libpng version 1.5.24rc04 - November 5, 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.24rc02 - November 3, 2015 + libpng versions 0.97, January 1998, through 1.5.24rc04 - November 5, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4506,13 +4506,11 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -November 3, 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.24rc02 are Y2K compliant. It is my belief that earlier +upward through 1.5.24rc04 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 55ff95620..8b20de9dc 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "November 3, 2015" +.TH LIBPNG 3 "November 5, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.24rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.24rc04 .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.24rc02 - November 3, 2015 + libpng version 1.5.24rc04 - November 5, 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.24rc02 - November 3, 2015 + libpng versions 0.97, January 1998, through 1.5.24rc04 - November 5, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5002,13 +5002,11 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -November 3, 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.24rc02 are Y2K compliant. It is my belief that earlier +upward through 1.5.24rc04 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 @@ -5107,8 +5105,7 @@ the first widely used release: ... 1.2.53 13 10253 12.so.0.53[.0] ... - 1.5.24beta01-02 15 10524 15.so.15.24[.0] - 1.5.24rc01-02 15 10524 15.so.15.24[.0] + 1.5.24 15 10524 15.so.15.24[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5164,7 +5161,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.24rc02 - November 3, 2015: +Libpng version 1.5.24rc04 - November 5, 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). @@ -5189,7 +5186,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.5.24rc02, November 3, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.5.24rc04, November 5, 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 @@ -5287,7 +5284,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 3, 2015 +November 5, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 3202c7906..41a2009c0 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "November 3, 2015" +.TH LIBPNGPF 3 "November 5, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.24rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.24rc04 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 5a40db969..f4fe07118 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 3, 2015" +.TH PNG 5 "November 5, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index f63b15a02..20422792e 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_24rc02 Your_png_h_is_not_version_1_5_24rc02; +typedef png_libpng_version_1_5_24rc04 Your_png_h_is_not_version_1_5_24rc04; /* 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.24rc02 - November 3, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.5.24rc04 - November 5, 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.24rc02 - November 3, 2015\ + return "libpng version 1.5.24rc04 - November 5, 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 47c86a30e..3dfac8de0 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.24rc02, November 3, 2015 + * libpng version 1.5.24rc04, November 5, 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.24rc02, November 3, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.5.24rc04, November 5, 2015: Glenn * See also "Contributing Authors", below. */ @@ -24,7 +24,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.5.24rc02, November 3, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.5.24rc04, November 5, 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 @@ -182,8 +182,7 @@ * ... * 1.2.53 13 10253 12.so.0.53[.0] * ... - * 1.5.24beta01-02 15 10524 15.so.15.24[.0] - * 1.5.24rc01-02 15 10524 15.so.15.24[.0] + * 1.5.24 15 10524 15.so.15.24[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -211,13 +210,13 @@ * Y2K compliance in libpng: * ========================= * - * November 3, 2015 + * November 5, 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.24rc02 are Y2K compliant. It is my belief that + * upward through 1.5.24rc04 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 +277,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.24rc02" +#define PNG_LIBPNG_VER_STRING "1.5.24rc04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.24rc02 - November 3, 2015\n" + " libpng version 1.5.24rc04 - November 5, 2015\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -294,7 +293,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 02 +#define PNG_LIBPNG_VER_BUILD 04 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -441,7 +440,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_24rc02; +typedef char* png_libpng_version_1_5_24rc04; /* 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 b328bc8cf..f01fa4f5b 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.24rc02, November 3, 2015 + * libpng version 1.5.24rc04, November 5, 2015 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index ecd81fe85..129889ff9 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2056,4 +2056,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_24rc02 Your_png_h_is_not_version_1_5_24rc02; +typedef png_libpng_version_1_5_24rc04 Your_png_h_is_not_version_1_5_24rc04; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index c84fe3f3e..8d9ec743e 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.24rc02 - November 3, 2015 +libpng version 1.5.24rc04 - November 5, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index f37b5394a..d8b8a9802 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@