diff --git a/ANNOUNCE b/ANNOUNCE index 56fc16509..b0dcf341b 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.30rc01 - June 14, 2017 +Libpng 1.6.30rc02 - June 25, 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.30rc01.tar.xz (LZMA-compressed, recommended) - 1.6.30rc01.tar.gz + 1.6.30rc02.tar.xz (LZMA-compressed, recommended) + 1.6.30rc02.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1630r01.7z (LZMA-compressed, recommended) - lp1630r01.zip + lp1630r02.7z (LZMA-compressed, recommended) + lp1630r02.zip Other information: - 1.6.30rc01-README.txt - 1.6.30rc01-LICENSE.txt - libpng-1.6.30rc01-*.asc (armored detached GPG signatures) + 1.6.30rc02-README.txt + 1.6.30rc02-LICENSE.txt + libpng-1.6.30rc02-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.29): @@ -53,6 +53,10 @@ Version 1.6.30beta04 [June 7, 2017] Version 1.6.30rc01 [June 14, 2017] No changes. +Version 1.6.30rc02 [June 25, 2017] + Update copyright year in pnglibconf.h, make ltmain.sh executable. + Add a reference to the libpng.download site in README. + 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 1c01610ee..a9724a15a 100644 --- a/CHANGES +++ b/CHANGES @@ -5848,6 +5848,10 @@ Version 1.6.30beta04 [June 7, 2017] Version 1.6.30rc01 [June 14, 2017] No changes. +Version 1.6.30rc02 [June 25, 2017] + Update copyright year in pnglibconf.h, make ltmain.sh executable. + Add a reference to the libpng.download site in README. + 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 cccd2c3c4..33ab95765 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.30rc01 +# VERSION 16.${PNGLIB_RELEASE}.1.6.30rc02 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 5e45ef7bd..46905827c 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.30rc01, June 14, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.30rc02, June 25, 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 @@ -130,4 +130,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 14, 2017 +April 1, 2017 diff --git a/README b/README index 2cb919856..bafe35fa4 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.30rc01 - June 14, 2017 (shared library 16.0) +README for libpng version 1.6.30rc02 - June 25, 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. @@ -91,7 +91,7 @@ as an RFC, a W3C Recommendation, and an ISO/IEC Standard. You can find these at http://www.libpng.org/pub/png/pngdocs.html . This code is currently being archived at libpng.sourceforge.io in the -[DOWNLOAD] area, and at ftp://ftp-osl.osuosl.org/pub/libpng/src . If you +[DOWNLOAD] area, and at http://libpng.download/src . If you can't find it in any of those places, e-mail me, and I'll help you find it. I am not a lawyer, but I believe that the Export Control Classification diff --git a/configure.ac b/configure.ac index 08131e9da..7111d21a0 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.30rc01],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.30rc02],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -46,10 +46,10 @@ 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.30rc01 +PNGLIB_VERSION=1.6.30rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 -PNGLIB_RELEASE=28 +PNGLIB_RELEASE=30 dnl End of version number stuff diff --git a/libpng-manual.txt b/libpng-manual.txt index ab46a90bb..9902e0f3a 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.30rc01 - June 14, 2017 + libpng version 1.6.30rc02 - June 25, 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.30rc01 - June 14, 2017 + libpng versions 0.97, January 1998, through 1.6.30rc02 - June 25, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -5383,7 +5383,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.30rc01 are Y2K compliant. It is my belief that earlier +upward through 1.6.30rc02 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 f07dcd154..437bdf5b7 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "June 14, 2017" +.TH LIBPNG 3 "June 25, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.30rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.30rc02 .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.30rc01 - June 14, 2017 + libpng version 1.6.30rc02 - June 25, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 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.30rc01 - June 14, 2017 + libpng versions 0.97, January 1998, through 1.6.30rc02 - June 25, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -5893,7 +5893,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.30rc01 are Y2K compliant. It is my belief that earlier +upward through 1.6.30rc02 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 @@ -6051,7 +6051,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.30rc01 - June 14, 2017: +Libpng version 1.6.30rc02 - June 25, 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). @@ -6076,7 +6076,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.30rc01, June 14, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.30rc02, June 25, 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 @@ -6204,7 +6204,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 14, 2017 +June 25, 2017 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 12f0a2b0f..8bcfddd89 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,11 +1,11 @@ -.TH LIBPNGPF 3 "June 14, 2017" +.TH LIBPNGPF 3 "April 1, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.30rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.30rc02 (private functions) .SH SYNOPSIS -\fB#include \fI"pngpriv.h" +\fB\fB#include \fI\fI"pngpriv.h" -\fBAs of libpng version \fP\fI1.5.1\fP\fB, this section is no longer \fP\fImaintained\fP\fB, now that the private function prototypes are hidden in pngpriv.h and not accessible to applications. Look in pngpriv.h for the prototypes and a short description of each \fIfunction. +\fB\fBAs of libpng version \fP\fI\fP\fI1.5.1\fP\fB\fP\fB, this section is no longer \fP\fI\fP\fImaintained\fP\fB\fP\fB, now that the private function prototypes are hidden in pngpriv.h and not accessible to applications. Look in pngpriv.h for the prototypes and a short description of each \fI\fIfunction. .SH DESCRIPTION The functions previously listed here are used privately by libpng and are not diff --git a/png.5 b/png.5 index 394f5e3a6..b0cbd2cfa 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "June 14, 2017" +.TH PNG 5 "April 1, 2017" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 148fbd6ae..14bd2d96c 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_30rc01 Your_png_h_is_not_version_1_6_30rc01; +typedef png_libpng_version_1_6_30rc02 Your_png_h_is_not_version_1_6_30rc02; /* 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.30rc01 - June 14, 2017" PNG_STRING_NEWLINE \ + "libpng version 1.6.30rc02 - June 25, 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.30rc01 - June 14, 2017\ + return "libpng version 1.6.30rc02 - June 25, 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 19db1589a..b5c83dd49 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.30rc01, June 14, 2017 + * libpng version 1.6.30rc02, June 25, 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.30rc01, June 14, 2017: + * libpng versions 0.97, January 1998, through 1.6.30rc02, June 25, 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.30rc01, June 14, 2017 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.30rc02, June 25, 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 @@ -241,13 +241,13 @@ * Y2K compliance in libpng: * ========================= * - * June 14, 2017 + * June 25, 2017 * * 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.30rc01 are Y2K compliant. It is my belief that + * upward through 1.6.30rc02 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.30rc01" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.30rc01 - June 14, 2017\n" +#define PNG_LIBPNG_VER_STRING "1.6.30rc02" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.30rc02 - June 25, 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 01 +#define PNG_LIBPNG_VER_BUILD 02 /* 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_30rc01; +typedef char* png_libpng_version_1_6_30rc02; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 8bdf3a2ed..4e7b718f9 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.30rc01, June 14, 2017 + * libpng version 1.6.30rc02, June 25, 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 13dbfbf3a..0f1df9f64 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_30rc01 Your_png_h_is_not_version_1_6_30rc01; +typedef png_libpng_version_1_6_30rc02 Your_png_h_is_not_version_1_6_30rc02; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 60e798841..c15d4c2f4 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.30rc01 - June 14, 2017 +libpng version 1.6.30rc02 - June 25, 2017 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 00149e7ce..d1c2a3632 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@