diff --git a/ANNOUNCE b/ANNOUNCE index a7003189a..40e7e0426 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.4rc01 - June 27, 2011 +Libpng 1.5.4rc01 - June 30, 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. @@ -240,7 +240,7 @@ Version 1.5.4beta08 [June 23, 2011] Fixed pngvalid if ACCURATE_SCALE is defined. Updated scripts/pnglibconf.h.prebuilt. -Version 1.5.4rc01 [June 27, 2011] +Version 1.5.4rc01 [June 30, 2011] Define PNG_ALLOCATED to "restrict" only if MSC_VER >= 1400. Send comments/corrections/commendations to png-mng-implement at lists.sf.net: diff --git a/CHANGES b/CHANGES index 891773910..2cc1d386a 100644 --- a/CHANGES +++ b/CHANGES @@ -3503,7 +3503,7 @@ Version 1.5.4beta08 [June 23, 2011] Fixed pngvalid if ACCURATE_SCALE is defined. Updated scripts/pnglibconf.h.prebuilt. -Version 1.5.4rc01 [June 27, 2011] +Version 1.5.4rc01 [June 30, 2011] Define PNG_ALLOCATED to "restrict" only if MSC_VER >= 1400. Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/CMakeLists.txt b/CMakeLists.txt index 4967d8f63..a78f22d6b 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.4beta08 +# VERSION 15.${PNGLIB_RELEASE}.1.5.4rc01 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 3e2c65235..854dc789a 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.4beta08, June 23, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.4rc01, June 30, 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 -June 23, 2011 +June 30, 2011 diff --git a/README b/README index 186b63e3c..747b311a7 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.4beta08 - June 23, 2011 (shared library 15.0) +README for libpng version 1.5.4rc01 - June 30, 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 b03816905..9b4e55f3a 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.4beta08. +# Generated by GNU Autoconf 2.68 for libpng 1.5.4rc01. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.4beta08' -PACKAGE_STRING='libpng 1.5.4beta08' +PACKAGE_VERSION='1.5.4rc01' +PACKAGE_STRING='libpng 1.5.4rc01' 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.4beta08 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.4rc01 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.4beta08:";; + short | recursive ) echo "Configuration of libpng 1.5.4rc01:";; 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.4beta08 +libpng configure 1.5.4rc01 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.4beta08, which was +It was created by libpng $as_me 1.5.4rc01, 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.4beta08' + VERSION='1.5.4rc01' cat >>confdefs.h <<_ACEOF @@ -2787,7 +2787,7 @@ fi -PNGLIB_VERSION=1.5.4beta08 +PNGLIB_VERSION=1.5.4rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=4 @@ -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.4beta08, which was +This file was extended by libpng $as_me 1.5.4rc01, 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.4beta08 +libpng config.status 1.5.4rc01 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 795140963..fa0f4d352 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.4beta08], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.4rc01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.4beta08 +PNGLIB_VERSION=1.5.4rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=4 diff --git a/libpng-manual.txt b/libpng-manual.txt index 39a81e7de..3fa5374ba 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.4beta08 - June 23, 2011 + libpng version 1.5.4rc01 - June 30, 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.4beta08 - June 23, 2011 + libpng versions 0.97, January 1998, through 1.5.4rc01 - June 30, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4424,13 +4424,13 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -June 23, 2011 +June 30, 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.4beta08 are Y2K compliant. It is my belief that earlier +upward through 1.5.4rc01 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 16f880250..e2c67479d 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "June 23, 2011" +.TH LIBPNG 3 "June 30, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.4beta08 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.4rc01 .SH SYNOPSIS \fI\fB @@ -955,7 +955,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.4beta08 - June 23, 2011 + libpng version 1.5.4rc01 - June 30, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -966,7 +966,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.4beta08 - June 23, 2011 + libpng versions 0.97, January 1998, through 1.5.4rc01 - June 30, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5379,13 +5379,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -June 23, 2011 +June 30, 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.4beta08 are Y2K compliant. It is my belief that earlier +upward through 1.5.4rc01 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 @@ -5579,6 +5579,7 @@ the first widely used release: 1.5.3beta11 15 10503 15.so.15.3[.0] 1.5.3 [omitted] 1.5.4beta01-08 15 10504 15.so.15.4[.0] + 1.5.4rc01 15 10504 15.so.15.4[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5635,7 +5636,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.4beta08 - June 23, 2011: +Libpng version 1.5.4rc01 - June 30, 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). @@ -5658,7 +5659,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.4beta08, June 23, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.4rc01, June 30, 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 @@ -5757,7 +5758,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 23, 2011 +June 30, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 4d8a8f23a..8c7c4f22f 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "June 23, 2011" +.TH LIBPNGPF 3 "June 30, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.4beta08 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.4rc01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 179921a3a..208806602 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "June 23, 2011" +.TH PNG 5 "June 30, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index bc45fcf8f..fabec2d37 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_4beta08 Your_png_h_is_not_version_1_5_4beta08; +typedef png_libpng_version_1_5_4rc01 Your_png_h_is_not_version_1_5_4rc01; /* 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 @@ -617,13 +617,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.4beta08 - June 23, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.5.4rc01 - June 30, 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.4beta08 - June 23, 2011\ + return "libpng version 1.5.4rc01 - June 30, 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 0a6f2a5d9..bd9cfb7ed 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.4beta08 - June 23, 2011 + * libpng version 1.5.4rc01 - June 30, 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.4beta08 - June 23, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.5.4rc01 - June 30, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -155,6 +155,7 @@ * 1.5.3beta11 15 10503 15.so.15.3[.0] * 1.5.3 [omitted] * 1.5.4beta01-08 15 10504 15.so.15.4[.0] + * 1.5.4rc01 15 10504 15.so.15.4[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -186,7 +187,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.4beta08, June 23, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.4rc01, June 30, 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: @@ -298,13 +299,13 @@ * Y2K compliance in libpng: * ========================= * - * June 23, 2011 + * June 30, 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.4beta08 are Y2K compliant. It is my belief that + * upward through 1.5.4rc01 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 @@ -359,9 +360,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.4beta08" +#define PNG_LIBPNG_VER_STRING "1.5.4rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.4beta08 - June 23, 2011\n" + " libpng version 1.5.4rc01 - June 30, 2011\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -374,7 +375,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 08 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -521,7 +522,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_4beta08; +typedef char* png_libpng_version_1_5_4rc01; /* 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 e587a47e9..1c32415e9 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.4rc01 - June 27, 2011 + * libpng version 1.5.4rc01 - June 30, 2011 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 3b408c9f4..d8d27d70b 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_4beta08 Your_png_h_is_not_version_1_5_4beta08; +typedef png_libpng_version_1_5_4rc01 Your_png_h_is_not_version_1_5_4rc01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index a93c0995a..3b9d3616a 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.4beta08 - June 23, 2011 +libpng version 1.5.4rc01 - June 30, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 9d4725f36..fc7bd72aa 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@