diff --git a/ANNOUNCE b/ANNOUNCE index f5eb71d0f5914a2b22af2396109670d03c938ad6..8968e191f65b39ac0d82a0637e07e6712e26cab4 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.0beta09 - February 1, 2012 +Libpng 1.6.0beta10 - February 1, 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.0beta09.tar.xz (LZMA-compressed, recommended) - 1.6.0beta09.tar.gz - 1.6.0beta09.tar.bz2 + 1.6.0beta10.tar.xz (LZMA-compressed, recommended) + 1.6.0beta10.tar.gz + 1.6.0beta10.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp160b09.7z (LZMA-compressed, recommended) - lp160b09.zip + lp160b10.7z (LZMA-compressed, recommended) + lp160b10.zip Other information: - 1.6.0beta09-README.txt - 1.6.0beta09-LICENSE.txt + 1.6.0beta10-README.txt + 1.6.0beta10-LICENSE.txt Changes since the last public release (1.5.7): @@ -167,8 +167,10 @@ Version 1.6.0beta08 [February 1, 2012] Updated INSTALL to explain that autogen.sh must be run in a GIT clone, not in a libpng directory extracted from a tar distribution. -Version 1.6.0beta09 [February 1, 2012] - Reverted the prebuilt configure files to libpng-1.6.0beta05. +Version 1.6.0beta09 [February 1, 2011] + Reverted the prebuilt configure files to libpng-1.6.0beta05 condition. + +Version 1.6.0beta10 [February 1, 2012] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index f025c9dd929a14e7898bd90e9230838c79ef1d58..d34051c0f977ca2c515e40d1841d3189fd8a1c81 100644 --- a/CHANGES +++ b/CHANGES @@ -3918,8 +3918,10 @@ Version 1.6.0beta08 [February 1, 2012] Updated INSTALL to explain that autogen.sh must be run in a GIT clone, not in a libpng directory extracted from a tar distribution. -Version 1.6.0beta09 [February 1, 2012] - Reverted the prebuilt configure files to libpng-1.6.0beta05. +Version 1.6.0beta09 [February 1, 2011] + Reverted the prebuilt configure files to libpng-1.6.0beta05 condition. + +Version 1.6.0beta10 [February 1, 2012] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 920268c478ca862998dc2a8a16f367c11831e4d9..f5f6ff86ca43137f32bf7d715a4ff0d2d0c2f4cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -258,7 +258,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.0beta09 +# VERSION 16.${PNGLIB_RELEASE}.1.6.0beta10 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index d2a9a39a0acfb4a1ba266f04d83fd8b424e959df..59afa1bf87879afac14e0a871748082c8b8586a6 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.0beta09, February 1, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta10, February 1, 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 441f2cbeaac5950812fee290645260a7c6eecd14..0720d9d8e9ee12984b179585bbf12a11b6d90633 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.0beta09 - February 1, 2012 (shared library 16.0) +README for libpng version 1.6.0beta10 - February 1, 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 706a4dcc57bba211945a124c5021469c9568fced..4b15160b4bc2273cfb031eaf0e09d1a178cfd107 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.0beta09],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.0beta10],[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.0beta09 +PNGLIB_VERSION=1.6.0beta10 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index 86a3b3a916cd69aef3be383f112c4c640bfdb722..e327b9aba2245f70c4842360a41cfcbf41261c70 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.0beta09 - February 1, 2012 + libpng version 1.6.0beta10 - February 1, 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.0beta09 - February 1, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta10 - February 1, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5049,7 +5049,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.0beta09 are Y2K compliant. It is my belief that earlier +upward through 1.6.0beta10 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 bbfdeb30d50eb7874b0bba3f46c705d34cc86bce..e549e0a54f77a8b007014d2c32317d805079de43 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "February 1, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta09 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta10 .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.0beta09 - February 1, 2012 + libpng version 1.6.0beta10 - February 1, 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.0beta09 - February 1, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta10 - February 1, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -6053,7 +6053,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.0beta09 are Y2K compliant. It is my belief that earlier +upward through 1.6.0beta10 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 @@ -6258,7 +6258,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-09 16 10600 16.so.16.0[.0] + 1.6.0beta01-10 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 @@ -6315,7 +6315,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.0beta09 - February 1, 2012: +Libpng version 1.6.0beta10 - February 1, 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). @@ -6338,7 +6338,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0beta09, February 1, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta10, February 1, 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 d6a8805bddf15e7de44dc8a316d7712ea4054443..cc7a4f5581033a08bf335091d008b2139de39af2 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "February 1, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta09 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta10 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 8bde09dcc8cac7f0a01b42b1515f01d99172533e..953a243baadcc655bccf65090085ae6cc4c6ea3d 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_0beta09 Your_png_h_is_not_version_1_6_0beta09; +typedef png_libpng_version_1_6_0beta10 Your_png_h_is_not_version_1_6_0beta10; /* 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.0beta09 - February 1, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.6.0beta10 - February 1, 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.0beta09 - February 1, 2012\ + return "libpng version 1.6.0beta10 - February 1, 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 94684fca5c7ace7a876b8c9f3632eb3ff53f512a..f9f2b9051ac820eff4ac38ef5c3993356c13c60a 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.0beta09 - February 1, 2012 + * libpng version 1.6.0beta10 - February 1, 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.0beta09 - February 1, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.6.0beta10 - February 1, 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-09 16 10600 16.so.16.0[.0] + * 1.6.0beta01-10 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.0beta09, February 1, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta10, February 1, 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.0beta09 are Y2K compliant. It is my belief that + * upward through 1.6.0beta10 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.0beta09" +#define PNG_LIBPNG_VER_STRING "1.6.0beta10" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.0beta09 - February 1, 2012\n" + " libpng version 1.6.0beta10 - February 1, 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 09 +#define PNG_LIBPNG_VER_BUILD 10 /* 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_0beta09; +typedef char* png_libpng_version_1_6_0beta10; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index d3a4bb746dc2b07d30aa46c2e5971019c65afd3e..6b532b4d3a12267cfefaa6c36e685009967ed669 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.0beta09 - February 1, 2012 + * libpng version 1.6.0beta10 - February 1, 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 37999b682e84b28e98de6f60126982c675119ac8..490a8b3d4ab18ec5285bd3c3ff99e770e261e443 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_0beta09 Your_png_h_is_not_version_1_6_0beta09; +typedef png_libpng_version_1_6_0beta10 Your_png_h_is_not_version_1_6_0beta10; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index adc06aedd6d6b97dd3e6743bf4e8b833f2c8382b..28854c776021aa9d4fcc270e8c2898aa05801079 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.0beta09 - February 1, 2012 +libpng version 1.6.0beta10 - February 1, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index d057c972c3e785c4f1c858115f1637b984ae6424..e8d42c7b40b75d66f85ddf4863d1c3acafe5a6c1 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@