diff --git a/ANNOUNCE b/ANNOUNCE index 326c198b9..6c9154327 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta39 - November 1, 2014 +Libpng 1.7.0beta40 - November 1, 2014 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.0beta39.tar.xz (LZMA-compressed, recommended) - 1.7.0beta39.tar.gz + 1.7.0beta40.tar.xz (LZMA-compressed, recommended) + 1.7.0beta40.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp170b39.7z (LZMA-compressed, recommended) - lp170b39.zip + lp170b40.7z (LZMA-compressed, recommended) + lp170b40.zip Other information: - 1.7.0beta39-README.txt - 1.7.0beta39-LICENSE.txt - libpng-1.7.0beta39-*.asc (armored detached GPG signatures) + 1.7.0beta40-README.txt + 1.7.0beta40-LICENSE.txt + libpng-1.7.0beta40-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.0): @@ -620,6 +620,8 @@ Version 1.7.0beta38 [October 17, 2014] Version 1.7.0beta39 [November 1, 2014] Ported cosmetic changes from libpng-1.6.15beta02. +Version 1.7.0beta40 [November 1, 2014] + 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 f21508218..46fad796e 100644 --- a/CHANGES +++ b/CHANGES @@ -4909,6 +4909,8 @@ Version 1.7.0beta38 [October 17, 2014] Version 1.7.0beta39 [November 1, 2014] Ported cosmetic changes from libpng-1.6.15beta02. +Version 1.7.0beta40 [November 1, 2014] + 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 c760ffac1..d3d52ee80 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 17.${PNGLIB_RELEASE}.1.7.0beta39 +# VERSION 17.${PNGLIB_RELEASE}.1.7.0beta40 VERSION 17.${PNGLIB_RELEASE}.0 SOVERSION 17 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 103fe576a..adcdd1d7e 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.0beta39, November 1, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta40, November 1, 2014, 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 diff --git a/README b/README index b4703d42f..983298449 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta39 - November 1, 2014 (shared library 17.0) +README for libpng version 1.7.0beta40 - November 1, 2014 (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 271b30e6a..b8ae9a85b 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.0beta39],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.7.0beta40],[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.0beta39 +PNGLIB_VERSION=1.7.0beta40 PNGLIB_MAJOR=1 PNGLIB_MINOR=7 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index d1b5b4bb8..208082aaf 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.0beta39 - November 1, 2014 + libpng version 1.7.0beta40 - November 1, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.0beta39 - November 1, 2014 + libpng versions 0.97, January 1998, through 1.7.0beta40 - November 1, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5315,7 +5315,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.7.0beta39 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta40 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 1add9c74b..65614ff41 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "November 1, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta39 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta40 .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.0beta39 - November 1, 2014 + libpng version 1.7.0beta40 - November 1, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.0beta39 - November 1, 2014 + libpng versions 0.97, January 1998, through 1.7.0beta40 - November 1, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5809,7 +5809,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.7.0beta39 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta40 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 @@ -6016,7 +6016,7 @@ the first widely used release: 1.5.7 15 10507 15.so.15.7[.0] 1.6.0beta01-37 16 10600 16.so.16.0[.0] 1.7.0alpha01-10 17 10700 17.so.17.0[.0] - 1.7.0beta01-39 17 10700 17.so.17.0[.0] + 1.7.0beta01-40 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 @@ -6073,7 +6073,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta39 - November 1, 2014: +Libpng version 1.7.0beta40 - November 1, 2014: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6096,7 +6096,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.7.0beta39, November 1, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta40, November 1, 2014, 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 1efeb783b..1b765f28d 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "November 1, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta39 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta40 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 2a42e2124..e8ca5e112 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_7_0beta39 Your_png_h_is_not_version_1_7_0beta39; +typedef png_libpng_version_1_7_0beta40 Your_png_h_is_not_version_1_7_0beta40; /* 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 @@ -694,13 +694,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta39 - November 1, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta40 - November 1, 2014" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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.0beta39 - November 1, 2014\ + return "libpng version 1.7.0beta40 - November 1, 2014\ Copyright (c) 1998-2014 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 2d6d1214d..29fe71c1c 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta39 - November 1, 2014 + * libpng version 1.7.0beta40 - November 1, 2014 * 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.7.0beta39 - November 1, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.7.0beta40 - November 1, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -168,7 +168,7 @@ * 1.5.7 15 10507 15.so.15.7[.0] * 1.6.0beta01-37 16 10600 16.so.16.0[.0] * 1.7.0alpha01-10 17 10700 17.so.17.0[.0] - * 1.7.0beta01-39 17 10700 17.so.17.0[.0] + * 1.7.0beta01-40 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 @@ -200,7 +200,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta39, November 1, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta40, November 1, 2014, 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: @@ -318,7 +318,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.7.0beta39 are Y2K compliant. It is my belief that + * upward through 1.7.0beta40 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 @@ -380,9 +380,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.7.0beta39" +#define PNG_LIBPNG_VER_STRING "1.7.0beta40" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta39 - November 1, 2014\n" + " libpng version 1.7.0beta40 - November 1, 2014\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 @@ -396,7 +396,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 39 +#define PNG_LIBPNG_VER_BUILD 40 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -647,7 +647,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_0beta39; +typedef char* png_libpng_version_1_7_0beta40; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index c65e4afc9..e44bd1a58 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta39 - November 1, 2014 + * libpng version 1.7.0beta40 - November 1, 2014 * * 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 166e353f8..2bb38d137 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2008,4 +2008,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_0beta39 Your_png_h_is_not_version_1_7_0beta39; +typedef png_libpng_version_1_7_0beta40 Your_png_h_is_not_version_1_7_0beta40; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 48db1d289..3605f0997 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta39 - November 1, 2014 +libpng version 1.7.0beta40 - November 1, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index fe6cf9b6b..ed6eef101 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@