diff --git a/ANNOUNCE b/ANNOUNCE index d9093ef64..729f12b8a 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.11rc01 - May 27, 2014 +Libpng 1.6.11rc02 - June 3, 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. @@ -9,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.11rc01.tar.xz (LZMA-compressed, recommended) - 1.6.11rc01.tar.gz + 1.6.11rc02.tar.xz (LZMA-compressed, recommended) + 1.6.11rc02.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1611r01.7z (LZMA-compressed, recommended) - lp1611r01.zip + lp1611r02.7z (LZMA-compressed, recommended) + lp1611r02.zip Other information: - 1.6.11rc01-README.txt - 1.6.11rc01-LICENSE.txt - libpng-1.6.11rc01-*.asc (armored detached GPG signatures) + 1.6.11rc02-README.txt + 1.6.11rc02-LICENSE.txt + libpng-1.6.11rc02-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.10): @@ -68,6 +68,9 @@ Version 1.6.11beta06 [May 19, 2014] Version 1.6.11rc01 [May 27, 2014] No changes. +Version 1.6.11rc02 [June 3, 2014] + Test ZLIB_VERNUM instead of PNG_ZLIB_VERNUM in contrib/tools/pngfix.c + 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 f8eb564b0..a57a24a14 100644 --- a/CHANGES +++ b/CHANGES @@ -4919,6 +4919,9 @@ Version 1.6.11beta06 [May 19, 2014] Version 1.6.11rc01 [May 27, 2014] No changes. +Version 1.6.11rc02 [June 3, 2014] + Test ZLIB_VERNUM instead of PNG_ZLIB_VERNUM in contrib/tools/pngfix.c + 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/CMakeLists.txt b/CMakeLists.txt index 563068ded..d129d8951 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,7 +252,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.11rc01 +# VERSION 16.${PNGLIB_RELEASE}.1.6.11rc02 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 6d337e7a1..dfd7e88c6 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.11rc01, May 27, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.11rc02, June 3, 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 -May 27, 2014 +June 3, 2014 diff --git a/README b/README index 45c54c710..2e34fbc73 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.11rc01 - May 27, 2014 (shared library 16.0) +README for libpng version 1.6.11rc02 - June 3, 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 7b95e8e2a..a4d1c189c 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.11rc01],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.11rc02],[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.11rc01 +PNGLIB_VERSION=1.6.11rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=11 diff --git a/contrib/tools/pngfix.c b/contrib/tools/pngfix.c index 3b64627c2..068daf103 100644 --- a/contrib/tools/pngfix.c +++ b/contrib/tools/pngfix.c @@ -79,7 +79,7 @@ # error "pngfix not supported in this libpng version" #endif -#if PNG_ZLIB_VERNUM >= 0x1240 +#if ZLIB_VERNUM >= 0x1240 /* Copied from pngpriv.h */ #ifdef __cplusplus @@ -4014,16 +4014,16 @@ main(int argc, const char **argv) return global_end(&global); } -#else /* PNG_ZLIB_VERNUM < 0x1240 */ +#else /* ZLIB_VERNUM < 0x1240 */ int main(void) { fprintf(stderr, "pngfix needs libpng with a zlib >=1.2.4 (not 0x%x)\n", - PNG_ZLIB_VERNUM); + ZLIB_VERNUM); return 77; } -#endif /* PNG_ZLIB_VERNUM */ +#endif /* ZLIB_VERNUM */ #else /* No read support */ diff --git a/libpng-manual.txt b/libpng-manual.txt index dab65b2ab..88590c120 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.11rc01 - May 27, 2014 + libpng version 1.6.11rc02 - June 3, 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.11rc01 - May 27, 2014 + libpng versions 0.97, January 1998, through 1.6.11rc02 - June 3, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5275,13 +5275,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -May 27, 2014 +June 3, 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.11rc01 are Y2K compliant. It is my belief that earlier +upward through 1.6.11rc02 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 4a6ab0bfc..48ffbab49 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "May 27, 2014" +.TH LIBPNG 3 "June 3, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11rc02 .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.11rc01 - May 27, 2014 + libpng version 1.6.11rc02 - June 3, 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.11rc01 - May 27, 2014 + libpng versions 0.97, January 1998, through 1.6.11rc02 - June 3, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5779,13 +5779,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -May 27, 2014 +June 3, 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.11rc01 are Y2K compliant. It is my belief that earlier +upward through 1.6.11rc02 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 @@ -6077,7 +6077,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.11rc01 - May 27, 2014: +Libpng version 1.6.11rc02 - June 3, 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). @@ -6100,7 +6100,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.11rc01, May 27, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.11rc02, June 3, 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 @@ -6199,7 +6199,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 27, 2014 +June 3, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index eb13b7ea3..b291d9daf 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "May 27, 2014" +.TH LIBPNGPF 3 "June 3, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11rc02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index d80af8844..4be67ebb5 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "May 27, 2014" +.TH PNG 5 "June 3, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 9e507f377..bdc45e08a 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_11rc01 Your_png_h_is_not_version_1_6_11rc01; +typedef png_libpng_version_1_6_11rc02 Your_png_h_is_not_version_1_6_11rc02; /* 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.11rc01 - May 27, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.11rc02 - June 3, 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.11rc01 - May 27, 2014\ + return "libpng version 1.6.11rc02 - June 3, 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 b873d29ed..48fd7fa42 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.11rc01 - May 27, 2014 + * libpng version 1.6.11rc02 - June 3, 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.11rc01 - May 27, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.11rc02 - June 3, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -228,7 +228,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.11rc01, May 27, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.11rc02, June 3, 2014, 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: @@ -340,13 +340,13 @@ * Y2K compliance in libpng: * ========================= * - * May 27, 2014 + * June 3, 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.11rc01 are Y2K compliant. It is my belief that + * upward through 1.6.11rc02 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 @@ -408,9 +408,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.11rc01" +#define PNG_LIBPNG_VER_STRING "1.6.11rc02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.11rc01 - May 27, 2014\n" + " libpng version 1.6.11rc02 - June 3, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -424,7 +424,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 01 +#define PNG_LIBPNG_VER_BUILD 02 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -554,7 +554,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_11rc01; +typedef char* png_libpng_version_1_6_11rc02; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index c5b629164..837365c35 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.11rc01 - May 27, 2014 + * libpng version 1.6.11rc02 - June 3, 2014 * * 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 2e436ba17..b213315a5 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_11rc01 Your_png_h_is_not_version_1_6_11rc01; +typedef png_libpng_version_1_6_11rc02 Your_png_h_is_not_version_1_6_11rc02; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 470c95aa9..4b916a2d9 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.11rc01 - May 27, 2014 +libpng version 1.6.11rc02 - June 3, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index cbbe36499..56ba1f5d2 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@