diff --git a/ANNOUNCE b/ANNOUNCE index 257427bbc..2f2c5e04a 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.14beta05 - December 22, 2012 +Libpng 1.5.14beta06 - December 23, 2012 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.14beta05.tar.xz (LZMA-compressed, recommended) - 1.5.14beta05.tar.gz - 1.5.14beta05.tar.bz2 + 1.5.14beta06.tar.xz (LZMA-compressed, recommended) + 1.5.14beta06.tar.gz + 1.5.14beta06.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1514b05.7z (LZMA-compressed, recommended) - lp1514b05.zip + lp1514b06.7z (LZMA-compressed, recommended) + lp1514b06.zip Other information: - 1.5.14beta05-README.txt - 1.5.14beta05-LICENSE.txt + 1.5.14beta06-README.txt + 1.5.14beta06-LICENSE.txt Changes since the last public release (1.5.13): @@ -53,13 +53,15 @@ Version 1.5.14beta04 [December 19, 2012] Disassembled the version number in scripts/options.awk (necessary for building on SunOs). -Version 1.5.14beta05 [December 22, 2012] +Version 1.5.14beta05 [December 23, 2012] Fixed Windows build issues, enabled ARM compilation. Various warnings issued by earlier versions of GCC fixed for Cygwin and Min/GW (which both use old GCCs.) ARM support is enabled by default in zlib.props (unsupported by Microsoft) and ARM compilation is made possible by deleting the check for x86. The test programs cannot be run because they are not signed. +Version 1.5.14beta06 [December 23, 2012] + =========================================================================== NOTICE November 17, 2012: The location of the git repository at SourceForge has changed. diff --git a/CHANGES b/CHANGES index 3441fe9c5..ccf1ec648 100644 --- a/CHANGES +++ b/CHANGES @@ -3946,13 +3946,15 @@ Version 1.5.14beta04 [December 19, 2012] Disassembled the version number in scripts/options.awk (necessary for building on SunOs). -Version 1.5.14beta05 [December 22, 2012] +Version 1.5.14beta05 [December 23, 2012] Fixed Windows build issues, enabled ARM compilation. Various warnings issued by earlier versions of GCC fixed for Cygwin and Min/GW (which both use old GCCs.) ARM support is enabled by default in zlib.props (unsupported by Microsoft) and ARM compilation is made possible by deleting the check for x86. The test programs cannot be run because they are not signed. +Version 1.5.14beta06 [December 23, 2012] + =========================================================================== NOTICE November 17, 2012: The location of the git repository at SourceForge has changed. diff --git a/CMakeLists.txt b/CMakeLists.txt index b2f16033a..a1d36efc4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,7 +225,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.14beta05 +# VERSION 15.${PNGLIB_RELEASE}.1.5.14beta06 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 1a37dc40d..7f3d850b4 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.14beta05, December 19, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.14beta06, December 23, 2012, are Copyright (c) 2004, 2006-2012 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 -December 19, 2012 +December 23, 2012 diff --git a/README b/README index 804538f53..e8319a7c6 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.14beta05 - December 19, 2012 (shared library 15.0) +README for libpng version 1.5.14beta06 - December 23, 2012 (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 1352d6af7..a258c3f38 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.14beta05. +# Generated by GNU Autoconf 2.69 for libpng 1.5.14beta06. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.14beta05' -PACKAGE_STRING='libpng 1.5.14beta05' +PACKAGE_VERSION='1.5.14beta06' +PACKAGE_STRING='libpng 1.5.14beta06' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1338,7 +1338,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.14beta05 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.14beta06 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1408,7 +1408,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.14beta05:";; + short | recursive ) echo "Configuration of libpng 1.5.14beta06:";; esac cat <<\_ACEOF @@ -1519,7 +1519,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.14beta05 +libpng configure 1.5.14beta06 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1942,7 +1942,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.14beta05, which was +It was created by libpng $as_me 1.5.14beta06, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2757,7 +2757,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.14beta05' + VERSION='1.5.14beta06' cat >>confdefs.h <<_ACEOF @@ -2821,7 +2821,7 @@ fi -PNGLIB_VERSION=1.5.14beta05 +PNGLIB_VERSION=1.5.14beta06 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=14 @@ -13435,7 +13435,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.14beta05, which was +This file was extended by libpng $as_me 1.5.14beta06, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13501,7 +13501,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.14beta05 +libpng config.status 1.5.14beta06 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index d3fa52bb9..d7a4c5306 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.14beta05], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.14beta06], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.14beta05 +PNGLIB_VERSION=1.5.14beta06 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=14 diff --git a/libpng-manual.txt b/libpng-manual.txt index fdffec3c4..e4302c1e4 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.14beta05 - December 19, 2012 + libpng version 1.5.14beta06 - December 23, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2012 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.14beta05 - December 19, 2012 + libpng versions 0.97, January 1998, through 1.5.14beta06 - December 23, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2012 Glenn Randers-Pehrson @@ -4612,13 +4612,13 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -December 19, 2012 +December 23, 2012 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.14beta05 are Y2K compliant. It is my belief that earlier +upward through 1.5.14beta06 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 e0a2762f7..f2c17e19a 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "December 19, 2012" +.TH LIBPNG 3 "December 23, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.14beta05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.14beta06 .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.14beta05 - December 19, 2012 + libpng version 1.5.14beta06 - December 23, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2012 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.14beta05 - December 19, 2012 + libpng versions 0.97, January 1998, through 1.5.14beta06 - December 23, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2012 Glenn Randers-Pehrson @@ -5105,13 +5105,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -December 19, 2012 +December 23, 2012 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.14beta05 are Y2K compliant. It is my belief that earlier +upward through 1.5.14beta06 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 @@ -5331,7 +5331,7 @@ the first widely used release: 1.5.13beta01-02 15 10513 15.so.15.13[.0] 1.5.13rc01 15 10513 15.so.15.13[.0] 1.5.13 15 10513 15.so.15.13[.0] - 1.5.14beta01-05 15 10514 15.so.15.14[.0] + 1.5.14beta01-06 15 10514 15.so.15.14[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5388,7 +5388,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.14beta05 - December 19, 2012: +Libpng version 1.5.14beta06 - December 23, 2012: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5411,7 +5411,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.14beta05, December 19, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.14beta06, December 23, 2012, 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 @@ -5510,7 +5510,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 19, 2012 +December 23, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 55e0ad78e..4479494d0 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "December 19, 2012" +.TH LIBPNGPF 3 "December 23, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.14beta05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.14beta06 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 3e587aa82..71bcaca9c 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "December 19, 2012" +.TH PNG 5 "December 23, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 4e261dd8b..33ec2b2fc 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_14beta05 Your_png_h_is_not_version_1_5_14beta05; +typedef png_libpng_version_1_5_14beta06 Your_png_h_is_not_version_1_5_14beta06; /* 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 @@ -658,13 +658,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.14beta05 - December 19, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.5.14beta06 - December 23, 2012" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2012 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.14beta05 - December 19, 2012\ + return "libpng version 1.5.14beta06 - December 23, 2012\ Copyright (c) 1998-2012 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 3dd1c9b66..7a7fd487e 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.14beta05 - December 19, 2012 + * libpng version 1.5.14beta06 - December 23, 2012 * Copyright (c) 1998-2012 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.14beta05 - December 19, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.5.14beta06 - December 23, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -181,7 +181,7 @@ * 1.5.13beta01-02 15 10513 15.so.15.13[.0] * 1.5.13rc01 15 10513 15.so.15.13[.0] * 1.5.13 15 10513 15.so.15.13[.0] - * 1.5.14beta01-05 15 10514 15.so.15.14[.0] + * 1.5.14beta01-06 15 10514 15.so.15.14[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -213,7 +213,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.14beta05, December 19, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.14beta06, December 23, 2012, are * Copyright (c) 2004, 2006-2012 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: @@ -325,13 +325,13 @@ * Y2K compliance in libpng: * ========================= * - * December 19, 2012 + * December 23, 2012 * * 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.14beta05 are Y2K compliant. It is my belief that + * upward through 1.5.14beta06 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 @@ -390,9 +390,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.14beta05" +#define PNG_LIBPNG_VER_STRING "1.5.14beta06" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.14beta05 - December 19, 2012\n" + " libpng version 1.5.14beta06 - December 23, 2012\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -406,7 +406,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 05 +#define PNG_LIBPNG_VER_BUILD 06 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -553,7 +553,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_14beta05; +typedef char* png_libpng_version_1_5_14beta06; /* 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 4ee5fd962..a693e3be3 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.14beta05 - December 21, 2012 + * libpng version 1.5.14beta06 - December 23, 2012 * * Copyright (c) 1998-2012 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 971ed1e15..d6de40088 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1817,4 +1817,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_14beta05 Your_png_h_is_not_version_1_5_14beta05; +typedef png_libpng_version_1_5_14beta06 Your_png_h_is_not_version_1_5_14beta06; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index a8d8de4ce..33e9fc5db 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.14beta05 - December 21, 2012 +libpng version 1.5.14beta06 - December 23, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index e4d597519..2e8672df4 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@