diff --git a/ANNOUNCE b/ANNOUNCE index e9ed20f559a4ba2986b1d1ebfc17b2823964ff76..84ebe3e2af2e4db1be71281781be2d5659f74320 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.22beta01 - January 23, 2016 +Libpng 1.6.22beta02 - January 23, 2016 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.22beta01.tar.xz (LZMA-compressed, recommended) - 1.6.22beta01.tar.gz + 1.6.22beta02.tar.xz (LZMA-compressed, recommended) + 1.6.22beta02.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - /scratch/glennrp/Libpng16/lp1622b01.7z (LZMA-compressed, recommended) - /scratch/glennrp/Libpng16/lp1622b01.zip + /scratch/glennrp/Libpng16/lp1622b02.7z (LZMA-compressed, recommended) + /scratch/glennrp/Libpng16/lp1622b02.zip Other information: - 1.6.22beta01-README.txt - 1.6.22beta01-LICENSE.txt - libpng-1.6.22beta01-*.asc (armored detached GPG signatures) + 1.6.22beta02-README.txt + 1.6.22beta02-LICENSE.txt + libpng-1.6.22beta02-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.21): @@ -40,6 +40,8 @@ Version 1.6.22beta01 [January 23, 2016] less than 4GByte and image row size (stride) to less than 2GByte. Revised workaround for false-positive Coverity issue in pngvalid.c. +Version 1.6.22beta02 [January 23, 2016] + 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 a6888d064af8d2b4a87c972e9be6677eabbe81bb..9320502c2c530bbb92345ae27223a10759ad8593 100644 --- a/CHANGES +++ b/CHANGES @@ -5499,6 +5499,8 @@ Version 1.6.22beta01 [January 23, 2016] less than 4GByte and image row size (stride) to less than 2GByte. Revised workaround for false-positive Coverity issue in pngvalid.c. +Version 1.6.22beta02 [January 23, 2016] + 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 68be7ab718737f398e3a7a086248917be2094503..1465fa7766c4b8c861e7ae57e64f1927b4bd62a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -261,7 +261,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.22beta01 +# VERSION 16.${PNGLIB_RELEASE}.1.6.22beta02 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index dfc7ee2ae7bbf26177839564d02e7bf0c4686cfb..83e88035b858e955498a65d97cdf7b3e13d44695 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.22beta01, January 23, 2016, are +libpng versions 1.0.7, July 1, 2000, through 1.6.22beta02, January 23, 2016, are Copyright (c) 2000-2002, 2004, 2006-2016 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 87444a6e46579fa5ae7d7f761a40d2c508f3f8ff..d92c2f460b4e71dd28cea4cd856edae008c08dcd 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.22beta01 - January 23, 2016 (shared library 16.0) +README for libpng version 1.6.22beta02 - January 23, 2016 (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 ffc69fff55c2b31f1885d7387b79b1145f5260a8..0176c17deb157b7601907b71b5be835df0e26bbd 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.22beta01],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.22beta02],[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.22beta01 +PNGLIB_VERSION=1.6.22beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=22 diff --git a/libpng-manual.txt b/libpng-manual.txt index 38dc1801a06fc7abf0bbbf189b7f7479982aabcf..2a203a5b76a8a6dde272d643cbee1829a6e7935a 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.22beta01 - January 23, 2016 + libpng version 1.6.22beta02 - January 23, 2016 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.22beta01 - January 23, 2016 + libpng versions 0.97, January 1998, through 1.6.22beta02 - January 23, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5336,7 +5336,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.22beta01 are Y2K compliant. It is my belief that earlier +upward through 1.6.22beta02 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 019bf6cb662c863b45c873f1ee7e4e9621d663b8..e1a45faaea65da10a3db98a28f1420491ccf8925 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "January 23, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22beta02 .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.22beta01 - January 23, 2016 + libpng version 1.6.22beta02 - January 23, 2016 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.22beta01 - January 23, 2016 + libpng versions 0.97, January 1998, through 1.6.22beta02 - January 23, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5846,7 +5846,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.22beta01 are Y2K compliant. It is my belief that earlier +upward through 1.6.22beta02 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 @@ -6004,7 +6004,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.22beta01 - January 23, 2016: +Libpng version 1.6.22beta02 - January 23, 2016: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6029,7 +6029,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.6.22beta01, January 23, 2016, are +libpng versions 1.0.7, July 1, 2000, through 1.6.22beta02, January 23, 2016, are Copyright (c) 2000-2002, 2004, 2006-2016 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 7e67e5f96755565551715e389210fbf44b44f4dc..a95bec499afae4ae0c63933ca7b69539e93b0c24 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "January 23, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22beta02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index f76f2f1d569294f3a5fd9b77aea413dc5cb7529c..6903824968c27eab0cafe4a449b55d79e6593296 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_22beta01 Your_png_h_is_not_version_1_6_22beta01; +typedef png_libpng_version_1_6_22beta02 Your_png_h_is_not_version_1_6_22beta02; /* 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 @@ -775,14 +775,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.22beta01 - January 23, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.6.22beta02 - January 23, 2016" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2016 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.22beta01 - January 23, 2016\ + return "libpng version 1.6.22beta02 - January 23, 2016\ Copyright (c) 1998-2002,2004,2006-2016 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 db491c3ac3fa4f8fad3528c35ef30f7f77c71fa9..e98b475ff4cb28406aba342452a586ca3e8ac15d 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.22beta01, January 23, 2016 + * libpng version 1.6.22beta02, January 23, 2016 * * Copyright (c) 1998-2002,2004,2006-2016 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.22beta01, January 23, 2016: + * libpng versions 0.97, January 1998, through 1.6.22beta02, January 23, 2016: * 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.22beta01, January 23, 2016, are + * libpng versions 1.0.7, July 1, 2000, through 1.6.22beta02, January 23, 2016, are * Copyright (c) 2000-2002, 2004, 2006-2016 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 @@ -220,7 +220,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.22beta01 are Y2K compliant. It is my belief that + * upward through 1.6.22beta02 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 @@ -282,9 +282,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.22beta01" +#define PNG_LIBPNG_VER_STRING "1.6.22beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.22beta01 - January 23, 2016\n" + " libpng version 1.6.22beta02 - January 23, 2016\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -298,7 +298,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 @@ -433,7 +433,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_22beta01; +typedef char* png_libpng_version_1_6_22beta02; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 90406deb821c52a121ae2319a1864cad7fa989b4..87d8605c93d54c45d2d9a95d1662db393480cbbb 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.22beta01, January 23, 2016 + * libpng version 1.6.22beta02, January 23, 2016 * * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 8c264ac754c6ce6c17684326a00cff201decc616..95b918a9aa98f9fd5cce3654619a2fcb0542a1b2 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2070,4 +2070,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_22beta01 Your_png_h_is_not_version_1_6_22beta01; +typedef png_libpng_version_1_6_22beta02 Your_png_h_is_not_version_1_6_22beta02; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 581998189c38bc67780489c841aaff78ce73b507..22c53a74c101bfe9de4172eea65f8e3c83699d51 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.22beta01 - January 23, 2016 +libpng version 1.6.22beta02 - January 23, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 38276d4d3cb669adce5e24c990efe226a16c56b3..6e05fea1869a4fc34a40458d65ad8291b852611e 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@