diff --git a/ANNOUNCE b/ANNOUNCE index 5cea6760d90431c20935e90b2943a28be0d2ee3a..83f8fdbab4d072d49e7e454f10ae680aec2c81d8 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.1beta03 - February 22, 2013 +Libpng 1.6.1beta04 - February 22, 2013 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,19 +9,19 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.1beta03.tar.xz (LZMA-compressed, recommended) - 1.6.1beta03.tar.gz + 1.6.1beta04.tar.xz (LZMA-compressed, recommended) + 1.6.1beta04.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp161b03.7z (LZMA-compressed, recommended) - lp161b03.zip + lp161b04.7z (LZMA-compressed, recommended) + lp161b04.zip Other information: - 1.6.1beta03-README.txt - 1.6.1beta03-LICENSE.txt + 1.6.1beta04-README.txt + 1.6.1beta04-LICENSE.txt Changes since the last public release (1.6.0): @@ -58,6 +58,8 @@ Version 1.6.1beta03 [February 22, 2013] for it on then the build will fail if it can't be done.) Updated the INSTALL document. +Version 1.6.1beta04 [February 22, 2013] + 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 b60f0e53070f32a559f0eb22674d7a42461fa695..c8f827d4540179312b6b3b4c67d5c9eae08895cc 100644 --- a/CHANGES +++ b/CHANGES @@ -4415,6 +4415,8 @@ Version 1.6.1beta03 [February 22, 2013] for it on then the build will fail if it can't be done.) Updated the INSTALL document. +Version 1.6.1beta04 [February 22, 2013] + 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 eebe51b653260b3b498a361b3ba6e4c2baf587d1..6fdbc231046639d3da2ca99bb43358738c8f9428 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.1beta03 +# VERSION 16.${PNGLIB_RELEASE}.1.6.1beta04 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 10682b983e444dad1101c4c872fa5b50616899db..3b7c3e49fab6e764fdf04e52fad5694516a9838f 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.1beta03, February 22, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.1beta04, February 22, 2013, 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 e670716ff0d1446cb56278ebdb8e6dfde5b50c57..0a81e59387056eee007f1dc5dfa197300023499f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.1beta03 - February 22, 2013 (shared library 16.0) +README for libpng version 1.6.1beta04 - February 22, 2013 (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 9eccae947b83618cce76b5801bc272c996a053af..dd91a7efacc438a6305bc2eea4a17104459d1a78 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.1beta03],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.1beta04],[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.1beta03 +PNGLIB_VERSION=1.6.1beta04 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=1 diff --git a/libpng-manual.txt b/libpng-manual.txt index 1ca9a9f47d46ea3db1dcc8b34d179f931c7574bd..291c0457727ea6db549279b47d3cd5547249a2b8 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.1beta03 - February 22, 2013 + libpng version 1.6.1beta04 - February 22, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 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.1beta03 - February 22, 2013 + libpng versions 0.97, January 1998, through 1.6.1beta04 - February 22, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5157,7 +5157,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.1beta03 are Y2K compliant. It is my belief that earlier +upward through 1.6.1beta04 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 2e64ac6a243edf88498e3548a37e2574781bb0d8..7e19e58dd66a02b666920ff8af9d7aa7fe2c65df 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "February 22, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta04 .SH SYNOPSIS \fB #include \fP @@ -504,7 +504,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.1beta03 - February 22, 2013 + libpng version 1.6.1beta04 - February 22, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.1beta03 - February 22, 2013 + libpng versions 0.97, January 1998, through 1.6.1beta04 - February 22, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5662,7 +5662,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.1beta03 are Y2K compliant. It is my belief that earlier +upward through 1.6.1beta04 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 @@ -5870,7 +5870,7 @@ the first widely used release: 1.6.0beta01-40 16 10600 16.so.16.0[.0] 1.6.0rc01-08 16 10600 16.so.16.0[.0] 1.6.0 16 10600 16.so.16.0[.0] - 1.6.1beta01-03 16 10601 16.so.16.1[.0] + 1.6.1beta01-04 16 10601 16.so.16.1[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5927,7 +5927,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.1beta03 - February 22, 2013: +Libpng version 1.6.1beta04 - February 22, 2013: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5950,7 +5950,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.1beta03, February 22, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.1beta04, February 22, 2013, 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 89f8f98bf5b885a6f77940d30a845cd3c6e9b698..45ea074304ef46d1719a39ce20771a202306018f 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "February 22, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta04 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index a90be4206c41be34d7b5c086dbdaffd09b9a1876..a2ad1c03f5c8dc88bd9e6093b3f1b3c17f515287 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_1beta03 Your_png_h_is_not_version_1_6_1beta03; +typedef png_libpng_version_1_6_1beta04 Your_png_h_is_not_version_1_6_1beta04; /* 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 @@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.1beta03 - February 22, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.1beta04 - February 22, 2013" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2013 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.1beta03 - February 22, 2013\ + return "libpng version 1.6.1beta04 - February 22, 2013\ Copyright (c) 1998-2013 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 c71736e2f1265ff5ddec678167799081f5f189db..c45eeb88152a72a0bca063f6d5dca0abf9ce9866 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.1beta03 - February 22, 2013 + * libpng version 1.6.1beta04 - February 22, 2013 * Copyright (c) 1998-2013 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.1beta03 - February 22, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.1beta04 - February 22, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -169,7 +169,7 @@ * 1.6.0beta01-40 16 10600 16.so.16.0[.0] * 1.6.0rc01-08 16 10600 16.so.16.0[.0] * 1.6.0 16 10600 16.so.16.0[.0] - * 1.6.1beta01-03 16 10601 16.so.16.1[.0] + * 1.6.1beta01-04 16 10601 16.so.16.1[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -201,7 +201,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.1beta03, February 22, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.1beta04, February 22, 2013, are * Copyright (c) 2004, 2006-2013 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: @@ -319,7 +319,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.1beta03 are Y2K compliant. It is my belief that + * upward through 1.6.1beta04 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 @@ -379,9 +379,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.1beta03" +#define PNG_LIBPNG_VER_STRING "1.6.1beta04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.1beta03 - February 22, 2013\n" + " libpng version 1.6.1beta04 - February 22, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -395,7 +395,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 03 +#define PNG_LIBPNG_VER_BUILD 04 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -525,7 +525,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_1beta03; +typedef char* png_libpng_version_1_6_1beta04; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 1dc935468f5927875e286c2642ba0f8cd080a573..5e49cb2232b6ff3f8d035698d954cd06b7d33316 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.1beta03 - February 22, 2013 + * libpng version 1.6.1beta04 - February 22, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 3fe8e69bfb0c9d1c576c58e199d525e1ffceaa86..47e0edd76aa9257c55d574da56d29a1abe0dd18d 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1950,4 +1950,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_1beta03 Your_png_h_is_not_version_1_6_1beta03; +typedef png_libpng_version_1_6_1beta04 Your_png_h_is_not_version_1_6_1beta04; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 27e2f297824d4977e3ae816fabd25dd02b4d954a..643d83f3b060e15e9d7d151258f5500cf4500de5 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.1beta03 - February 22, 2013 +libpng version 1.6.1beta04 - February 22, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 005012dbe2dcaabeca71e6cb7569247b868677b7..d6a04d9c648f39e5924f98275a6ac4e564ec88a7 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@