diff --git a/CMakeLists.txt b/CMakeLists.txt index 525313cbdc1547851a3b692aca62420180ddd5a4..0cfefb3dcc97c7e9277da28ff99d90e3a4fa9062 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -844,7 +844,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(png PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.32beta11 +# VERSION 16.${PNGLIB_RELEASE}.1.6.32beta12 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 640a3413923cc232f3ac47e303662b6e6ee849de..cdb949c63a038e9ed0a2ff903016fc0856c16e5f 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.32beta11, August 7, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.32beta12, August 7, 2017 are Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals diff --git a/README b/README index b0ad30e29d4596533ef5382a8ecc0201009c5c8c..f52c8b8812e447c9b74a1b22ae174ffbbfe3036a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.32beta11 - August 7, 2017 (shared library 16.0) +README for libpng version 1.6.32beta12 - August 7, 2017 (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 2177438a58e17f8923b65937ebd084aae2731958..0162e37ccd328093ea798996b660dbace0a7ad54 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.32beta11],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.32beta12],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -46,7 +46,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.32beta11 +PNGLIB_VERSION=1.6.32beta12 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=32 diff --git a/libpng-manual.txt b/libpng-manual.txt index 57b38dc887f832f05df82611b90b66a2b6095137..8e533b88c7771bdddcc322984efaf402b05c23e2 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.32beta11 - August 7, 2017 + libpng version 1.6.32beta12 - August 7, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 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.32beta11 - August 7, 2017 + libpng versions 0.97, January 1998, through 1.6.32beta12 - August 7, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -5405,7 +5405,7 @@ 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.32beta11 are Y2K compliant. It is my belief that earlier +upward through 1.6.32beta12 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 4703e41c19681c9a736b131ccb81e5411b30c6ce..53b46bb5c8d2fd51cd3ee22ceae7e24bf6c12600 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "August 7, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta11 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta12 .SH SYNOPSIS \fB #include \fP @@ -518,7 +518,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.32beta11 - August 7, 2017 + libpng version 1.6.32beta12 - August 7, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -529,7 +529,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.32beta11 - August 7, 2017 + libpng versions 0.97, January 1998, through 1.6.32beta12 - August 7, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -5923,7 +5923,7 @@ 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.32beta11 are Y2K compliant. It is my belief that earlier +upward through 1.6.32beta12 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 @@ -6081,7 +6081,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.32beta11 - August 7, 2017: +Libpng version 1.6.32beta12 - August 7, 2017: 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 +6106,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.32beta11, August 7, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.32beta12, August 7, 2017 are Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals diff --git a/libpngpf.3 b/libpngpf.3 index 17f3af7e92516b3d21e832ab69dbac17533cbf25..1ecd4847256bab54cf39674a82e51ebd8765e9d7 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "April 1, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta11 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta12 (private functions) .SH SYNOPSIS \fB\fB#include \fI\fI"pngpriv.h" diff --git a/png.c b/png.c index 54c2e3333cf475066469b301439349c72682f184..1c4107d9fc72ae355551020ed13fc27705047fc5 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_32beta11 Your_png_h_is_not_version_1_6_32beta11; +typedef png_libpng_version_1_6_32beta12 Your_png_h_is_not_version_1_6_32beta12; #ifdef __GNUC__ /* The version tests may need to be added to, but the problem warning has @@ -816,14 +816,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.32beta11 - August 7, 2017" PNG_STRING_NEWLINE \ + "libpng version 1.6.32beta12 - August 7, 2017" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2017 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.32beta11 - August 7, 2017\ + return "libpng version 1.6.32beta12 - August 7, 2017\ Copyright (c) 1998-2002,2004,2006-2017 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 930c59996ab634ef5e0aaad4700d8e5b9133aa17..89a78e599068642c5da08c085e84bbeec2aabd69 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.32beta11, August 7, 2017 + * libpng version 1.6.32beta12, August 7, 2017 * * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.32beta11, August 7, 2017: + * libpng versions 0.97, January 1998, through 1.6.32beta12, August 7, 2017: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -25,7 +25,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000 through 1.6.32beta11, August 7, 2017 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.32beta12, August 7, 2017 are * Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are * derived from libpng-1.0.6, and are distributed according to the same * disclaimer and license as libpng-1.0.6 with the following individuals @@ -247,7 +247,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.32beta11 are Y2K compliant. It is my belief that + * upward through 1.6.32beta12 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 @@ -309,8 +309,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.32beta11" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.32beta11 - August 7, 2017\n" +#define PNG_LIBPNG_VER_STRING "1.6.32beta12" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.32beta12 - August 7, 2017\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -324,7 +324,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 11 +#define PNG_LIBPNG_VER_BUILD 12 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -459,7 +459,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_32beta11; +typedef char* png_libpng_version_1_6_32beta12; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 4022aeaf8bb8a910947414617f44d8130765f1ce..974fbc68fcff65cb10135f1827248daeb45cd79f 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.32beta11, August 7, 2017 + * libpng version 1.6.32beta12, August 7, 2017 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index d999e4de2dc1a188abfdc9cdc410653735c8bb93..0adb744b1e68c9b533405b3c0ad4e568ed4bfb82 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2153,4 +2153,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_32beta11 Your_png_h_is_not_version_1_6_32beta11; +typedef png_libpng_version_1_6_32beta12 Your_png_h_is_not_version_1_6_32beta12; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index d7b5244d623b36df8a15a40689eb3443bd37d665..af10997e0706eadbfb65a986f5e9f8998c68c442 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.32beta11 - August 7, 2017 +libpng version 1.6.32beta12 - August 7, 2017 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 198409c815e533332b2dc3a0eedf1b5270e613d7..fa2fa7ffb35d58832cafacc3c49bd1187fb1a0f2 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@