From bb4f77cd956e0e66b3026339f625c292b3aac580 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 16 May 2011 20:40:59 -0500 Subject: [PATCH] [devel] Bump to version libpng-1.5.3beta09 --- ANNOUNCE | 20 ++++++++++---------- 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 +- pngerror.c | 7 ++++--- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 ++++++------ scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/symbols.def | 2 +- 25 files changed, 81 insertions(+), 80 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 8f5c06f08..bd298d10b 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.3rc01 - May 16, 2011 +Libpng 1.5.3beta09 - May 17, 2011 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,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.5.3rc01.tar.xz (LZMA-compressed, recommended) - 1.5.3rc01.tar.gz - 1.5.3rc01.tar.bz2 + 1.5.3beta09.tar.xz (LZMA-compressed, recommended) + 1.5.3beta09.tar.gz + 1.5.3beta09.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp153r01.7z (LZMA-compressed, recommended) - lp153r01.zip + lp153b09.7z (LZMA-compressed, recommended) + lp153b09.zip Other information: - 1.5.3rc01-README.txt - 1.5.3rc01-LICENSE.txt + 1.5.3beta09-README.txt + 1.5.3beta09-LICENSE.txt Changes since the last public release (1.5.2): @@ -123,11 +123,11 @@ Version 1.5.3beta08 [May 16, 2011] header is read. It never performed any useful function to override the default anyway. Added memory overwrite and palette image checks to pngvalid.c - Previously palette image code was poorly checked, since the transformation + Previously palette image code was poorly checked. Since the transformation code has a special palette path in most cases this was a severe weakness. Minor cleanup and some extra checking in pngrutil.c and pngrtran.c -Version 1.5.3rc01 [May 16, 2011] +Version 1.5.3beta09 [May 17, 2011] Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index df173228a..e6d36fc14 100644 --- a/CHANGES +++ b/CHANGES @@ -3346,6 +3346,8 @@ Version 1.5.3beta05 [May 6, 2011] requiring the host OS to implement snprintf. As a side effect the dependency of the tIME-supporting RFC1132 code on stdio is removed and PNG_NO_WARNINGS does actually work now. + Pass "" instead of '\0' to png_default_error() in png_err(). This mistake + was introduced in libpng-1.2.20beta01. Added PNG_WRITE_OPTIMIZE_CMF_SUPPORTED macro to make the zlib "CMF" byte optimization configureable. IDAT compression failed if preceded by a compressed text chunk (bug @@ -3382,11 +3384,11 @@ Version 1.5.3beta08 [May 16, 2011] header is read. It never performed any useful function to override the default anyway. Added memory overwrite and palette image checks to pngvalid.c - Previously palette image code was poorly checked, since the transformation + Previously palette image code was poorly checked. Since the transformation code has a special palette path in most cases this was a severe weakness. Minor cleanup and some extra checking in pngrutil.c and pngrtran.c -Version 1.5.3rc01 [May 16, 2011] +Version 1.5.3beta09 [May 17, 2011] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 4737e2471..c001d5a35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -260,7 +260,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE}) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.3rc01 +# VERSION 15.${PNGLIB_RELEASE}.1.5.3beta09 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index b4f8a48a8..6f93ec1f8 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.3rc01, May 16, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.3beta09, May 17, 2011, are Copyright (c) 2004, 2006-2011 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 16, 2011 +May 17, 2011 diff --git a/README b/README index a7e0c7dd2..697ba0c98 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.3rc01 - May 16, 2011 (shared library 15.0) +README for libpng version 1.5.3beta09 - May 17, 2011 (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 370e79944..48ed3cfe1 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.68 for libpng 1.5.3rc01. +# Generated by GNU Autoconf 2.68 for libpng 1.5.3beta09. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.3rc01' -PACKAGE_STRING='libpng 1.5.3rc01' +PACKAGE_VERSION='1.5.3beta09' +PACKAGE_STRING='libpng 1.5.3beta09' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1307,7 +1307,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.3rc01 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.3beta09 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1377,7 +1377,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.3rc01:";; + short | recursive ) echo "Configuration of libpng 1.5.3beta09:";; esac cat <<\_ACEOF @@ -1485,7 +1485,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.3rc01 +libpng configure 1.5.3beta09 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1908,7 +1908,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.3rc01, which was +It was created by libpng $as_me 1.5.3beta09, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2723,7 +2723,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.3rc01' + VERSION='1.5.3beta09' cat >>confdefs.h <<_ACEOF @@ -2787,7 +2787,7 @@ fi -PNGLIB_VERSION=1.5.3rc01 +PNGLIB_VERSION=1.5.3beta09 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=3 @@ -13040,7 +13040,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.3rc01, which was +This file was extended by libpng $as_me 1.5.3beta09, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13106,7 +13106,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.3rc01 +libpng config.status 1.5.3beta09 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 758cff0d6..ae83a7c9c 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.3rc01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.3beta09], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.3rc01 +PNGLIB_VERSION=1.5.3beta09 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=3 diff --git a/libpng-manual.txt b/libpng-manual.txt index 366f3def0..490c23aa4 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.3rc01 - May 16, 2011 + libpng version 1.5.3beta09 - May 17, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 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.3rc01 - May 16, 2011 + libpng versions 0.97, January 1998, through 1.5.3beta09 - May 17, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4400,13 +4400,13 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -May 16, 2011 +May 17, 2011 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.3rc01 are Y2K compliant. It is my belief that earlier +upward through 1.5.3beta09 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpng.3 b/libpng.3 index 99f029066..661164816 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "May 16, 2011" +.TH LIBPNG 3 "May 17, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.3rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.3beta09 .SH SYNOPSIS \fI\fB @@ -951,7 +951,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.3rc01 - May 16, 2011 + libpng version 1.5.3beta09 - May 17, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -962,7 +962,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.3rc01 - May 16, 2011 + libpng versions 0.97, January 1998, through 1.5.3beta09 - May 17, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5351,13 +5351,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -May 16, 2011 +May 17, 2011 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.3rc01 are Y2K compliant. It is my belief that earlier +upward through 1.5.3beta09 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -5546,8 +5546,7 @@ the first widely used release: 1.5.2beta01-03 15 10502 15.so.15.2[.0] 1.5.2rc01-03 15 10502 15.so.15.2[.0] 1.5.2 15 10502 15.so.15.2[.0] - 1.5.3beta01-08 15 10503 15.so.15.3[.0] - 1.5.3rc01 15 10503 15.so.15.3[.0] + 1.5.3beta01-09 15 10503 15.so.15.3[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5604,7 +5603,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.3rc01 - May 16, 2011: +Libpng version 1.5.3beta09 - May 17, 2011: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5627,7 +5626,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.3rc01, May 16, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.3beta09, May 17, 2011, are Copyright (c) 2004,2006-2007 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 @@ -5726,7 +5725,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 16, 2011 +May 17, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index c7cef7b03..d275f9477 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "May 16, 2011" +.TH LIBPNGPF 3 "May 17, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.3rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.3beta09 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 50f8a5c68..5d90858a0 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "May 16, 2011" +.TH PNG 5 "May 17, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index b218c9c45..ff94c5fe4 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_3rc01 Your_png_h_is_not_version_1_5_3rc01; +typedef png_libpng_version_1_5_3beta09 Your_png_h_is_not_version_1_5_3beta09; /* 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 @@ -619,13 +619,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.3rc01 - May 16, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.5.3beta09 - May 17, 2011" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2011 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.3rc01 - May 16, 2011\ + return "libpng version 1.5.3beta09 - May 17, 2011\ Copyright (c) 1998-2011 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 666830f65..bc8dbf6ab 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.3rc01 - May 16, 2011 + * libpng version 1.5.3beta09 - May 17, 2011 * Copyright (c) 1998-2011 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.3rc01 - May 16, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.5.3beta09 - May 17, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -150,8 +150,7 @@ * 1.5.2beta01-03 15 10502 15.so.15.2[.0] * 1.5.2rc01-03 15 10502 15.so.15.2[.0] * 1.5.2 15 10502 15.so.15.2[.0] - * 1.5.3beta01-08 15 10503 15.so.15.3[.0] - * 1.5.3rc01 15 10503 15.so.15.3[.0] + * 1.5.3beta01-09 15 10503 15.so.15.3[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -183,7 +182,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.3rc01, May 16, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.3beta09, May 17, 2011, are * Copyright (c) 2004, 2006-2011 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: @@ -295,13 +294,13 @@ * Y2K compliance in libpng: * ========================= * - * May 16, 2011 + * May 17, 2011 * * 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.3rc01 are Y2K compliant. It is my belief that + * upward through 1.5.3beta09 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 @@ -356,9 +355,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.3rc01" +#define PNG_LIBPNG_VER_STRING "1.5.3beta09" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.3rc01 - May 16, 2011\n" + " libpng version 1.5.3beta09 - May 17, 2011\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -371,7 +370,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 01 +#define PNG_LIBPNG_VER_BUILD 09 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -518,7 +517,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_3rc01; +typedef char* png_libpng_version_1_5_3beta09; /* 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 23d5080c6..5528622cf 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.3rc01 - May 16, 2011 + * libpng version 1.5.3beta09 - May 17, 2011 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index eef4ec4f4..4881dfe82 100644 --- a/pngerror.c +++ b/pngerror.c @@ -89,9 +89,10 @@ png_error,(png_structp png_ptr, png_const_charp error_message),PNG_NORETURN) PNG_FUNCTION(void,PNGAPI png_err,(png_structp png_ptr),PNG_NORETURN) { - /* Prior to 1.5.2 the error_fn received a NULL pointer, expressed erroneouly - * as '\0'. This was apparently an error, and png_default_error will crash - * in this case. + /* Prior to 1.5.2 the error_fn received a NULL pointer, expressed + * erroneously as '\0', instead of the empty string "". This was + * apparently an error, introduced in libpng-1.2.20, and png_default_error + * will crash in this case. */ if (png_ptr != NULL && png_ptr->error_fn != NULL) (*(png_ptr->error_fn))(png_ptr, ""); diff --git a/pngtest.c b/pngtest.c index cf89f5710..4479c8baf 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1794,4 +1794,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_3rc01 Your_png_h_is_not_version_1_5_3rc01; +typedef png_libpng_version_1_5_3beta09 Your_png_h_is_not_version_1_5_3beta09; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index beb0eb850..e7a9c0b0f 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.3rc01 - May 16, 2011 +libpng version 1.5.3beta09 - May 17, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 6d2676ba3..6b912c6f2 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@