diff --git a/ANNOUNCE b/ANNOUNCE index df04edca4..c14a3d196 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,31 +1,29 @@ -Libpng 1.6.13rc02 - August 14, 2014 +Libpng 1.6.13 - August 21, 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. +This is a public release of libpng, intended for use in production codes. Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.13rc02.tar.xz (LZMA-compressed, recommended) - 1.6.13rc02.tar.gz + libpng-1.6.13.tar.xz (LZMA-compressed, recommended) + libpng-1.6.13.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1613r02.7z (LZMA-compressed, recommended) - lp1613r02.zip + lpng1613.7z (LZMA-compressed, recommended) + lpng1613.zip Other information: - 1.6.13rc02-README.txt - 1.6.13rc02-LICENSE.txt - libpng-1.6.13rc02-*.asc (armored detached GPG signatures) + libpng-1.6.13-README.txt + libpng-1.6.13-LICENSE.txt + libpng-1.6.13-*.asc (armored detached GPG signatures) -Changes since the last public release (1.6.13): +Changes since the last public release (1.6.12): -Version 1.6.13beta01 [July 4, 2014] Quieted -Wsign-compare and -Wclobber compiler warnings in contrib/pngminus/*.c Added "(void) png_ptr;" where needed in contrib/gregbook to quiet @@ -36,32 +34,22 @@ Version 1.6.13beta01 [July 4, 2014] Changed "if defined(__ARM_NEON__)" to "if (defined(__ARM_NEON__) || defined(__ARM_NEON))" (James Wu). Fixed clang no-warning builds: png_digit was defined but never used. - -Version 1.6.13beta02 [July 21, 2014] Fixed an incorrect separator ("/" should be "\") in scripts/makefile.vcwin32 (bug report from Wolfgang S. Kechel). Bug was introduced in libpng-1.6.11. Also fixed makefile.bc32, makefile.bor, makefile.msc, makefile.intel, and makefile.tc3 similarly. - -Version 1.6.13beta03 [August 3, 2014] Removed scripts/makefile.elf. It has not worked since libpng-1.5.0beta14 due to elimination of the PNG_FUNCTION_EXPORT and PNG_DATA_EXPORT definitions from pngconf.h. Ensure that CMakeLists.txt makes the target "lib" directory before making symbolic link into it (SourceForge bug report #226 by Rolf Timmermans). - -Version 1.6.13beta04 [August 8, 2014] Added opinion that the ECCN (Export Control Classification Number) for libpng is EAR99 to the README file. Eliminated use of "$<" in makefile explicit rules, when copying $PNGLIBCONF_H_PREBUILT. This does not work on some versions of make; bug introduced in libpng version 1.6.11. - -Version 1.6.13rc01 [August 14, 2014] Made "ccopts" agree with "CFLAGS" in scripts/makefile.hp* and makefile.*sunu -Version 1.6.13rc02 [August 14, 2014] - Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CHANGES b/CHANGES index d5ce06313..880eca978 100644 --- a/CHANGES +++ b/CHANGES @@ -4975,7 +4975,8 @@ Version 1.6.13beta04 [August 8, 2014] Version 1.6.13rc01 [August 14, 2014] Made "ccopts" agree with "CFLAGS" in scripts/makefile.hp* and makefile.*sunu -Version 1.6.13rc02 [August 14, 2014] +Version 1.6.13 [August 21, 2014] + 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 f0f392770..e0353a057 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.13rc02 +# VERSION 16.${PNGLIB_RELEASE}.1.6.13 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index fe4aff1cf..a38339e31 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.13rc02, August 14, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.13, August 21, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 14, 2014 +August 21, 2014 diff --git a/README b/README index b35c985b2..69bda874f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.13rc02 - August 14, 2014 (shared library 16.0) +README for libpng version 1.6.13 - August 21, 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 6846e377c..6fafa0210 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.13rc02],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.13],[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.13rc02 +PNGLIB_VERSION=1.6.13 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=13 diff --git a/libpng-manual.txt b/libpng-manual.txt index 169263041..a394cc9c6 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.13rc02 - August 14, 2014 + libpng version 1.6.13 - August 21, 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.13rc02 - August 14, 2014 + libpng versions 0.97, January 1998, through 1.6.13 - August 21, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5276,13 +5276,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -August 14, 2014 +August 21, 2014 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.13rc02 are Y2K compliant. It is my belief that earlier +upward through 1.6.13 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 290d422e2..0ace8614f 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "August 14, 2014" +.TH LIBPNG 3 "August 21, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.13rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.13 .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.13rc02 - August 14, 2014 + libpng version 1.6.13 - August 21, 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.13rc02 - August 14, 2014 + libpng versions 0.97, January 1998, through 1.6.13 - August 21, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5780,13 +5780,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -August 14, 2014 +August 21, 2014 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.13rc02 are Y2K compliant. It is my belief that earlier +upward through 1.6.13 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 @@ -6027,6 +6027,7 @@ the first widely used release: 1.6.12 16 10612 16.so.16.12[.0] 1.6.13beta01-04 16 10613 16.so.16.13[.0] 1.6.13rc01-02 16 10613 16.so.16.13[.0] + 1.6.13 16 10613 16.so.16.13[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6083,7 +6084,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.13rc02 - August 14, 2014: +Libpng version 1.6.13 - August 21, 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). @@ -6106,7 +6107,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.13rc02, August 14, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.13, August 21, 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 @@ -6205,7 +6206,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 14, 2014 +August 21, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 8db7569bc..e94073562 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "August 14, 2014" +.TH LIBPNGPF 3 "August 21, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.13rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.13 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 447435c98..461e2f8ac 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "August 14, 2014" +.TH PNG 5 "August 21, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 49d70a8d8..8d8841fd9 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_13rc02 Your_png_h_is_not_version_1_6_13rc02; +typedef png_libpng_version_1_6_13 Your_png_h_is_not_version_1_6_13; /* 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.13rc02 - August 14, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.13 - August 21, 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.13rc02 - August 14, 2014\ + return "libpng version 1.6.13 - August 21, 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 331e62d67..0071c1686 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.13rc02 - August 14, 2014 + * libpng version 1.6.13 - August 21, 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.13rc02 - August 14, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.13 - August 21, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -202,6 +202,7 @@ * 1.6.12 16 10612 16.so.16.12[.0] * 1.6.13beta01-04 16 10613 16.so.16.13[.0] * 1.6.13rc01-02 16 10613 16.so.16.13[.0] + * 1.6.13 16 10613 16.so.16.13[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -233,7 +234,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.13rc02, August 14, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.13, August 21, 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: @@ -345,13 +346,13 @@ * Y2K compliance in libpng: * ========================= * - * August 14, 2014 + * August 21, 2014 * * 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.13rc02 are Y2K compliant. It is my belief that + * upward through 1.6.13 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 @@ -413,9 +414,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.13rc02" +#define PNG_LIBPNG_VER_STRING "1.6.13" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.13rc02 - August 14, 2014\n" + " libpng version 1.6.13 - August 21, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -429,7 +430,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 02 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -446,7 +447,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_RC +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -559,7 +560,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_13rc02; +typedef char* png_libpng_version_1_6_13; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 5b189c75d..62e075fd6 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.13rc02 - August 14, 2014 + * libpng version 1.6.13 - August 21, 2014 * * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index ef84ffb78..a2f8a563d 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.6.13 [(PENDING RELEASE)] + * Last changed in libpng 1.6.13 [August 21, 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.) @@ -415,13 +415,13 @@ png_app_error(png_const_structrp png_ptr, png_const_charp error_message) } #endif /* BENIGN_ERRORS */ -#define PNG_MAX_ERROR_TEXT 196 /* Currently limited be profile_error in png.c */ +#define PNG_MAX_ERROR_TEXT 196 /* Currently limited by profile_error in png.c */ #if defined(PNG_WARNINGS_SUPPORTED) || \ (defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)) /* These utilities are used internally to build an error message that relates * to the current chunk. The chunk name comes from png_ptr->chunk_name, - * this is used to prefix the message. The message is limited in length - * to 63 bytes, the name characters are output as hex digits wrapped in [] + * which is used to prefix the message. The message is limited in length + * to 63 bytes. The name characters are output as hex digits wrapped in [] * if the character is invalid. */ #define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97)) diff --git a/pngtest.c b/pngtest.c index e00b05a2f..bd9688bba 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_13rc02 Your_png_h_is_not_version_1_6_13rc02; +typedef png_libpng_version_1_6_13 Your_png_h_is_not_version_1_6_13; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 2d8665c85..5b0035d55 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.13rc02 - August 14, 2014 +libpng version 1.6.13 - August 21, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index d024a02c4..a39e57710 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@