diff --git a/ANNOUNCE b/ANNOUNCE index a4a3cf5f7..3f6e17c29 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.14rc02 - October 17, 2014 +Libpng 1.6.14rc03 - October 17, 2014 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. @@ -8,20 +8,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.14rc02.tar.xz (LZMA-compressed, recommended) - 1.6.14rc02.tar.gz + 1.6.14rc03.tar.xz (LZMA-compressed, recommended) + 1.6.14rc03.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1614r02.7z (LZMA-compressed, recommended) - lp1614r02.zip + lp1614r03.7z (LZMA-compressed, recommended) + lp1614r03.zip Other information: - 1.6.14rc02-README.txt - 1.6.14rc02-LICENSE.txt - libpng-1.6.14rc02-*.asc (armored detached GPG signatures) + 1.6.14rc03-README.txt + 1.6.14rc03-LICENSE.txt + libpng-1.6.14rc03-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.13): @@ -74,6 +74,10 @@ Version 1.6.14rc01 [October 15, 2014] Version 1.6.14rc02 [October 17, 2014] Changed png_convert_to_rfc_1123() to png_convert_to_rfc_1123_buffer() in the manual, to reflect the change made in libpng-1.6.0. + Updated README file to explain that direct access to the png_struct + and info_struct members has not been permitted since libpng-1.5.0. + +Version 1.6.14rc03 [October 17, 2014] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 68f3fc930..58ee34a1a 100644 --- a/CHANGES +++ b/CHANGES @@ -5027,6 +5027,10 @@ Version 1.6.14rc01 [October 15, 2014] Version 1.6.14rc02 [October 17, 2014] Changed png_convert_to_rfc_1123() to png_convert_to_rfc_1123_buffer() in the manual, to reflect the change made in libpng-1.6.0. + Updated README file to explain that direct access to the png_struct + and info_struct members has not been permitted since libpng-1.5.0. + +Version 1.6.14rc03 [October 17, 2014] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 88527b05d..3d05e01ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -253,7 +253,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.14rc02 +# VERSION 16.${PNGLIB_RELEASE}.1.6.14rc03 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 6601c5541..d9b9e34d8 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.14rc02, October 17, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.14rc03, October 17, 2014, are Copyright (c) 2004, 2006-2014 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 7e3017cc4..46bb8903a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.14rc02 - October 17, 2014 (shared library 16.0) +README for libpng version 1.6.14rc03 - October 17, 2014 (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 480a0da93..7f627b2f6 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.14rc02],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.14rc03],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -39,7 +39,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.14rc02 +PNGLIB_VERSION=1.6.14rc03 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=14 diff --git a/libpng-manual.txt b/libpng-manual.txt index c292fb098..b354414e6 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.14rc02 - October 17, 2014 + libpng version 1.6.14rc03 - October 17, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.14rc02 - October 17, 2014 + libpng versions 0.97, January 1998, through 1.6.14rc03 - October 17, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5283,7 +5283,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.14rc02 are Y2K compliant. It is my belief that earlier +upward through 1.6.14rc03 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 7b8d27af4..5b3bf86f6 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "October 17, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.14rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.14rc03 .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.14rc02 - October 17, 2014 + libpng version 1.6.14rc03 - October 17, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.14rc02 - October 17, 2014 + libpng versions 0.97, January 1998, through 1.6.14rc03 - October 17, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5787,7 +5787,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.14rc02 are Y2K compliant. It is my belief that earlier +upward through 1.6.14rc03 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 @@ -6031,7 +6031,7 @@ the first widely used release: 1.6.13rc01-02 16 10613 16.so.16.13[.0] 1.6.13 16 10613 16.so.16.13[.0] 1.6.14beta01-07 16 10614 16.so.16.14[.0] - 1.6.14rc01 16 10614 16.so.16.14[.0] + 1.6.14rc01-03 16 10614 16.so.16.14[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6088,7 +6088,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.14rc02 - October 17, 2014: +Libpng version 1.6.14rc03 - October 17, 2014: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6111,7 +6111,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.14rc02, October 17, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.14rc03, October 17, 2014, are Copyright (c) 2004,2006-2014 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 ee057b4d8..e601cf315 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "October 17, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.14rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.14rc03 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 5062ae892..c246e8ef5 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_14rc02 Your_png_h_is_not_version_1_6_14rc02; +typedef png_libpng_version_1_6_14rc03 Your_png_h_is_not_version_1_6_14rc03; /* 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 @@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.14rc02 - October 17, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.14rc03 - October 17, 2014" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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.14rc02 - October 17, 2014\ + return "libpng version 1.6.14rc03 - October 17, 2014\ Copyright (c) 1998-2014 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 f23a4f525..86b3112c3 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.14rc02 - October 17, 2014 + * libpng version 1.6.14rc03 - October 17, 2014 * Copyright (c) 1998-2014 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.14rc02 - October 17, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.14rc03 - October 17, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -204,7 +204,7 @@ * 1.6.13rc01-02 16 10613 16.so.16.13[.0] * 1.6.13 16 10613 16.so.16.13[.0] * 1.6.14beta01-07 16 10614 16.so.16.14[.0] - * 1.6.14rc01 16 10614 16.so.16.14[.0] + * 1.6.14rc01-03 16 10614 16.so.16.14[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -236,7 +236,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.14rc02, October 17, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.14rc03, October 17, 2014, are * Copyright (c) 2004, 2006-2014 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: @@ -354,7 +354,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.14rc02 are Y2K compliant. It is my belief that + * upward through 1.6.14rc03 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 @@ -416,9 +416,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.14rc02" +#define PNG_LIBPNG_VER_STRING "1.6.14rc03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.14rc02 - October 17, 2014\n" + " libpng version 1.6.14rc03 - October 17, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -432,7 +432,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 @@ -562,7 +562,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_14rc02; +typedef char* png_libpng_version_1_6_14rc03; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 6fa1e7250..261d3bbac 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.14rc02 - October 17, 2014 + * libpng version 1.6.14rc03 - October 17, 2014 * * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 8db6fbb2b..f1481555d 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1991,4 +1991,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_14rc02 Your_png_h_is_not_version_1_6_14rc02; +typedef png_libpng_version_1_6_14rc03 Your_png_h_is_not_version_1_6_14rc03; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index cbda30b59..201e4d769 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.14rc02 - October 17, 2014 +libpng version 1.6.14rc03 - October 17, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 998333b94..2b20c216b 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@