diff --git a/ANNOUNCE b/ANNOUNCE index 4549c8dce0be0fc9c18d4f40a1a290ae8dd22cad..e8b2ac136a6e032a1b58b0ae4ff2174690211bef 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.31beta01 - July 5, 2017 +Libpng 1.6.31beta02 - July 5, 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.31beta01.tar.xz (LZMA-compressed, recommended) - 1.6.31beta01.tar.gz + 1.6.31beta02.tar.xz (LZMA-compressed, recommended) + 1.6.31beta02.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1631b01.7z (LZMA-compressed, recommended) - lp1631b01.zip + lp1631b02.7z (LZMA-compressed, recommended) + lp1631b02.zip Other information: - 1.6.31beta01-README.txt - 1.6.31beta01-LICENSE.txt - libpng-1.6.31beta01-*.asc (armored detached GPG signatures) + 1.6.31beta02-README.txt + 1.6.31beta02-LICENSE.txt + libpng-1.6.31beta02-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.29): @@ -69,6 +69,8 @@ Version 1.6.31beta01 [July 5, 2017] Added "Requires: zlib" to libpng.pc.in (Pieter Neerincx). Added special case for FreeBSD in arm/filter_neon.S (Maya Rashish). +Version 1.6.31beta02 [July 5, 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 87133d8587d819a2c125cb978450fe79a27e0073..b06e8702e3495a83c60984a520b93fc270ddcf96 100644 --- a/CHANGES +++ b/CHANGES @@ -5864,6 +5864,8 @@ Version 1.6.31beta01 [July 5, 2017] Added "Requires: zlib" to libpng.pc.in (Pieter Neerincx). Added special case for FreeBSD in arm/filter_neon.S (Maya Rashish). +Version 1.6.31beta02 [July 5, 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 09379e512157190fcd919ce5fd7947d20c98aa92..f7d3c6d74f0af8786afdbe138e4a5f53ef28ac29 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.31beta01 +# VERSION 16.${PNGLIB_RELEASE}.1.6.31beta02 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 7ce670fa3d0e140f894fcff5c119aa4f4d88b86b..36c9d1805f4f23281184e673623e43513b7cbb80 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.31beta01, July 5, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.31beta02, July 5, 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 985e9dcb529c11c61292b4789474a4848279343a..2b92527576f86e89d4ae614725812c6d3b16b30d 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.31beta01 - July 5, 2017 (shared library 16.0) +README for libpng version 1.6.31beta02 - July 5, 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 b01350c7015e157157ac65591f40428dc5d564e0..9dceaabb62951aa293df92076d6f2ac24af04ad1 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.31beta01],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.31beta02],[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.31beta01 +PNGLIB_VERSION=1.6.31beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=31 diff --git a/libpng-manual.txt b/libpng-manual.txt index 51dc6b3f36d16bdcc2dbace6e8ae7010bf5b8a5b..1c746695a1272c0d784993a15b549f97ce36bc63 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.31beta01 - July 5, 2017 + libpng version 1.6.31beta02 - July 5, 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.31beta01 - July 5, 2017 + libpng versions 0.97, January 1998, through 1.6.31beta02 - July 5, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -5388,7 +5388,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.31beta01 are Y2K compliant. It is my belief that earlier +upward through 1.6.31beta02 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 c6cdc5a02ec8857af56a834b0acac4f10a92adba..ccc279485f8b8c7824434894c66cd8309fdfefff 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "July 5, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.31beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.31beta02 .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.31beta01 - July 5, 2017 + libpng version 1.6.31beta02 - July 5, 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.31beta01 - July 5, 2017 + libpng versions 0.97, January 1998, through 1.6.31beta02 - July 5, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -5898,7 +5898,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.31beta01 are Y2K compliant. It is my belief that earlier +upward through 1.6.31beta02 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 @@ -6056,7 +6056,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.31beta01 - July 5, 2017: +Libpng version 1.6.31beta02 - July 5, 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). @@ -6081,7 +6081,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.31beta01, July 5, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.31beta02, July 5, 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 82e3eb679b6762c4852988987352077557de89c9..e406053fcdbeace50e341053851c3201d0e144bb 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.31beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.31beta02 (private functions) .SH SYNOPSIS \fB\fB#include \fI\fI"pngpriv.h" diff --git a/png.c b/png.c index e9e571cc92ce0731817898fba4862c9edd93a96d..869703a39af85d1229c6b9995fa3f25f09651925 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_31beta01 Your_png_h_is_not_version_1_6_31beta01; +typedef png_libpng_version_1_6_31beta02 Your_png_h_is_not_version_1_6_31beta02; /* 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.31beta01 - July 5, 2017" PNG_STRING_NEWLINE \ + "libpng version 1.6.31beta02 - July 5, 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.31beta01 - July 5, 2017\ + return "libpng version 1.6.31beta02 - July 5, 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 213d5be14b696400c5aa9cc38b45ad4509a78605..f72fae3fb97cac06e0acfeab9144b85549a41370 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.31beta01, July 5, 2017 + * libpng version 1.6.31beta02, July 5, 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.31beta01, July 5, 2017: + * libpng versions 0.97, January 1998, through 1.6.31beta02, July 5, 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.31beta01, July 5, 2017 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.31beta02, July 5, 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.31beta01 are Y2K compliant. It is my belief that + * upward through 1.6.31beta02 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.31beta01" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.31beta01 - July 5, 2017\n" +#define PNG_LIBPNG_VER_STRING "1.6.31beta02" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.31beta02 - July 5, 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_31beta01; +typedef char* png_libpng_version_1_6_31beta02; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index d7d479281ad01be59af0dd50570a27838ebf3013..db2876fd4d1abe768cc2cabc49f6f4164c1aba6c 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.31beta01, July 5, 2017 + * libpng version 1.6.31beta02, July 5, 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 0adaaa5ed7d0f50a26ee58a49ca7cae8efb17b43..29124335c97a8b1259b6c24211f43b9f750a382d 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_31beta01 Your_png_h_is_not_version_1_6_31beta01; +typedef png_libpng_version_1_6_31beta02 Your_png_h_is_not_version_1_6_31beta02; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index d07a61bb90e48ab46e131f815f483a3a63f73c78..62b02b0e5bababb8287feef20b555a4be98eeabd 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.31beta01 - July 5, 2017 +libpng version 1.6.31beta02 - July 5, 2017 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 1ad869848cbd98be367d5c58e2ef850446d356f6..49bc83c19f70f62900233e4c484f2af4b5af6a7b 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@