diff --git a/ANNOUNCE b/ANNOUNCE index b3d2d9e8096aabc6c21026b2d113f1d25554e055..dcda7a50047d2d4fdf09a88991fc786be6ce3629 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.0beta14 - February 27, 2012 +Libpng 1.6.0beta15 - February 27, 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.0beta14.tar.xz (LZMA-compressed, recommended) - 1.6.0beta14.tar.gz - 1.6.0beta14.tar.bz2 + 1.6.0beta15.tar.xz (LZMA-compressed, recommended) + 1.6.0beta15.tar.gz + 1.6.0beta15.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp160b14.7z (LZMA-compressed, recommended) - lp160b14.zip + lp160b15.7z (LZMA-compressed, recommended) + lp160b15.zip Other information: - 1.6.0beta14-README.txt - 1.6.0beta14-LICENSE.txt + 1.6.0beta15-README.txt + 1.6.0beta15-LICENSE.txt Changes since the last public release (1.5.7): @@ -234,6 +234,8 @@ Version 1.6.0beta14 [February 27, 2012] Added information about the new limits in the manual. Updated Makefile.in +Version 1.6.0beta15 [February 27, 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 5a77c798f43f23b0dc1ae16621f1d0e86db6ba97..8563af9d2002d1ff25331b8fa91e94e742b05877 100644 --- a/CHANGES +++ b/CHANGES @@ -3986,6 +3986,8 @@ Version 1.6.0beta14 [February 27, 2012] Added information about the new limits in the manual. Updated Makefile.in +Version 1.6.0beta15 [February 27, 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 2f4087db526c5bd59588623f4df1c9bd657a520f..340770f832c54cb451132750d5eba661490dec1e 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.0beta14 +# VERSION 16.${PNGLIB_RELEASE}.1.6.0beta15 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 445c594718dcdbf5615d73364bd456cea9f74a95..28005699806d46d3724381a60f6c8e1a756cf02d 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.0beta14, February 27, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta15, February 27, 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 0e36ef753e613aa1d17a18c0de961621a17049ab..048a3f37520d61beaea04d1c981b8e071ae0c48e 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.0beta14 - February 27, 2012 (shared library 16.0) +README for libpng version 1.6.0beta15 - February 27, 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 6e6f985e70b4bc73841c5989ffb4087cfd3be91a..315cf1af5737f27bd888ab4ef7e56ac7059262bc 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.0beta14],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.0beta15],[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.0beta14 +PNGLIB_VERSION=1.6.0beta15 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index cdb2459b7033aebe1c996dc763206cb655b68a1a..d466c395221b41f2e078fd4f1a39727357cfda1a 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.0beta14 - February 27, 2012 + libpng version 1.6.0beta15 - February 27, 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.0beta14 - February 27, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta15 - February 27, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4999,7 +4999,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.0beta14 are Y2K compliant. It is my belief that earlier +upward through 1.6.0beta15 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 57e6f8c93f57eea623e6b296e416c54120d53b68..2094a0cb557414a2c5d91d24e14a21c32b245f17 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "February 27, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta14 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta15 .SH SYNOPSIS \fI\fB @@ -1003,7 +1003,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.0beta14 - February 27, 2012 + libpng version 1.6.0beta15 - February 27, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -1014,7 +1014,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.0beta14 - February 27, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta15 - February 27, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -6003,7 +6003,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.0beta14 are Y2K compliant. It is my belief that earlier +upward through 1.6.0beta15 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 @@ -6208,7 +6208,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-14 16 10600 16.so.16.0[.0] + 1.6.0beta01-15 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 @@ -6265,7 +6265,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.0beta14 - February 27, 2012: +Libpng version 1.6.0beta15 - February 27, 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). @@ -6288,7 +6288,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0beta14, February 27, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta15, February 27, 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 22a498f06ae37ebf2dd7c8e39d7ac0c3c348e7fb..4816efe0f476cafd868539bf8e2c7a3f0c9ee1a6 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "February 27, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta14 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta15 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 6c72ed94d280580b5f5a4844b37c52cd2ec34496..facd1b8969578364571b0cd8be8a50710cece902 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_0beta14 Your_png_h_is_not_version_1_6_0beta14; +typedef png_libpng_version_1_6_0beta15 Your_png_h_is_not_version_1_6_0beta15; /* 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 @@ -762,13 +762,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.0beta14 - February 27, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.6.0beta15 - February 27, 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.0beta14 - February 27, 2012\ + return "libpng version 1.6.0beta15 - February 27, 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 bdc7acb265781a143367f94176bc7995ecdd04a9..c4cda1a4272719427c8f60a0d1498936ac6bf168 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.0beta14 - February 27, 2012 + * libpng version 1.6.0beta15 - February 27, 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.0beta14 - February 27, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.6.0beta15 - February 27, 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-14 16 10600 16.so.16.0[.0] + * 1.6.0beta01-15 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.0beta14, February 27, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta15, February 27, 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.0beta14 are Y2K compliant. It is my belief that + * upward through 1.6.0beta15 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.0beta14" +#define PNG_LIBPNG_VER_STRING "1.6.0beta15" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.0beta14 - February 27, 2012\n" + " libpng version 1.6.0beta15 - February 27, 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 14 +#define PNG_LIBPNG_VER_BUILD 15 /* 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_0beta14; +typedef char* png_libpng_version_1_6_0beta15; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 4ea8f1dbabcda245ac00063ddf5c3d832e197ae6..dc9a9640ec6f1480d964f75a7177298312b7725b 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.0beta14 - February 27, 2012 + * libpng version 1.6.0beta15 - February 27, 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 abaac1c58d248710a4fe2b4efc2d7752664f94d9..52c56c023e664e871a34997439e97813423f8c26 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1659,4 +1659,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_0beta14 Your_png_h_is_not_version_1_6_0beta14; +typedef png_libpng_version_1_6_0beta15 Your_png_h_is_not_version_1_6_0beta15; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 7f028c3165a083ea786f24d435198ca42f6cd461..6fcb6df47eba2f13da64a11ef647da33e86e3e93 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.0beta14 - February 27, 2012 +libpng version 1.6.0beta15 - February 27, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 8a0780332a9ac6df34693f6eef961cd84bb46c72..bb550b58d6f293a7a914b0d042265e2ae4579978 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@