diff --git a/ANNOUNCE b/ANNOUNCE index 7ab54fc68..7b83f73f5 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -79,8 +79,8 @@ Version 1.6.15beta08 [November 8, 2014] Version 1.6.15rc01 [November 13, 2014] Version 1.6.15rc02 [November 14, 2014] - The macros passed in the command line to Borland make are ignored if - similarly-named macros are already defined in makefiles. This behavior + The macros passed in the command line to Borland make were ignored if + similarly-named macros were already defined in makefiles. This behavior is different from POSIX make and other make programs. Surround the macro definitions with ifndef guards (Cosmin). diff --git a/CHANGES b/CHANGES index 39c5ab756..3ad7130a1 100644 --- a/CHANGES +++ b/CHANGES @@ -5087,8 +5087,8 @@ Version 1.6.15beta08 [November 8, 2014] Version 1.6.15rc01 [November 13, 2014] Version 1.6.15rc02 [November 14, 2014] - The macros passed in the command line to Borland make are ignored if - similarly-named macros are already defined in makefiles. This behavior + The macros passed in the command line to Borland make were ignored if + similarly-named macros were already defined in makefiles. This behavior is different from POSIX make and other make programs. Surround the macro definitions with ifndef guards (Cosmin). diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b54e5b99..9a26ddf78 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.15rc01 +# VERSION 16.${PNGLIB_RELEASE}.1.6.15rc02 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 9022164c5..f57ce70a1 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.15rc01, November 13, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.15rc02, November 14, 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 -November 13, 2014 +November 14, 2014 diff --git a/README b/README index d4d1deabe..54d0a7488 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.15rc01 - November 13, 2014 (shared library 16.0) +README for libpng version 1.6.15rc02 - November 14, 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 90a5d98de..eae7d72ec 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.15rc01],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.15rc02],[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.15rc01 +PNGLIB_VERSION=1.6.15rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=15 diff --git a/libpng-manual.txt b/libpng-manual.txt index 24c3fdadb..b380fa2c3 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.15rc01 - November 13, 2014 + libpng version 1.6.15rc02 - November 14, 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.15rc01 - November 13, 2014 + libpng versions 0.97, January 1998, through 1.6.15rc02 - November 14, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5277,13 +5277,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -November 13, 2014 +November 14, 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.15rc01 are Y2K compliant. It is my belief that earlier +upward through 1.6.15rc02 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 272ad2519..c3762c76c 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "November 13, 2014" +.TH LIBPNG 3 "November 14, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15rc02 .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.15rc01 - November 13, 2014 + libpng version 1.6.15rc02 - November 14, 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.15rc01 - November 13, 2014 + libpng versions 0.97, January 1998, through 1.6.15rc02 - November 14, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5781,13 +5781,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -November 13, 2014 +November 14, 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.15rc01 are Y2K compliant. It is my belief that earlier +upward through 1.6.15rc02 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 @@ -6034,7 +6034,7 @@ the first widely used release: 1.6.14rc01-02 16 10614 16.so.16.14[.0] 1.6.14 16 10614 16.so.16.14[.0] 1.6.15beta01-08 16 10615 16.so.16.15[.0] - 1.6.15rc01 16 10615 16.so.16.15[.0] + 1.6.15rc01-02 16 10615 16.so.16.15[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6091,7 +6091,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.15rc01 - November 13, 2014: +Libpng version 1.6.15rc02 - November 14, 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). @@ -6114,7 +6114,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.15rc01, November 13, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.15rc02, November 14, 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 @@ -6213,7 +6213,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 13, 2014 +November 14, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 8963ed01f..e81df6b47 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "November 13, 2014" +.TH LIBPNGPF 3 "November 14, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15rc02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 50bd5804a..852f0d09b 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 13, 2014" +.TH PNG 5 "November 14, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 3a6c0fd29..2c37cd5ad 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_15rc01 Your_png_h_is_not_version_1_6_15rc01; +typedef png_libpng_version_1_6_15rc02 Your_png_h_is_not_version_1_6_15rc02; /* 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 @@ -769,13 +769,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.15rc01 - November 13, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.15rc02 - November 14, 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.15rc01 - November 13, 2014\ + return "libpng version 1.6.15rc02 - November 14, 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 ff9393c87..ce1a9dcc4 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.15rc01 - November 13, 2014 + * libpng version 1.6.15rc02 - November 14, 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.15rc01 - November 13, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.15rc02 - November 14, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -207,7 +207,7 @@ * 1.6.14rc01-02 16 10614 16.so.16.14[.0] * 1.6.14 16 10614 16.so.16.14[.0] * 1.6.15beta01-08 16 10615 16.so.16.15[.0] - * 1.6.15rc01 16 10615 16.so.16.15[.0] + * 1.6.15rc01-02 16 10615 16.so.16.15[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -239,7 +239,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.15rc01, November 13, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.15rc02, November 14, 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: @@ -351,13 +351,13 @@ * Y2K compliance in libpng: * ========================= * - * November 13, 2014 + * November 14, 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.15rc01 are Y2K compliant. It is my belief that + * upward through 1.6.15rc02 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 @@ -419,9 +419,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.15rc01" +#define PNG_LIBPNG_VER_STRING "1.6.15rc02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.15rc01 - November 13, 2014\n" + " libpng version 1.6.15rc02 - November 14, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -435,7 +435,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 @@ -565,7 +565,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_15rc01; +typedef char* png_libpng_version_1_6_15rc02; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 1a4677732..c1ac23f59 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.15rc01 - November 13, 2014 + * libpng version 1.6.15rc02 - November 14, 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 9853a4d9d..d124504b0 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2008,4 +2008,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_15rc01 Your_png_h_is_not_version_1_6_15rc01; +typedef png_libpng_version_1_6_15rc02 Your_png_h_is_not_version_1_6_15rc02; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 1ca8678ed..999599864 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.15rc01 - November 13, 2014 +libpng version 1.6.15rc02 - November 14, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 838ba7cc4..1b523154c 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@