diff --git a/ANNOUNCE b/ANNOUNCE index ea3efb65f..59f7e25bf 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta88 - August 18, 2017 +Libpng 1.7.0beta89 - August 19, 2017 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.0beta88.tar.xz (LZMA-compressed, recommended) - 1.7.0beta88.tar.gz + 1.7.0beta89.tar.xz (LZMA-compressed, recommended) + 1.7.0beta89.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - /scratch/glennrp/Libpng17/lp170b88.7z (LZMA-compressed, recommended) - /scratch/glennrp/Libpng17/lp170b88.zip + /scratch/glennrp/Libpng17/lp170b89.7z (LZMA-compressed, recommended) + /scratch/glennrp/Libpng17/lp170b89.zip Other information: - 1.7.0beta88-README.txt - 1.7.0beta88-LICENSE.txt - libpng-1.7.0beta88-*.asc (armored detached GPG signatures) + 1.7.0beta89-README.txt + 1.7.0beta89-LICENSE.txt + libpng-1.7.0beta89-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.0): @@ -1431,9 +1431,11 @@ Version 1.7.0beta87 [April 1, 2017] makefile.linux and makefile.solaris-x86 (Cosmin). Merged some recent changes from libpng-1.6.30beta01. -Version 1.7.0beta88 [August 18, 2017] +Version 1.7.0beta88 [August 7. 2017] Added private png_check_chunk_name() and png_check_chunk_length() functions. + +Version 1.7.0beta89 [August 19, 2017] Check for 0 return from png_get_rowbytes() in contrib/pngminus/*.c to stop some Coverity issues (162705, 162706, and 162707). diff --git a/CHANGES b/CHANGES index d59886524..575c74d81 100644 --- a/CHANGES +++ b/CHANGES @@ -5731,10 +5731,12 @@ Version 1.7.0beta87 [April 1, 2017] makefile.linux and makefile.solaris-x86 (Cosmin). Merged some recent changes from libpng-1.6.30beta01. -Version 1.7.0beta88 [August 18, 2017] +Version 1.7.0beta88 [August 7, 2017] Initialized btoa[] in pngstest.c Added private png_check_chunk_name() and png_check_chunk_length() functions. + +Version 1.7.0beta89 [August 19, 2017] Check for 0 return from png_get_rowbytes() in contrib/pngminus/*.c to stop some Coverity issues (162705, 162706, and 162707). diff --git a/CMakeLists.txt b/CMakeLists.txt index 09f698017..151b90e7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -729,7 +729,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(png PROPERTIES -# VERSION 17.${PNGLIB_RELEASE}.1.7.0beta88 +# VERSION 17.${PNGLIB_RELEASE}.1.7.0beta89 VERSION 17.${PNGLIB_RELEASE}.0 SOVERSION 17 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 08b2e6f62..62ee15efc 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.0beta88, August 18, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.7.0beta89, August 19, 2017 are Copyright (c) 2000-2002, 2004, 2006-2017 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 @@ -127,4 +127,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 18, 2017 +August 19, 2017 diff --git a/README b/README index 954912e07..e314ec4b4 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta88 - August 18, 2017 (shared library 17.0) +README for libpng version 1.7.0beta89 - August 19, 2017 (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 b6979ddb3..dd7d2b6ea 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.7.0beta88],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.7.0beta89],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -48,7 +48,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.0beta88 +PNGLIB_VERSION=1.7.0beta89 PNGLIB_MAJOR=1 PNGLIB_MINOR=7 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index ac7f1b4cf..cb38e6502 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.0beta88 - August 18, 2017 + libpng version 1.7.0beta89 - August 19, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 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.0beta88 - August 18, 2017 + libpng versions 0.97, January 1998, through 1.7.0beta89 - August 19, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5367,7 +5367,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.0beta88 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta89 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 fc7c17067..479be0795 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "August 18, 2017" +.TH LIBPNG 3 "August 19, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta88 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta89 .SH SYNOPSIS \fB #include \fP @@ -500,7 +500,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.0beta88 - August 18, 2017 + libpng version 1.7.0beta89 - August 19, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -511,7 +511,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta88 - August 18, 2017 + libpng versions 0.97, January 1998, through 1.7.0beta89 - August 19, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5867,7 +5867,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.0beta88 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta89 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 @@ -6026,7 +6026,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta88 - August 18, 2017: +Libpng version 1.7.0beta89 - August 19, 2017: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6051,7 +6051,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.7.0beta88, August 18, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.7.0beta89, August 19, 2017 are Copyright (c) 2000-2002, 2004, 2006-2017 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 @@ -6176,7 +6176,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 18, 2017 +August 19, 2017 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 8a6305110..86c13b95e 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "August 18, 2017" +.TH LIBPNGPF 3 "August 19, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta88 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta89 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index d71158688..b48ec9a77 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "August 18, 2017" +.TH PNG 5 "August 19, 2017" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 513a20544..fb4af5d84 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_0beta88 Your_png_h_is_not_version_1_7_0beta88; +typedef png_libpng_version_1_7_0beta89 Your_png_h_is_not_version_1_7_0beta89; /* 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 @@ -705,14 +705,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta88 - August 18, 2017" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta89 - August 19, 2017" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2017 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.0beta88 - August 18, 2017\ + return "libpng version 1.7.0beta89 - August 19, 2017\ Copyright (c) 1998-2002,2004,2006-2017 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 c6e49c3dd..bf74eff38 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta88, August 18, 2017 + * libpng version 1.7.0beta89, August 19, 2017 * * Copyright (c) 1998-2002,2004,2006-2017 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.0beta88, August 18, 2017: + * libpng versions 0.97, January 1998, through 1.7.0beta89, August 19, 2017: * 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.0beta88, August 18, 2017 are + * libpng versions 1.0.7, July 1, 2000 through 1.7.0beta89, August 19, 2017 are * Copyright (c) 2000-2002, 2004, 2006-2017 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 @@ -241,13 +241,13 @@ * Y2K compliance in libpng: * ========================= * - * August 18, 2017 + * August 19, 2017 * * 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.0beta88 are Y2K compliant. It is my belief that + * upward through 1.7.0beta89 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 @@ -309,8 +309,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.7.0beta88" -#define PNG_HEADER_VERSION_STRING " libpng version 1.7.0beta88 - August 18, 2017\n" +#define PNG_LIBPNG_VER_STRING "1.7.0beta89" +#define PNG_HEADER_VERSION_STRING " libpng version 1.7.0beta89 - August 19, 2017\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 @@ -324,7 +324,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 88 +#define PNG_LIBPNG_VER_BUILD 89 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -584,7 +584,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_0beta88; +typedef char* png_libpng_version_1_7_0beta89; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index dcd07a6a5..155bfbc42 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta88, August 18, 2017 + * libpng version 1.7.0beta89, August 19, 2017 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 33f61044b..7f0486db6 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2083,4 +2083,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_0beta88 Your_png_h_is_not_version_1_7_0beta88; +typedef png_libpng_version_1_7_0beta89 Your_png_h_is_not_version_1_7_0beta89; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index c4c4920d4..dc5390704 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta88 - August 18, 2017 +libpng version 1.7.0beta89 - August 19, 2017 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index af71df10b..2791a5084 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@