diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a38c7c31..71d79d73f 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.12rc01 +# VERSION 16.${PNGLIB_RELEASE}.1.6.12rc02 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 8a388d8c5..db883d8a0 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.12rc01, June 6, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.12rc02, June 7, 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 -June 6, 2014 +June 7, 2014 diff --git a/README b/README index d7225b87d..6d54d091a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.12rc01 - June 6, 2014 (shared library 16.0) +README for libpng version 1.6.12rc02 - June 7, 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 a538ca334..98dad34ee 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.12rc01],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.12rc02],[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.12rc01 +PNGLIB_VERSION=1.6.12rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=12 diff --git a/libpngpf.3 b/libpngpf.3 index abf3dd4b7..5d5285785 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "June 6, 2014" +.TH LIBPNGPF 3 "June 7, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.12rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.12rc02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 9bcb5acbc..fd8655ada 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "June 6, 2014" +.TH PNG 5 "June 7, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.h b/png.h index b191c071d..e7d1b365c 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.12rc01 - June 6, 2014 + * libpng version 1.6.12rc02 - June 7, 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.12rc01 - June 6, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.12rc02 - June 7, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -230,8 +230,8 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.12rc01, June 6, 2014, are - * Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are + * libpng versions 1.2.6, August 15, 2004, through 1.6.12rc02, June 7, 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: * @@ -342,13 +342,13 @@ * Y2K compliance in libpng: * ========================= * - * June 6, 2014 + * June 7, 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.12rc01 are Y2K compliant. It is my belief that + * upward through 1.6.12rc02 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 @@ -410,9 +410,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.12rc01" +#define PNG_LIBPNG_VER_STRING "1.6.12rc02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.12rc01 - June 6, 2014\n" + " libpng version 1.6.12rc02 - June 7, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -426,7 +426,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 @@ -556,7 +556,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_12rc01; +typedef char* png_libpng_version_1_6_12rc02; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index a0f0e6f46..c524b7800 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,9 +1,9 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.12rc01 - June 6, 2014 + * libpng version 1.6.12rc02 - June 7, 2014 * - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * 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.) * diff --git a/pngtest.c b/pngtest.c index 01c51fcd8..a1fd92a1c 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_12rc01 Your_png_h_is_not_version_1_6_12rc01; +typedef png_libpng_version_1_6_12rc02 Your_png_h_is_not_version_1_6_12rc02; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 2ce02f4df..9aa01d44b 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.12rc01 - June 6, 2014 +libpng version 1.6.12rc02 - June 7, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 372561fe8..ad376026a 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@