diff --git a/ANNOUNCE b/ANNOUNCE index 9ced584e7..2afc09adc 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.17beta05 - February 23, 2015 +Libpng 1.6.17beta06 - February 25, 2015 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. @@ -8,20 +8,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.17beta05.tar.xz (LZMA-compressed, recommended) - 1.6.17beta05.tar.gz + 1.6.17beta06.tar.xz (LZMA-compressed, recommended) + 1.6.17beta06.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1617b05.7z (LZMA-compressed, recommended) - lp1617b05.zip + lp1617b06.7z (LZMA-compressed, recommended) + lp1617b06.zip Other information: - 1.6.17beta05-README.txt - 1.6.17beta05-LICENSE.txt - libpng-1.6.17beta05-*.asc (armored detached GPG signatures) + 1.6.17beta06-README.txt + 1.6.17beta06-LICENSE.txt + libpng-1.6.17beta06-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.16): @@ -56,7 +56,10 @@ Version 1.6.17beta04 [February 21, 2015] Allow user to call png_get_IHDR() with NULL arguments (Reuben Hawkins). Rebuilt configure scripts with automake-1.15 and libtool-2.4.6 -Version 1.6.17beta05 [February 23, 2015] +Version 1.6.17beta05 [February 25, 2015] + Restored compiling of png_reciprocal2 with PNG_NO_16BIT. + +Version 1.6.17beta06 [February 25, 2015] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index af55ab955..76d6644c7 100644 --- a/CHANGES +++ b/CHANGES @@ -5157,7 +5157,10 @@ Version 1.6.17beta04 [February 21, 2015] Allow user to call png_get_IHDR() with NULL arguments (Reuben Hawkins). Rebuilt configure scripts with automake-1.15 and libtool-2.4.6 -Version 1.6.17beta05 [February 23, 2015] +Version 1.6.17beta05 [February 25, 2015] + Restored compiling of png_reciprocal2 with PNG_NO_16BIT. + +Version 1.6.17beta06 [February 25, 2015] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index b37984973..d1ece27c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -253,7 +253,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.17beta05 +# VERSION 16.${PNGLIB_RELEASE}.1.6.17beta06 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index b77b9b635..cced0b879 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.17beta05, February 23, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.6.17beta06, February 25, 2015, are Copyright (c) 2004, 2006-2015 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 23, 2015 +February 25, 2015 diff --git a/README b/README index f5b3e2c19..4b1d1c018 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.17beta05 - February 23, 2015 (shared library 16.0) +README for libpng version 1.6.17beta06 - February 25, 2015 (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 a5131ea66..0b5c36800 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.17beta05],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.17beta06],[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.17beta05 +PNGLIB_VERSION=1.6.17beta06 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=17 diff --git a/libpng-manual.txt b/libpng-manual.txt index 5828cd4a5..9e24ebac5 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.17beta05 - February 23, 2015 + libpng version 1.6.17beta06 - February 25, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 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.17beta05 - February 23, 2015 + libpng versions 0.97, January 1998, through 1.6.17beta06 - February 25, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5275,13 +5275,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -February 23, 2015 +February 25, 2015 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.17beta05 are Y2K compliant. It is my belief that earlier +upward through 1.6.17beta06 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 8ae0dcdbf..aad143a67 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "February 23, 2015" +.TH LIBPNG 3 "February 25, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.17beta05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.17beta06 .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.17beta05 - February 23, 2015 + libpng version 1.6.17beta06 - February 25, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 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.17beta05 - February 23, 2015 + libpng versions 0.97, January 1998, through 1.6.17beta06 - February 25, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5779,13 +5779,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -February 23, 2015 +February 25, 2015 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.17beta05 are Y2K compliant. It is my belief that earlier +upward through 1.6.17beta06 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 @@ -6037,7 +6037,7 @@ the first widely used release: 1.6.16beta01-03 16 10616 16.so.16.16[.0] 1.6.16rc01-02 16 10616 16.so.16.16[.0] 1.6.16 16 10616 16.so.16.16[.0] - 1.6.17beta01-05 16 10617 16.so.16.17[.0] + 1.6.17beta01-06 16 10617 16.so.16.17[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6094,7 +6094,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.17beta05 - February 23, 2015: +Libpng version 1.6.17beta06 - February 25, 2015: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6117,7 +6117,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.17beta05, February 23, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.6.17beta06, February 25, 2015, are Copyright (c) 2004,2006-2014 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 @@ -6216,7 +6216,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 23, 2015 +February 25, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 9b2377894..534db073e 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "February 23, 2015" +.TH LIBPNGPF 3 "February 25, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.17beta05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.17beta06 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 43fe59c58..a33b562e9 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "February 23, 2015" +.TH PNG 5 "February 25, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 9d530d687..7b2a6ea17 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_17beta05 Your_png_h_is_not_version_1_6_17beta05; +typedef png_libpng_version_1_6_17beta06 Your_png_h_is_not_version_1_6_17beta06; /* 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 @@ -772,13 +772,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.17beta05 - February 23, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.6.17beta06 - February 25, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 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.17beta05 - February 23, 2015\ + return "libpng version 1.6.17beta06 - February 25, 2015\ Copyright (c) 1998-2015 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 c9d56f4ce..9a679f8c6 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.17beta05, February 23, 2015 + * libpng version 1.6.17beta06, February 25, 2015 * Copyright (c) 1998-2015 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.17beta05, February 23, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.6.17beta06, February 25, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -212,7 +212,7 @@ * 1.6.16beta01-03 16 10616 16.so.16.16[.0] * 1.6.16rc01-02 16 10616 16.so.16.16[.0] * 1.6.16 16 10616 16.so.16.16[.0] - * 1.6.17beta01-05 16 10617 16.so.16.17[.0] + * 1.6.17beta01-06 16 10617 16.so.16.17[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -244,7 +244,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.17beta05, February 23, 2015, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.17beta06, February 25, 2015, are * Copyright (c) 2004, 2006-2015 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: @@ -356,13 +356,13 @@ * Y2K compliance in libpng: * ========================= * - * February 23, 2015 + * February 25, 2015 * * 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.17beta05 are Y2K compliant. It is my belief that + * upward through 1.6.17beta06 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 @@ -424,9 +424,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.17beta05" +#define PNG_LIBPNG_VER_STRING "1.6.17beta06" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.17beta05 - February 23, 2015\n" + " libpng version 1.6.17beta06 - February 25, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -440,7 +440,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 05 +#define PNG_LIBPNG_VER_BUILD 06 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -570,7 +570,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_17beta05; +typedef char* png_libpng_version_1_6_17beta06; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 0443739f9..26d2ec4e3 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.17beta05, (PENDING RELEASE) + * libpng version 1.6.17beta06, (PENDING RELEASE) * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index e17e88dbb..7e3268964 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2028,4 +2028,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_17beta05 Your_png_h_is_not_version_1_6_17beta05; +typedef png_libpng_version_1_6_17beta06 Your_png_h_is_not_version_1_6_17beta06; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 726fba6cd..e97617965 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.17beta05 - February 23, 2015 +libpng version 1.6.17beta06 - February 25, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index e4a6b2d27..79cacdba3 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@