diff --git a/ANNOUNCE b/ANNOUNCE index 03357ce24..d512542ab 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0alpha05 - December 24, 2012 +Libpng 1.7.0alpha06 - December 24, 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.7.0alpha05.tar.xz (LZMA-compressed, recommended) - 1.7.0alpha05.tar.gz - 1.7.0alpha05.tar.bz2 + 1.7.0alpha06.tar.xz (LZMA-compressed, recommended) + 1.7.0alpha06.tar.gz + 1.7.0alpha06.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp170a05.7z (LZMA-compressed, recommended) - lp170a05.zip + lp170a06.7z (LZMA-compressed, recommended) + lp170a06.zip Other information: - 1.7.0alpha05-README.txt - 1.7.0alpha05-LICENSE.txt + 1.7.0alpha06-README.txt + 1.7.0alpha06-LICENSE.txt Changes since the last public release (1.6.0): @@ -104,6 +104,8 @@ Version 1.7.0alpha05 [December 24, 2012] Discontinued distributing libpng-1.x.x.tar.bz2. Discontinued distributing libpng-1.7.0-1.6.0-diff.txt and similar. +Version 1.7.0alpha06 [December 24, 2012] + =========================================================================== NOTICE November 17, 2012: The location of the git repository at SourceForge has changed. diff --git a/CHANGES b/CHANGES index aa1954e4c..cb6302bcf 100644 --- a/CHANGES +++ b/CHANGES @@ -4389,6 +4389,8 @@ Version 1.7.0alpha05 [December 24, 2012] Discontinued distributing libpng-1.x.x.tar.bz2. Discontinued distributing libpng-1.7.0-1.6.0-diff.txt and similar. +Version 1.7.0alpha06 [December 24, 2012] + =========================================================================== NOTICE November 17, 2012: The location of the git repository at SourceForge has changed. diff --git a/CMakeLists.txt b/CMakeLists.txt index ff7251057..a1a7f21b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -260,7 +260,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 17.${PNGLIB_RELEASE}.1.7.0alpha05 +# VERSION 17.${PNGLIB_RELEASE}.1.7.0alpha06 VERSION 17.${PNGLIB_RELEASE}.0 SOVERSION 17 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 169290988..635fde1eb 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.7.0alpha05, December 24, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0alpha06, December 24, 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 diff --git a/README b/README index cbbe6ad44..4ce497aac 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0alpha05 - December 24, 2012 (shared library 17.0) +README for libpng version 1.7.0alpha06 - December 24, 2012 (shared library 17.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.ac b/configure.ac index c3774f6f4..7a53fa518 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.7.0alpha05],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.7.0alpha06],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -37,7 +37,7 @@ dnl automake, so the following is not necessary (and is not defined anyway): dnl AM_PREREQ([1.11.2]) dnl stop configure from automagically running automake -PNGLIB_VERSION=1.7.0alpha05 +PNGLIB_VERSION=1.7.0alpha06 PNGLIB_MAJOR=1 PNGLIB_MINOR=7 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index 7e4e9b7f5..9e669f196 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.7.0alpha05 - December 24, 2012 + libpng version 1.7.0alpha06 - December 24, 2012 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.7.0alpha05 - December 24, 2012 + libpng versions 0.97, January 1998, through 1.7.0alpha06 - December 24, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5167,7 +5167,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.7.0alpha05 are Y2K compliant. It is my belief that earlier +upward through 1.7.0alpha06 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 d7752acc3..8e1a91295 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "December 24, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0alpha05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0alpha06 .SH SYNOPSIS \fB #include \fP @@ -494,7 +494,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.7.0alpha05 - December 24, 2012 + libpng version 1.7.0alpha06 - December 24, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -505,7 +505,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0alpha05 - December 24, 2012 + libpng versions 0.97, January 1998, through 1.7.0alpha06 - December 24, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5662,7 +5662,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.7.0alpha05 are Y2K compliant. It is my belief that earlier +upward through 1.7.0alpha06 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 @@ -5868,7 +5868,7 @@ the first widely used release: 1.5.7rc01-03 15 10507 15.so.15.7[.0] 1.5.7 15 10507 15.so.15.7[.0] 1.6.0beta01-32 16 10600 16.so.16.0[.0] - 1.7.0alpha01-05 17 10700 17.so.17.0[.0] + 1.7.0alpha01-06 17 10700 17.so.17.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5925,7 +5925,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0alpha05 - December 24, 2012: +Libpng version 1.7.0alpha06 - December 24, 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). @@ -5948,7 +5948,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.7.0alpha05, December 24, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0alpha06, December 24, 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 diff --git a/libpngpf.3 b/libpngpf.3 index 85e3da38e..cb45963f2 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "December 24, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0alpha05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0alpha06 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index e41eb43b7..da451c01a 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_7_0alpha05 Your_png_h_is_not_version_1_7_0alpha05; +typedef png_libpng_version_1_7_0alpha06 Your_png_h_is_not_version_1_7_0alpha06; /* 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 @@ -691,13 +691,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0alpha05 - December 24, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.7.0alpha06 - December 24, 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.7.0alpha05 - December 24, 2012\ + return "libpng version 1.7.0alpha06 - December 24, 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 59a315272..723591b21 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0alpha05 - December 24, 2012 + * libpng version 1.7.0alpha06 - December 24, 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.7.0alpha05 - December 24, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.7.0alpha06 - December 24, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -167,7 +167,7 @@ * 1.5.7rc01-03 15 10507 15.so.15.7[.0] * 1.5.7 15 10507 15.so.15.7[.0] * 1.6.0beta01-33 16 10600 16.so.16.0[.0] - * 1.7.0alpha01-05 17 10700 17.so.17.0[.0] + * 1.7.0alpha01-06 17 10700 17.so.17.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -199,7 +199,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.7.0alpha05, December 24, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0alpha06, December 24, 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: @@ -317,7 +317,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.7.0alpha05 are Y2K compliant. It is my belief that + * upward through 1.7.0alpha06 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 @@ -377,9 +377,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.7.0alpha05" +#define PNG_LIBPNG_VER_STRING "1.7.0alpha06" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0alpha05 - December 24, 2012\n" + " libpng version 1.7.0alpha06 - December 24, 2012\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 @@ -393,7 +393,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 @@ -523,7 +523,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_7_0alpha05; +typedef char* png_libpng_version_1_7_0alpha06; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index c47277913..60816f6e0 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0alpha05 - December 24, 2012 + * libpng version 1.7.0alpha06 - December 24, 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 d5e68005e..541d6a776 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1946,4 +1946,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_7_0alpha05 Your_png_h_is_not_version_1_7_0alpha05; +typedef png_libpng_version_1_7_0alpha06 Your_png_h_is_not_version_1_7_0alpha06; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 03d7b514e..5a7229470 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0alpha05 - December 24, 2012 +libpng version 1.7.0alpha06 - December 24, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index e611d860a..15c235e32 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@