From 90238dfe7a91b6b1c4cb1c247799c5577bd52708 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 21 Dec 2014 13:58:38 -0600 Subject: [PATCH] [libpng15] Imported from libpng-1.5.21rc02.tar --- ANNOUNCE | 21 ++++++++++++--------- CHANGES | 3 +++ CMakeLists.txt | 2 +- LICENSE | 2 +- README | 2 +- configure | 22 +++++++++++----------- configure.ac | 4 ++-- libpng-manual.txt | 6 +++--- libpng.3 | 13 +++++++------ libpngpf.3 | 2 +- png.c | 6 +++--- png.h | 17 +++++++++-------- pngconf.h | 2 +- pngrutil.c | 6 +++--- 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, 75 insertions(+), 67 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 77523d1cf..4ac7b55d3 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.21rc01 - December 21, 2014 +Libpng 1.5.21rc02 - December 21, 2014 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.21rc01.tar.xz (LZMA-compressed, recommended) - 1.5.21rc01.tar.gz - 1.5.21rc01.tar.bz2 + 1.5.21rc02.tar.xz (LZMA-compressed, recommended) + 1.5.21rc02.tar.gz + 1.5.21rc02.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1521r01.7z (LZMA-compressed, recommended) - lp1521r01.zip + lp1521r02.7z (LZMA-compressed, recommended) + lp1521r02.zip Other information: - 1.5.21rc01-README.txt - 1.5.21rc01-LICENSE.txt - libpng-1.5.21rc01-*.asc (armored detached GPG signatures) + 1.5.21rc02-README.txt + 1.5.21rc02-LICENSE.txt + libpng-1.5.21rc02-*.asc (armored detached GPG signatures) Changes since the last public release (1.5.20): @@ -35,6 +35,9 @@ Version 1.5.21rc01 [December 21, 2014] Restored a test on width that was removed from png.c at libpng-1.6.9 (Bug report by Alex Eubanks). +Version 1.5.21rc02 [December 21, 2014] + Undid the update to pngrutil.c in 1.6.16rc01. + 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 7190e6864..2c0cebaba 100644 --- a/CHANGES +++ b/CHANGES @@ -4281,6 +4281,9 @@ Version 1.5.21rc01 [December 21, 2014] Restored a test on width that was removed from png.c at libpng-1.6.9 (Bug report by Alex Eubanks). +Version 1.5.21rc02 [December 21, 2014] + Undid the update to pngrutil.c in 1.6.16rc01. + 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 1afb11a41..8f6bb6409 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -219,7 +219,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.21rc01 +# VERSION 15.${PNGLIB_RELEASE}.1.5.21rc02 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index d6a395049..db6eb544f 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.21rc01, December 21, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.5.21rc02, December 21, 2014, are Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors diff --git a/README b/README index 1956a5650..ab1721323 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.21rc01 - December 21, 2014 (shared library 15.0) +README for libpng version 1.5.21rc02 - December 21, 2014 (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 40df0848a..7973c83bd 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.21rc01. +# Generated by GNU Autoconf 2.69 for libpng 1.5.21rc02. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.21rc01' -PACKAGE_STRING='libpng 1.5.21rc01' +PACKAGE_VERSION='1.5.21rc02' +PACKAGE_STRING='libpng 1.5.21rc02' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1351,7 +1351,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.21rc01 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.21rc02 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1421,7 +1421,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.21rc01:";; + short | recursive ) echo "Configuration of libpng 1.5.21rc02:";; esac cat <<\_ACEOF @@ -1571,7 +1571,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.21rc01 +libpng configure 1.5.21rc02 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1994,7 +1994,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.21rc01, which was +It was created by libpng $as_me 1.5.21rc02, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2857,7 +2857,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.21rc01' + VERSION='1.5.21rc02' cat >>confdefs.h <<_ACEOF @@ -2973,7 +2973,7 @@ fi -PNGLIB_VERSION=1.5.21rc01 +PNGLIB_VERSION=1.5.21rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=21 @@ -13628,7 +13628,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.21rc01, which was +This file was extended by libpng $as_me 1.5.21rc02, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13694,7 +13694,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.21rc01 +libpng config.status 1.5.21rc02 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index ca7af2436..882cd06b1 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.21rc01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.21rc02], [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.21rc01 +PNGLIB_VERSION=1.5.21rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=21 diff --git a/libpng-manual.txt b/libpng-manual.txt index 2b10eefb5..c10c7698b 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.21rc01 - December 21, 2014 + libpng version 1.5.21rc02 - December 21, 2014 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.21rc01 - December 21, 2014 + libpng versions 0.97, January 1998, through 1.5.21rc02 - December 21, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4537,7 +4537,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.21rc01 are Y2K compliant. It is my belief that earlier +upward through 1.5.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 that diff --git a/libpng.3 b/libpng.3 index 8d504e86a..8dcbd2569 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "December 21, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.21rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.21rc02 .SH SYNOPSIS \fB #include \fP @@ -492,7 +492,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.21rc01 - December 21, 2014 + libpng version 1.5.21rc02 - December 21, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -503,7 +503,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.21rc01 - December 21, 2014 + libpng versions 0.97, January 1998, through 1.5.21rc02 - December 21, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5029,7 +5029,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.21rc01 are Y2K compliant. It is my belief that earlier +upward through 1.5.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 that @@ -5271,6 +5271,7 @@ the first widely used release: 1.5.20rc01-03 15 10520 15.so.15.20[.0] 1.5.20 15 10520 15.so.15.20[.0] 1.5.21beta01-02 15 10521 15.so.15.21[.0] + 1.5.21rc01-01 15 10521 15.so.15.21[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5327,7 +5328,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.21rc01 - December 21, 2014: +Libpng version 1.5.21rc02 - December 21, 2014: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5350,7 +5351,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.21rc01, December 21, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.5.21rc02, December 21, 2014, are Copyright (c) 2004,2006-20014 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors diff --git a/libpngpf.3 b/libpngpf.3 index d5f80a715..3284c9579 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "December 21, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.21rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.21rc02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index c48b2e7b6..83dac4a19 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_21rc01 Your_png_h_is_not_version_1_5_21rc01; +typedef png_libpng_version_1_5_21rc02 Your_png_h_is_not_version_1_5_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 @@ -660,13 +660,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.21rc01 - December 21, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.5.21rc02 - December 21, 2014" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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.21rc01 - December 21, 2014\ + return "libpng version 1.5.21rc02 - December 21, 2014\ Copyright (c) 1998-2014 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 ee6d24c32..9edf04086 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.21rc01 - December 21, 2014 + * libpng version 1.5.21rc02 - December 21, 2014 * Copyright (c) 1998-2014 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.) @@ -11,7 +11,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.21rc01 - December 21, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.5.21rc02 - December 21, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -203,6 +203,7 @@ * 1.5.20rc01-03 15 10520 15.so.15.20[.0] * 1.5.20 15 10520 15.so.15.20[.0] * 1.5.21beta01-02 15 10521 15.so.15.21[.0] + * 1.5.21rc01-02 15 10521 15.so.15.21[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -234,7 +235,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.21rc01, December 21, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.21rc02, December 21, 2014, are * Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -352,7 +353,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.5.21rc01 are Y2K compliant. It is my belief that + * upward through 1.5.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 @@ -413,9 +414,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.21rc01" +#define PNG_LIBPNG_VER_STRING "1.5.21rc02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.21rc01 - December 21, 2014\n" + " libpng version 1.5.21rc02 - December 21, 2014\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -429,7 +430,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 @@ -576,7 +577,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_21rc01; +typedef char* png_libpng_version_1_5_21rc02; /* 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 b873e5319..7d5c1304d 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.21rc01 - December 21, 2014 + * libpng version 1.5.21rc02 - December 21, 2014 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index 5128c884e..6b32fa6cc 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.5.21 [(PENDING RELEASE)] + * Last changed in libpng 1.5.19 [August 21, 2014] * Copyright (c) 1998-2014 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.) @@ -592,12 +592,12 @@ png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) /* Set up other useful info */ png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth * png_ptr->channels); + png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->width); png_debug1(3, "bit_depth = %d", png_ptr->bit_depth); png_debug1(3, "channels = %d", png_ptr->channels); + png_debug1(3, "rowbytes = %lu", (unsigned long)png_ptr->rowbytes); png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, color_type, interlace_type, compression_type, filter_type); - png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->width); - png_debug1(3, "rowbytes = %lu", (unsigned long)png_ptr->rowbytes); } /* Read and check the palette */ diff --git a/pngtest.c b/pngtest.c index 32a161cf9..1d4cd14b6 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1990,4 +1990,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_21rc01 Your_png_h_is_not_version_1_5_21rc01; +typedef png_libpng_version_1_5_21rc02 Your_png_h_is_not_version_1_5_21rc02; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index ec49cd824..b8430f5e3 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.21rc01 - December 21, 2014 +libpng version 1.5.21rc02 - December 21, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 2ca0a9ddd..4abff9a92 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@