diff --git a/ANNOUNCE b/ANNOUNCE index 4fa20599a..2623081be 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta58 - March 23, 2015 +Libpng 1.7.0beta59 - March 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. @@ -9,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.7.0beta58.tar.xz (LZMA-compressed, recommended) - 1.7.0beta58.tar.gz + 1.7.0beta59.tar.xz (LZMA-compressed, recommended) + 1.7.0beta59.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp170b58.7z (LZMA-compressed, recommended) - lp170b58.zip + lp170b59.7z (LZMA-compressed, recommended) + lp170b59.zip Other information: - 1.7.0beta58-README.txt - 1.7.0beta58-LICENSE.txt - libpng-1.7.0beta58-*.asc (armored detached GPG signatures) + 1.7.0beta59-README.txt + 1.7.0beta59-LICENSE.txt + libpng-1.7.0beta59-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.0): @@ -757,11 +757,11 @@ Version 1.7.0beta57 [March 16, 2015] in libpng-1.6.17beta01 (John Bowler). Revert change to png_default_read_data() made in libpng-1.7.0beta55. -Version 1.7.0beta58 [March 23, 2015] +Version 1.7.0beta58 [March 25, 2015] Implemented affirm() support and usage. Remove pnglibconf.dfn and pnglibconf.pre with "make clean". Added byte, short and other overflow checking - Added 'assert' based overflow checking for debug builds for char + Added 'affirm' based overflow checking for debug builds for char and short assignments. Simply ignore the error in release builds (a truncated value will be used without warning). Controlled by PNG_RANGE_CHECK_SUPPORTED. diff --git a/CHANGES b/CHANGES index bfb94fa5a..fb7a0dcdd 100644 --- a/CHANGES +++ b/CHANGES @@ -5047,11 +5047,11 @@ Version 1.7.0beta57 [March 16, 2015] in libpng-1.6.17beta01 (John Bowler). Revert change to png_default_read_data() made in libpng-1.7.0beta55. -Version 1.7.0beta58 [March 23, 2015] +Version 1.7.0beta58 [March 25, 2015] Implemented affirm() support and usage. Remove pnglibconf.dfn and pnglibconf.pre with "make clean". Added byte, short and other overflow checking - Added 'assert' based overflow checking for debug builds for char + Added 'affirm' based overflow checking for debug builds for char and short assignments. Simply ignore the error in release builds (a truncated value will be used without warning). Controlled by PNG_RANGE_CHECK_SUPPORTED. @@ -5069,6 +5069,8 @@ Version 1.7.0beta58 [March 23, 2015] condition on RELEASE (or not) builds and tidy up the #ifdef handling of functions. +Version 1.7.0beta59 [March 25, 2015] + 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 d797376a2..bd5b6a227 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -261,7 +261,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 17.${PNGLIB_RELEASE}.1.7.0beta58 +# VERSION 17.${PNGLIB_RELEASE}.1.7.0beta59 VERSION 17.${PNGLIB_RELEASE}.0 SOVERSION 17 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 064daaab5..1073908f9 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.7.0beta58, March 23, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta59, March 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 -March 23, 2015 +March 25, 2015 diff --git a/README b/README index 05935efc0..d008f9ae6 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta58 - March 23, 2015 (shared library 17.0) +README for libpng version 1.7.0beta59 - March 25, 2015 (shared library 17.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 6c2de8c32..02eaa163a 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.7.0beta58],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.7.0beta59],[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.7.0beta58 +PNGLIB_VERSION=1.7.0beta59 PNGLIB_MAJOR=1 PNGLIB_MINOR=7 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index 52252079c..99dedd432 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.7.0beta58 - March 23, 2015 + libpng version 1.7.0beta59 - March 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.7.0beta58 - March 23, 2015 + libpng versions 0.97, January 1998, through 1.7.0beta59 - March 25, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5341,13 +5341,13 @@ Other rules can be inferred by inspecting the libpng source. XVII. Y2K Compliance in libpng -March 23, 2015 +March 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.7.0beta58 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta59 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 3308b7308..dc39ffeb5 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "March 23, 2015" +.TH LIBPNG 3 "March 25, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta58 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta59 .SH SYNOPSIS \fB #include \fP @@ -494,7 +494,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.7.0beta58 - March 23, 2015 + libpng version 1.7.0beta59 - March 25, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -505,7 +505,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta58 - March 23, 2015 + libpng versions 0.97, January 1998, through 1.7.0beta59 - March 25, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5835,13 +5835,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVII. Y2K Compliance in libpng -March 23, 2015 +March 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.7.0beta58 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta59 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 @@ -6095,7 +6095,7 @@ the first widely used release: 1.6.17beta01-06 16 10617 16.so.16.17[.0] 1.6.17rc01 16 10617 16.so.16.17[.0] 1.7.0alpha01-10 17 10700 17.so.17.0[.0] - 1.7.0beta01-58 17 10700 17.so.17.0[.0] + 1.7.0beta01-59 17 10700 17.so.17.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6152,7 +6152,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta58 - March 23, 2015: +Libpng version 1.7.0beta59 - March 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). @@ -6175,7 +6175,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.7.0beta58, March 23, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta59, March 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 @@ -6274,7 +6274,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 23, 2015 +March 25, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 39fda2922..1f5adea8e 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 23, 2015" +.TH LIBPNGPF 3 "March 25, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta58 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta59 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index f4e2b5044..d5ad47594 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "March 23, 2015" +.TH PNG 5 "March 25, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index c0d64dab3..3cb119b2b 100644 --- a/png.c +++ b/png.c @@ -15,7 +15,7 @@ #define PNG_SRC_FILE PNG_SRC_FILE_png /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_7_0beta58 Your_png_h_is_not_version_1_7_0beta58; +typedef png_libpng_version_1_7_0beta59 Your_png_h_is_not_version_1_7_0beta59; /* 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 @@ -689,13 +689,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta58 - March 23, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta59 - March 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.7.0beta58 - March 23, 2015\ + return "libpng version 1.7.0beta59 - March 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 1a22ffed1..39acb57e9 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta58, March 23, 2015 + * libpng version 1.7.0beta59, March 25, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,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.7.0beta58, March 23, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.7.0beta59, March 25, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -216,7 +216,7 @@ * 1.6.17beta01-06 16 10617 16.so.16.17[.0] * 1.6.17rc01 16 10617 16.so.16.17[.0] * 1.7.0alpha01-10 17 10700 17.so.17.0[.0] - * 1.7.0beta01-58 17 10700 17.so.17.0[.0] + * 1.7.0beta01-59 17 10700 17.so.17.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -248,7 +248,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta58, March 23, 2015, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta59, March 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: @@ -360,13 +360,13 @@ * Y2K compliance in libpng: * ========================= * - * March 23, 2015 + * March 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.7.0beta58 are Y2K compliant. It is my belief that + * upward through 1.7.0beta59 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 @@ -428,9 +428,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.7.0beta58" +#define PNG_LIBPNG_VER_STRING "1.7.0beta59" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta58 - March 23, 2015\n" + " libpng version 1.7.0beta59 - March 25, 2015\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 @@ -444,7 +444,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 58 +#define PNG_LIBPNG_VER_BUILD 59 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -697,7 +697,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_7_0beta58; +typedef char* png_libpng_version_1_7_0beta59; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index c33ec65cc..c3e1989a9 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta58, March 23, 2015 + * libpng version 1.7.0beta59, March 25, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index 2e70a87a5..97fd50e06 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -348,7 +348,7 @@ # define PNG_RELEASE_BUILD (PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC) #endif -/* General purpose macros avoid the need to out #if PNG_RELEASE_BUILD +/* General purpose macros avoid the need to put #if PNG_RELEASE_BUILD * macro blocks around function declarations and definitions when the * parameter number varies. Using these results in slightly cleaner code. */ diff --git a/pngtest.c b/pngtest.c index 194639017..c3e8110d9 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_7_0beta58 Your_png_h_is_not_version_1_7_0beta58; +typedef png_libpng_version_1_7_0beta59 Your_png_h_is_not_version_1_7_0beta59; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 9e1a9bb90..277a929e3 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta58 - March 23, 2015 +libpng version 1.7.0beta59 - March 25, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 1619b91e8..701834578 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@