diff --git a/ANNOUNCE b/ANNOUNCE index c958ebb18..8dfc08b33 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta73 - December 11, 2015 +Libpng 1.7.0beta74 - December 11, 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.0beta73.tar.xz (LZMA-compressed, recommended) - 1.7.0beta73.tar.gz + 1.7.0beta74.tar.xz (LZMA-compressed, recommended) + 1.7.0beta74.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - /scratch/glennrp/Libpng17/lp170b73.7z (LZMA-compressed, recommended) - /scratch/glennrp/Libpng17/lp170b73.zip + /scratch/glennrp/Libpng17/lp170b74.7z (LZMA-compressed, recommended) + /scratch/glennrp/Libpng17/lp170b74.zip Other information: - 1.7.0beta73-README.txt - 1.7.0beta73-LICENSE.txt - libpng-1.7.0beta73-*.asc (armored detached GPG signatures) + 1.7.0beta74-README.txt + 1.7.0beta74-LICENSE.txt + libpng-1.7.0beta74-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.0): @@ -1092,6 +1092,8 @@ Version 1.7.0beta73 [December 11, 2015] Changed png_struct->options from png_byte to png_uint_32, to hold up to 16 2-bit options. +Version 1.7.0beta74 [December 11, 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/CHANGES b/CHANGES index af50b39d8..e8b81e603 100644 --- a/CHANGES +++ b/CHANGES @@ -5390,6 +5390,8 @@ Version 1.7.0beta73 [December 11, 2015] Combined some redundant checks on info_ptr==NULL in png_handle_PLTE() Changed png_struct->options from png_byte to png_uint_32, to hold up to 16 2-bit options. + +Version 1.7.0beta74 [December 11, 2015] (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d5fe92c5..eb0da9d7c 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.0beta73 +# VERSION 17.${PNGLIB_RELEASE}.1.7.0beta74 VERSION 17.${PNGLIB_RELEASE}.0 SOVERSION 17 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index b596c02b8..03333d072 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.7.0beta73, December 11, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.7.0beta74, December 11, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals diff --git a/README b/README index ae7109004..2b706a6ce 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta73 - December 11, 2015 (shared library 17.0) +README for libpng version 1.7.0beta74 - December 11, 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 5c6197895..ddd8ef8fd 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.0beta73],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.7.0beta74],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -40,7 +40,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.0beta73 +PNGLIB_VERSION=1.7.0beta74 PNGLIB_MAJOR=1 PNGLIB_MINOR=7 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index e0640c52d..5f9b9366d 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.0beta73 - December 11, 2015 + libpng version 1.7.0beta74 - December 11, 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.0beta73 - December 11, 2015 + libpng versions 0.97, January 1998, through 1.7.0beta74 - December 11, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5321,7 +5321,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.0beta73 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta74 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 9bf38afe7..a0c971940 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "December 11, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta73 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta74 .SH SYNOPSIS \fB #include \fP @@ -498,7 +498,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.0beta73 - December 11, 2015 + libpng version 1.7.0beta74 - December 11, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -509,7 +509,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta73 - December 11, 2015 + libpng versions 0.97, January 1998, through 1.7.0beta74 - December 11, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5819,7 +5819,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.0beta73 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta74 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 @@ -5980,7 +5980,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta73 - December 11, 2015: +Libpng version 1.7.0beta74 - December 11, 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). @@ -6005,7 +6005,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.7.0beta73, December 11, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.7.0beta74, December 11, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals diff --git a/libpngpf.3 b/libpngpf.3 index 01251f2be..64209821a 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "December 11, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta73 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta74 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 30b81797c..a25b91a83 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_0beta73 Your_png_h_is_not_version_1_7_0beta73; +typedef png_libpng_version_1_7_0beta74 Your_png_h_is_not_version_1_7_0beta74; /* 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 @@ -712,13 +712,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta73 - December 11, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta74 - December 11, 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.0beta73 - December 11, 2015\ + return "libpng version 1.7.0beta74 - December 11, 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 aefba90b6..6ff393ec8 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta73, December 11, 2015 + * libpng version 1.7.0beta74, December 11, 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.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.7.0beta73, December 11, 2015: + * libpng versions 0.97, January 1998, through 1.7.0beta74, December 11, 2015: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -25,7 +25,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta73, December 11, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta74, December 11, 2015, are * Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are * derived from libpng-1.0.6, and are distributed according to the same * disclaimer and license as libpng-1.0.6 with the following individuals @@ -224,7 +224,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.7.0beta73 are Y2K compliant. It is my belief that + * upward through 1.7.0beta74 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 @@ -286,9 +286,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.7.0beta73" +#define PNG_LIBPNG_VER_STRING "1.7.0beta74" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta73 - December 11, 2015\n" + " libpng version 1.7.0beta74 - December 11, 2015\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 @@ -302,7 +302,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 73 +#define PNG_LIBPNG_VER_BUILD 74 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -562,7 +562,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_0beta73; +typedef char* png_libpng_version_1_7_0beta74; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 13ee90438..4b00104f9 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta73, December 11, 2015 + * libpng version 1.7.0beta74, December 11, 2015 * * 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 e89c60154..90d6a11da 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2070,4 +2070,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_0beta73 Your_png_h_is_not_version_1_7_0beta73; +typedef png_libpng_version_1_7_0beta74 Your_png_h_is_not_version_1_7_0beta74; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 8fe2a716b..e3163a4ed 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta73 - December 11, 2015 +libpng version 1.7.0beta74 - December 11, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 8f89de526..f5b5a4f93 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@