diff --git a/ANNOUNCE b/ANNOUNCE index 0573d1a0a936766533f20c8127f70624253103a7..11cc792f482c514d44a297e802c5dd956e50a07e 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.30beta03 - May 22, 2017 +Libpng 1.6.30beta04 - May 22, 2017 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. @@ -8,20 +8,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.30beta03.tar.xz (LZMA-compressed, recommended) - 1.6.30beta03.tar.gz + 1.6.30beta04.tar.xz (LZMA-compressed, recommended) + 1.6.30beta04.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1630b03.7z (LZMA-compressed, recommended) - lp1630b03.zip + lp1630b04.7z (LZMA-compressed, recommended) + lp1630b04.zip Other information: - 1.6.30beta03-README.txt - 1.6.30beta03-LICENSE.txt - libpng-1.6.30beta03-*.asc (armored detached GPG signatures) + 1.6.30beta04-README.txt + 1.6.30beta04-LICENSE.txt + libpng-1.6.30beta04-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.29): @@ -44,6 +44,8 @@ Version 1.6.30beta03 [May 22, 2017] Test CMAKE_HOST_WIN32 instead of WIN32 in CMakeLists.txt. Fix some URL in documentation. +Version 1.6.30beta04 [May 22, 2017] + 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 f5b7b5297576064bb6854c50d646f79d058947be..4baba8569402b211fa6147210fe8ae83b84eab77 100644 --- a/CHANGES +++ b/CHANGES @@ -5839,6 +5839,8 @@ Version 1.6.30beta03 [May 22, 2017] Test CMAKE_HOST_WIN32 instead of WIN32 in CMakeLists.txt. Fix some URL in documentation. +Version 1.6.30beta04 [May 22, 2017] + 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 727d1f3b6d5ce7b99b22e532b2b3c1dc63fe99f0..817d8efb94bc6313ff1179096c95259896502a2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -770,7 +770,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.30beta03 +# VERSION 16.${PNGLIB_RELEASE}.1.6.30beta04 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 8a63f14b238f910e8aea2ee87418617793953cd4..1e611cea75e8f5fa63992fa83c2b88c3944d2525 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.30beta03, May 22, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.30beta04, May 22, 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 5341e667ffc00a51d706841750f4e1323c26f555..8da516334eb9ad8b98c5da7944ab49e0bd34573a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.30beta03 - May 22, 2017 (shared library 16.0) +README for libpng version 1.6.30beta04 - May 22, 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 0b6a68d5da04dedd5cef825a73efdaa803e3b331..c2f9b642e9649aaf0f0e79bbd312435304820cb8 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.30beta03],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.30beta04],[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.30beta03 +PNGLIB_VERSION=1.6.30beta04 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=28 diff --git a/libpng-manual.txt b/libpng-manual.txt index b1fc2c5e6ae3fe66a0333438a97573a828579870..a0f7e0799a5b4a6d677c5d022eb89967d214552d 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.30beta03 - May 22, 2017 + libpng version 1.6.30beta04 - May 22, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 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.30beta03 - May 22, 2017 + libpng versions 0.97, January 1998, through 1.6.30beta04 - May 22, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5377,7 +5377,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.30beta03 are Y2K compliant. It is my belief that earlier +upward through 1.6.30beta04 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 ee496212d85c7aa17ce155ad6ff89aeb5b0e736b..48f645e804b6dbc9ebb358508e9c9815542f739a 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "May 22, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.30beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.30beta04 .SH SYNOPSIS \fB #include \fP @@ -510,7 +510,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.30beta03 - May 22, 2017 + libpng version 1.6.30beta04 - May 22, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -521,7 +521,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.30beta03 - May 22, 2017 + libpng versions 0.97, January 1998, through 1.6.30beta04 - May 22, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5887,7 +5887,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.30beta03 are Y2K compliant. It is my belief that earlier +upward through 1.6.30beta04 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 @@ -6045,7 +6045,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.30beta03 - May 22, 2017: +Libpng version 1.6.30beta04 - May 22, 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). @@ -6070,7 +6070,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.30beta03, May 22, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.30beta04, May 22, 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 e5ee17b72644ea3b8e67e17dbcb5c21f82e54906..5e7138896ec9a2753da269a9774efdd949cae614 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "May 22, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.30beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.30beta04 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 666340357039a1ad53f442e599bcbe98b63895a2..2e96dd7284507d153e3a0710669c0dc08d62bb58 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_30beta03 Your_png_h_is_not_version_1_6_30beta03; +typedef png_libpng_version_1_6_30beta04 Your_png_h_is_not_version_1_6_30beta04; /* 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 @@ -776,14 +776,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.30beta03 - May 22, 2017" PNG_STRING_NEWLINE \ + "libpng version 1.6.30beta04 - May 22, 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.30beta03 - May 22, 2017\ + return "libpng version 1.6.30beta04 - May 22, 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 24e06ad8d2c665809f36269b755b8297bff85012..a14141e7f31159a56aeaca249a9f314ef99bb6a3 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.30beta03, May 22, 2017 + * libpng version 1.6.30beta04, May 22, 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.30beta03, May 22, 2017: + * libpng versions 0.97, January 1998, through 1.6.30beta04, May 22, 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.30beta03, May 22, 2017 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.30beta04, May 22, 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.30beta03 are Y2K compliant. It is my belief that + * upward through 1.6.30beta04 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.30beta03" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.30beta03 - May 22, 2017\n" +#define PNG_LIBPNG_VER_STRING "1.6.30beta04" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.30beta04 - May 22, 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 03 +#define PNG_LIBPNG_VER_BUILD 04 /* 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_30beta03; +typedef char* png_libpng_version_1_6_30beta04; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index a51f98ccd225fd37fda652043204b33e7daa6200..da798fcd0dc7880520c2d93805351f402bc67dc6 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.30beta03, May 22, 2017 + * libpng version 1.6.30beta04, May 22, 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 95d4add52b226fa9f64de58d47811af724c27a92..b27c6d669255cca72c6cc3f0b4c9b582fe2d4896 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2088,4 +2088,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_30beta03 Your_png_h_is_not_version_1_6_30beta03; +typedef png_libpng_version_1_6_30beta04 Your_png_h_is_not_version_1_6_30beta04; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 1d0a714e038d394c20785c474d834bbd2590f418..57c09dc8793ab63eba05b3f0d796d9ce8e644497 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.30beta03 - May 22, 2017 +libpng version 1.6.30beta04 - May 22, 2017 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 815c71066e3e750c98b58899191f30f93a6bf110..9248207289bc34b3f6f64f2db026e16f4f231489 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@