diff --git a/ANNOUNCE b/ANNOUNCE index 0e16f6bfca08eb76e2eea974a816bf2293ddaae0..26a3a40684943d6612de7817e5f72f77553b829b 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.0rc02 - February 5, 2013 +Libpng 1.6.0rc03 - February 5, 2013 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,19 +9,19 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.0rc02.tar.xz (LZMA-compressed, recommended) - 1.6.0rc02.tar.gz + 1.6.0rc03.tar.xz (LZMA-compressed, recommended) + 1.6.0rc03.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp160r02.7z (LZMA-compressed, recommended) - lp160r02.zip + lp160r03.7z (LZMA-compressed, recommended) + lp160r03.zip Other information: - 1.6.0rc02-README.txt - 1.6.0rc02-LICENSE.txt + 1.6.0rc03-README.txt + 1.6.0rc03-LICENSE.txt Changes since the last public release (1.5.7): @@ -597,9 +597,12 @@ Version 1.6.0beta40 [January 20, 2013] Version 1.6.0rc01 [January 26, 2013] No changes. -Version 1.6.0rc02 [February 5, 2013] +Version 1.6.0rc02 [February 4, 2013] Added png_get_palette_max() function. +Version 1.6.0rc03 [February 5, 2013] + + =========================================================================== NOTICE November 17, 2012: The location of the git repository at SourceForge has changed. diff --git a/CHANGES b/CHANGES index 68bbed1a43fe910c5d84bd818fca2a2cb352488c..604f78e1dd5227151515261d8effe8a6c6f79357 100644 --- a/CHANGES +++ b/CHANGES @@ -4351,9 +4351,11 @@ Version 1.6.0beta40 [January 20, 2013] Version 1.6.0rc01 [January 26, 2013] No changes. -Version 1.6.0rc02 [February 5, 2013] +Version 1.6.0rc02 [February 4, 2013] Added png_get_palette_max() function. +Version 1.6.0rc03 [February 5, 2013] + =========================================================================== NOTICE November 17, 2012: The location of the git repository at SourceForge has changed. diff --git a/CMakeLists.txt b/CMakeLists.txt index b94dffa3ad732fea4d1f204602999880918404ca..52d57824ffcd6b3447840fe4f06a96f99dd1cd62 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 16.${PNGLIB_RELEASE}.1.6.0rc02 +# VERSION 16.${PNGLIB_RELEASE}.1.6.0rc03 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 50e6ba71b65e9b7da4b09c3df37a7785fa2feddf..6fccb22fb3b929b73a3c0adb0e3332d4d92f4f79 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.6.0rc02, February 5, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0rc03, February 5, 2013, 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 7f2c5ec55da0c0b271b4d4b74424a9c89588b885..1a4e81338ba74aab9ebc5c53fd354be21585207e 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.0rc02 - February 5, 2013 (shared library 16.0) +README for libpng version 1.6.0rc03 - February 5, 2013 (shared library 16.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 55fda4452498c767049d479e5a07dccbac1d201d..2a6e49c1ef869018ec0e32494fb983fd2f834b0a 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.0rc02],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.0rc03],[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.6.0rc02 +PNGLIB_VERSION=1.6.0rc03 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index 091f566ae580fded0fcbe60ab096fbe5513a26c4..b9804b45a17171c12b466c172a2c9ab7010d65b5 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.6.0rc02 - February 5, 2013 + libpng version 1.6.0rc03 - February 5, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 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.6.0rc02 - February 5, 2013 + libpng versions 0.97, January 1998, through 1.6.0rc03 - February 5, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5143,7 +5143,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.6.0rc02 are Y2K compliant. It is my belief that earlier +upward through 1.6.0rc03 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 4e9e833e87c2c2b6a86f020e9cb9f62f51b77261..52d52854424b7b63988b88c49d322be8e5655ec3 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "February 5, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0rc03 .SH SYNOPSIS \fB #include \fP @@ -504,7 +504,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.6.0rc02 - February 5, 2013 + libpng version 1.6.0rc03 - February 5, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.0rc02 - February 5, 2013 + libpng versions 0.97, January 1998, through 1.6.0rc03 - February 5, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5648,7 +5648,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.6.0rc02 are Y2K compliant. It is my belief that earlier +upward through 1.6.0rc03 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 @@ -5854,7 +5854,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-40 16 10600 16.so.16.0[.0] - 1.6.0rc01-02 16 10600 16.so.16.0[.0] + 1.6.0rc01-03 16 10600 16.so.16.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5911,7 +5911,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.0rc02 - February 5, 2013: +Libpng version 1.6.0rc03 - February 5, 2013: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5934,7 +5934,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0rc02, February 5, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0rc03, February 5, 2013, 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 0fc8a8f6ede1096c9d2eb7040251733812686320..20d4617292a3277307f47caca37fc25763344c3e 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "February 5, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0rc03 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index c4f612acdab2833293c21ebdb52a12c0c9bb18cd..4fe5704a6b73d2a872e3689c3559481aa2c15898 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_6_0rc02 Your_png_h_is_not_version_1_6_0rc02; +typedef png_libpng_version_1_6_0rc03 Your_png_h_is_not_version_1_6_0rc03; /* 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 @@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.0rc02 - February 5, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.0rc03 - February 5, 2013" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2013 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.6.0rc02 - February 5, 2013\ + return "libpng version 1.6.0rc03 - February 5, 2013\ Copyright (c) 1998-2013 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 40eab7a27d8b99fd09e0ede40ce48f825e5f43ec..57fd3cd76513e49c3e602336a0b3fa10bd5cc396 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.0rc02 - February 5, 2013 + * libpng version 1.6.0rc03 - February 5, 2013 * Copyright (c) 1998-2013 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.6.0rc02 - February 5, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.0rc03 - February 5, 2013: 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-40 16 10600 16.so.16.0[.0] - * 1.6.0rc01-02 16 10600 16.so.16.0[.0] + * 1.6.0rc01-03 16 10600 16.so.16.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.6.0rc02, February 5, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.0rc03, February 5, 2013, are * Copyright (c) 2004, 2006-2013 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.6.0rc02 are Y2K compliant. It is my belief that + * upward through 1.6.0rc03 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.6.0rc02" +#define PNG_LIBPNG_VER_STRING "1.6.0rc03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.0rc02 - February 5, 2013\n" + " libpng version 1.6.0rc03 - February 5, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -393,7 +393,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 02 +#define PNG_LIBPNG_VER_BUILD 03 /* 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_6_0rc02; +typedef char* png_libpng_version_1_6_0rc03; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 18ab7b43ee48c722eebc7ef75e296536c20afa17..4b1a3be3ca98f240e6e3340946e8c05fb0b925ae 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.0rc02 - February 5, 2013 + * libpng version 1.6.0rc03 - February 5, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 7290741c4b32f407e3ddb2a7ed2cec754f2a0190..0ad9b501a7dbc2a97017ce20e76e174ce362b53e 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1949,4 +1949,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_0rc02 Your_png_h_is_not_version_1_6_0rc02; +typedef png_libpng_version_1_6_0rc03 Your_png_h_is_not_version_1_6_0rc03; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 3a5a292e81b5f2ff765e0b78aa8a23090e06bc37..422af5cfe13266052b1e2ff8b7af7bb5d964fa63 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.0rc02 - February 5, 2013 +libpng version 1.6.0rc03 - February 5, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 74c76e0456ecb28c9cd69be789246fe21b86d233..742b603b21bbc331e1cf738559052c25585c0fe2 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@