diff --git a/ANNOUNCE b/ANNOUNCE index 39c216979..69e56c660 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.1beta10 - March 13, 2013 +Libpng 1.6.1rc01 - March 21, 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.1beta10.tar.xz (LZMA-compressed, recommended) - 1.6.1beta10.tar.gz + 1.6.1rc01.tar.xz (LZMA-compressed, recommended) + 1.6.1rc01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp161b10.7z (LZMA-compressed, recommended) - lp161b10.zip + lp161r01.7z (LZMA-compressed, recommended) + lp161r01.zip Other information: - 1.6.1beta10-README.txt - 1.6.1beta10-LICENSE.txt + 1.6.1rc01-README.txt + 1.6.1rc01-LICENSE.txt Changes since the last public release (1.6.0): @@ -111,7 +111,8 @@ Version 1.6.1beta09 [March 13, 2013] technically valid, although a reasonable treatment of division would show it to be incorrect. -Version 1.6.1beta10 [March 13, 2013] +Version 1.6.1rc01 [March 21, 2013] + No changes. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 8ae08dbb4..4c35642b8 100644 --- a/CHANGES +++ b/CHANGES @@ -4467,7 +4467,8 @@ Version 1.6.1beta09 [March 13, 2013] technically valid, although a reasonable treatment of division would show it to be incorrect. -Version 1.6.1beta10 [March 13, 2013] +Version 1.6.1rc01 [March 21, 2013] + No changes. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d6f6f148..79fb508c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -271,7 +271,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.1beta10 +# VERSION 16.${PNGLIB_RELEASE}.1.6.1rc01 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 519cc2a71..3df2d373c 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.1beta10, March 13, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.1rc01, March 21, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 13, 2013 +March 21, 2013 diff --git a/README b/README index c09f59c48..618f759d8 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.1beta10 - March 13, 2013 (shared library 16.0) +README for libpng version 1.6.1rc01 - March 21, 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 3ec016a01..4637e3188 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.1beta10],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.1rc01],[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.1beta10 +PNGLIB_VERSION=1.6.1rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=1 diff --git a/libpng-manual.txt b/libpng-manual.txt index 965801cbc..fe85b36a6 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.1beta10 - March 13, 2013 + libpng version 1.6.1rc01 - March 21, 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.1beta10 - March 13, 2013 + libpng versions 0.97, January 1998, through 1.6.1rc01 - March 21, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5161,13 +5161,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -March 13, 2013 +March 21, 2013 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.1beta10 are Y2K compliant. It is my belief that earlier +upward through 1.6.1rc01 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 ddeb77829..977212046 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "March 13, 2013" +.TH LIBPNG 3 "March 21, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta10 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1rc01 .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.1beta10 - March 13, 2013 + libpng version 1.6.1rc01 - March 21, 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.1beta10 - March 13, 2013 + libpng versions 0.97, January 1998, through 1.6.1rc01 - March 21, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5666,13 +5666,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -March 13, 2013 +March 21, 2013 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.1beta10 are Y2K compliant. It is my belief that earlier +upward through 1.6.1rc01 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 @@ -5880,7 +5880,7 @@ the first widely used release: 1.6.0beta01-40 16 10600 16.so.16.0[.0] 1.6.0rc01-08 16 10600 16.so.16.0[.0] 1.6.0 16 10600 16.so.16.0[.0] - 1.6.1beta01-10 16 10601 16.so.16.1[.0] + 1.6.1rc01 16 10601 16.so.16.1[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5937,7 +5937,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.1beta10 - March 13, 2013: +Libpng version 1.6.1rc01 - March 21, 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). @@ -5960,7 +5960,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.1beta10, March 13, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.1rc01, March 21, 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 @@ -6059,7 +6059,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 13, 2013 +March 21, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 31610f5da..69fa4a16b 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 13, 2013" +.TH LIBPNGPF 3 "March 21, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta10 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1rc01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 31b221738..4970dd36c 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "March 13, 2013" +.TH PNG 5 "March 21, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index e8a051103..07c42910c 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_1beta10 Your_png_h_is_not_version_1_6_1beta10; +typedef png_libpng_version_1_6_1rc01 Your_png_h_is_not_version_1_6_1rc01; /* 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.1beta10 - March 13, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.1rc01 - March 21, 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.1beta10 - March 13, 2013\ + return "libpng version 1.6.1rc01 - March 21, 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 3c3867a13..b5a144a5a 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.1beta10 - March 13, 2013 + * libpng version 1.6.1rc01 - March 21, 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.1beta10 - March 13, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.1rc01 - March 21, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -170,6 +170,7 @@ * 1.6.0rc01-08 16 10600 16.so.16.0[.0] * 1.6.0 16 10600 16.so.16.0[.0] * 1.6.1beta01-10 16 10601 16.so.16.1[.0] + * 1.6.1rc01 16 10601 16.so.16.1[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -201,7 +202,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.1beta10, March 13, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.1rc01, March 21, 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: @@ -313,13 +314,13 @@ * Y2K compliance in libpng: * ========================= * - * March 13, 2013 + * March 21, 2013 * * 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.1beta10 are Y2K compliant. It is my belief that + * upward through 1.6.1rc01 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 @@ -379,9 +380,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.1beta10" +#define PNG_LIBPNG_VER_STRING "1.6.1rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.1beta10 - March 13, 2013\n" + " libpng version 1.6.1rc01 - March 21, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -395,7 +396,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 10 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -412,7 +413,7 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -525,7 +526,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_1beta10; +typedef char* png_libpng_version_1_6_1rc01; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 864fbea0f..63bd0d837 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.1beta10 - March 13, 2013 + * libpng version 1.6.1rc01 - March 21, 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 8f9eb1559..510cba169 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1950,4 +1950,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_1beta10 Your_png_h_is_not_version_1_6_1beta10; +typedef png_libpng_version_1_6_1rc01 Your_png_h_is_not_version_1_6_1rc01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 9da4a129c..1ba78acd8 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.1beta10 - March 13, 2013 +libpng version 1.6.1rc01 - March 21, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 033fa48c1..69af93a2c 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@