diff --git a/ANNOUNCE b/ANNOUNCE index f2e652fba2d97e366cf5257c2c025255b3df825b..4b57d04506511807a0a53cf7a2e8a377bed7f393 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.0beta19 - March 19, 2012 +Libpng 1.6.0beta20 - March 19, 2012 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. @@ -9,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.0beta19.tar.xz (LZMA-compressed, recommended) - 1.6.0beta19.tar.gz - 1.6.0beta19.tar.bz2 + 1.6.0beta20.tar.xz (LZMA-compressed, recommended) + 1.6.0beta20.tar.gz + 1.6.0beta20.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp160b19.7z (LZMA-compressed, recommended) - lp160b19.zip + lp160b20.7z (LZMA-compressed, recommended) + lp160b20.zip Other information: - 1.6.0beta19-README.txt - 1.6.0beta19-LICENSE.txt + 1.6.0beta20-README.txt + 1.6.0beta20-LICENSE.txt Changes since the last public release (1.5.7): @@ -318,7 +318,7 @@ Version 1.6.0beta18 [March 16, 2012] read benign errors to warnings (regardless of the system default, unless this is disabled in which case the simplified API can't be built.) -Version 1.6.0beta19 [March 19, 2012] +Version 1.6.0beta19 [March 18,2012] Work around for duplicate row start calls; added warning messages. This turns on PNG_FLAG_DETECT_UNINITIALIZED to detect app code that fails to call one of the 'start' routines (not enabled in libpng-1.5 @@ -339,6 +339,8 @@ Version 1.6.0beta19 [March 19, 2012] Avoid the double gamma correction warning in the simplified API. This allows the --strict option to pass in the pngstest checks +Version 1.6.0beta20 [March 19, 2012] + 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 6191cdaed720d580b3bfbf69381cc88a3601ed9c..067b38f8e759561404a2cddc11e5edad927576a0 100644 --- a/CHANGES +++ b/CHANGES @@ -4069,7 +4069,7 @@ Version 1.6.0beta18 [March 16, 2012] read benign errors to warnings (regardless of the system default, unless this is disabled in which case the simplified API can't be built.) -Version 1.6.0beta19 [March 19, 2012] +Version 1.6.0beta19 [March 18, 2012] Work around for duplicate row start calls; added warning messages. This turns on PNG_FLAG_DETECT_UNINITIALIZED to detect app code that fails to call one of the 'start' routines (not enabled in libpng-1.5 @@ -4090,6 +4090,8 @@ Version 1.6.0beta19 [March 19, 2012] Avoid the double gamma correction warning in the simplified API. This allows the --strict option to pass in the pngstest checks +Version 1.6.0beta20 [March 19, 2012] + 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 3639b35329afb0c60b95f34be858963c4856cb0f..95269bdc08422bd532e0275a7d320074728f5f6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -260,7 +260,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.0beta19 +# VERSION 16.${PNGLIB_RELEASE}.1.6.0beta20 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 572005e9ea77c3fc8afdfeba7db7f010018a6bf6..2d5fa7c76b6d653c97f61c9b2f86dd71a80b94b4 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0beta19, March 19, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta20, March 19, 2012, are Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors diff --git a/README b/README index bdd800081334964547629bc5f4bcd611ce21cd57..86f689a1bd70f6f8ec2c0402128294f680e50a89 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.0beta19 - March 19, 2012 (shared library 16.0) +README for libpng version 1.6.0beta20 - March 19, 2012 (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 5619d9217da981662d4675971459472f5602b0c4..bdce3dc940a3022319f36446470c7da8616329d5 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.0beta19],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.0beta20],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -37,7 +37,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.0beta19 +PNGLIB_VERSION=1.6.0beta20 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index b23fbacc9db1bb4c5d06b168b9f7cb656a2663b4..60096397abbed69f4b917c55e8cb9b895ef814cb 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.0beta19 - March 19, 2012 + libpng version 1.6.0beta20 - March 19, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 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.0beta19 - March 19, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta20 - March 19, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5009,7 +5009,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.0beta19 are Y2K compliant. It is my belief that earlier +upward through 1.6.0beta20 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpng.3 b/libpng.3 index 819390e097124a29c40a32d0461031c97c765d3b..9e4485946e60118499b2499d2dd282afb5030730 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "March 19, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta19 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta20 .SH SYNOPSIS \fI\fB @@ -1007,7 +1007,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.0beta19 - March 19, 2012 + libpng version 1.6.0beta20 - March 19, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -1018,7 +1018,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.0beta19 - March 19, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta20 - March 19, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -6017,7 +6017,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.0beta19 are Y2K compliant. It is my belief that earlier +upward through 1.6.0beta20 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -6222,7 +6222,7 @@ the first widely used release: 1.5.7beta01-05 15 10507 15.so.15.7[.0] 1.5.7rc01-03 15 10507 15.so.15.7[.0] 1.5.7 15 10507 15.so.15.7[.0] - 1.6.0beta01-19 16 10600 16.so.16.0[.0] + 1.6.0beta01-20 16 10600 16.so.16.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6279,7 +6279,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.0beta19 - March 19, 2012: +Libpng version 1.6.0beta20 - March 19, 2012: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6302,7 +6302,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0beta19, March 19, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta20, March 19, 2012, are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors diff --git a/libpngpf.3 b/libpngpf.3 index e4cee27f03df0e57238801b5d5e6069bfbc2ae90..003d1554be18d439dfe0bdbf14d72c38f4ebd7f5 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "March 19, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta19 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta20 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 2ed4d66e5c2e05fa1cd51d75af7b440bd3f5d0b2..59aba4cd14f3b2b2461f34447a331f7c171b97d3 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_0beta19 Your_png_h_is_not_version_1_6_0beta19; +typedef png_libpng_version_1_6_0beta20 Your_png_h_is_not_version_1_6_0beta20; /* 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 @@ -747,13 +747,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.0beta19 - March 19, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.6.0beta20 - March 19, 2012" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2012 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.0beta19 - March 19, 2012\ + return "libpng version 1.6.0beta20 - March 19, 2012\ Copyright (c) 1998-2012 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 df2493829fd849c461d0f60ccbbe57010acd96cf..d2f5ce13784bdb83f9f292edafa094df603abb04 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.0beta19 - March 19, 2012 + * libpng version 1.6.0beta20 - March 19, 2012 * Copyright (c) 1998-2012 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,7 +11,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.0beta19 - March 19, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.6.0beta20 - March 19, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -166,7 +166,7 @@ * 1.5.7beta01-05 15 10507 15.so.15.7[.0] * 1.5.7rc01-03 15 10507 15.so.15.7[.0] * 1.5.7 15 10507 15.so.15.7[.0] - * 1.6.0beta01-19 16 10600 16.so.16.0[.0] + * 1.6.0beta01-20 16 10600 16.so.16.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -198,7 +198,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta19, March 19, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta20, March 19, 2012, are * Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -316,7 +316,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.0beta19 are Y2K compliant. It is my belief that + * upward through 1.6.0beta20 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 @@ -374,9 +374,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.0beta19" +#define PNG_LIBPNG_VER_STRING "1.6.0beta20" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.0beta19 - March 19, 2012\n" + " libpng version 1.6.0beta20 - March 19, 2012\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -390,7 +390,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 19 +#define PNG_LIBPNG_VER_BUILD 20 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -520,7 +520,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_0beta19; +typedef char* png_libpng_version_1_6_0beta20; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 41f190695923ecb803db66bb29b775f858112f60..841251e930bcd06df3a11dddf7abc47d89238786 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.0beta19 - March 19, 2012 + * libpng version 1.6.0beta20 - March 19, 2012 * * Copyright (c) 1998-2012 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 3434f7665abc7ec8e99098e891a18b0569f71210..66bfd6ee377318b2dea47e53a47fa4342b7509f1 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1692,4 +1692,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_0beta19 Your_png_h_is_not_version_1_6_0beta19; +typedef png_libpng_version_1_6_0beta20 Your_png_h_is_not_version_1_6_0beta20; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 4b549fbce78dadf97d329a861bc280add6246d7a..452fcb5e4344a76935ac8a76cd1aef7cf2a1dc4c 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.0beta19 - March 19, 2012 +libpng version 1.6.0beta20 - March 19, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 1c0b51db375417e708ddbaba8d51020282701dd6..7519cb9079826af6de3a27f17d84dcb0f1182971 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@