diff --git a/ANNOUNCE b/ANNOUNCE index e716476f94b79402c383257090b7a2870122b0af..b3eb5ff662178eadaac6ad2ee3414ef2596ec8a0 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.0beta30 - October 24, 2012 +Libpng 1.6.0beta31 - October 24, 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.0beta30.tar.xz (LZMA-compressed, recommended) - 1.6.0beta30.tar.gz - 1.6.0beta30.tar.bz2 + 1.6.0beta31.tar.xz (LZMA-compressed, recommended) + 1.6.0beta31.tar.gz + 1.6.0beta31.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp160b30.7z (LZMA-compressed, recommended) - lp160b30.zip + lp160b31.7z (LZMA-compressed, recommended) + lp160b31.zip Other information: - 1.6.0beta30-README.txt - 1.6.0beta30-LICENSE.txt + 1.6.0beta31-README.txt + 1.6.0beta31-LICENSE.txt Changes since the last public release (1.5.7): @@ -525,6 +525,8 @@ Version 1.6.0beta30 [October 24, 2012] Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose() in pngrtran.c (Domani Hannes). +Version 1.6.0beta31 [October 24, 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 2161377c665a21ce172a1c1b801d3975de88803c..a8d8d78e3bfa229bb0f7fc34d43b006e00b46e34 100644 --- a/CHANGES +++ b/CHANGES @@ -4277,6 +4277,8 @@ Version 1.6.0beta30 [October 24, 2012] Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose() in pngrtran.c (Domani Hannes). +Version 1.6.0beta31 [October 24, 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 ad10490f1c43cfe2bc8035db865e383d154f6288..d413ee074fc24bd6e2932ab3080a927adff3c9e2 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.0beta30 +# VERSION 16.${PNGLIB_RELEASE}.1.6.0beta31 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 1f2c40458c335b64fff8dcfa2c974fdc92d93952..10a25ab5c2330c08fd23136728ec62edd3abb11e 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.0beta30, October 24, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta31, October 24, 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 diff --git a/README b/README index c31590836263a803fc2395dad33670468039d16b..3f477797eb36842b54052b2c0c603198bd7d616b 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.0beta30 - October 24, 2012 (shared library 16.0) +README for libpng version 1.6.0beta31 - October 24, 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 ab652bd3ede25c67db7ca48dc6daff65ebd66e4d..6f20e0eb211a2f684ecddda39e7bbcf991c8b5e0 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.0beta30],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.0beta31],[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.0beta30 +PNGLIB_VERSION=1.6.0beta31 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index 502aa4514478b3614c88f902d73990a8bddfd4b5..475f32359d295aca57174074bd21ca2b5aed0d4b 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.0beta30 - October 24, 2012 + libpng version 1.6.0beta31 - October 24, 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.0beta30 - October 24, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta31 - October 24, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5070,7 +5070,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.0beta30 are Y2K compliant. It is my belief that earlier +upward through 1.6.0beta31 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 1dc9fe4df99a25336c314d775199616ecd434e0d..6b0de399926166d08e06f7bb08d35d36ab7742bd 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "October 24, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta30 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta31 .SH SYNOPSIS \fI\fB @@ -997,7 +997,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.0beta30 - October 24, 2012 + libpng version 1.6.0beta31 - October 24, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -1008,7 +1008,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.0beta30 - October 24, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta31 - October 24, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -6068,7 +6068,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.0beta30 are Y2K compliant. It is my belief that earlier +upward through 1.6.0beta31 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 @@ -6273,7 +6273,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-30 16 10600 16.so.16.0[.0] + 1.6.0beta01-31 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 @@ -6330,7 +6330,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.0beta30 - October 24, 2012: +Libpng version 1.6.0beta31 - October 24, 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). @@ -6353,7 +6353,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0beta30, October 24, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta31, October 24, 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 b7cbdda30a2e06916c65134202ee125a93ecb2db..3f76db5a512bc1542ca71db111ea484db8f5223f 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "October 24, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta30 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta31 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index bf3aacf37d3044d6ca3fff2a0afdd0a938549276..d838dbd97025468b2c7ba5653ed3abc70ae6b22a 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_0beta30 Your_png_h_is_not_version_1_6_0beta30; +typedef png_libpng_version_1_6_0beta31 Your_png_h_is_not_version_1_6_0beta31; /* 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 @@ -749,13 +749,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.0beta30 - October 24, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.6.0beta31 - October 24, 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.0beta30 - October 24, 2012\ + return "libpng version 1.6.0beta31 - October 24, 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 59e929bc58450de338abc56bcfcdb4dd318a594c..6273ddaf3f4e4622fe7b2095e231a9bb0d73a6a7 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.0beta30 - October 24, 2012 + * libpng version 1.6.0beta31 - October 24, 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.0beta30 - October 24, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.6.0beta31 - October 24, 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-30 16 10600 16.so.16.0[.0] + * 1.6.0beta01-31 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.0beta30, October 24, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta31, October 24, 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.0beta30 are Y2K compliant. It is my belief that + * upward through 1.6.0beta31 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 @@ -376,9 +376,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.0beta30" +#define PNG_LIBPNG_VER_STRING "1.6.0beta31" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.0beta30 - October 24, 2012\n" + " libpng version 1.6.0beta31 - October 24, 2012\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -392,7 +392,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 30 +#define PNG_LIBPNG_VER_BUILD 31 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -522,7 +522,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_0beta30; +typedef char* png_libpng_version_1_6_0beta31; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 4a48fff550e114d47cb9272f605d17b016e7c93d..a7a11378c0064cf900763b4221e0d7ecf1e72820 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.0beta30 - October 24, 2012 + * libpng version 1.6.0beta31 - October 24, 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 63bd5599751ea584cadb323d6928c7e67c089edf..5794fc8fac78ca25811218c23382e9195adaf938 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1949,4 +1949,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_0beta30 Your_png_h_is_not_version_1_6_0beta30; +typedef png_libpng_version_1_6_0beta31 Your_png_h_is_not_version_1_6_0beta31; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index ff34705ef1179967e7c25ceef673aed63cdecd57..3ebd780d9f2aa9f5fee8c7bdedfefd3fbf3d767e 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.0beta30 - October 24, 2012 +libpng version 1.6.0beta31 - October 24, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 42230e4ae962ec0597e30c0b1b1d30c2cba4e2e0..066d90ed82673b5576e1c6ec4c3188d3dda5587c 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@