From f78a3e732637d7c15227eaaac5d9072e37cda42f Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 11 Jul 2017 12:27:09 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.31beta04.tar --- ANNOUNCE | 51 +++++++++-------------------------- CHANGES | 2 +- LICENSE | 2 +- README | 2 +- libpng-manual.txt | 4 +-- libpng.3 | 12 ++++----- png.c | 4 +-- png.h | 10 +++---- pngconf.h | 2 +- projects/vstudio/README.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 13 files changed, 36 insertions(+), 61 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 7aef469be..6af8e7b31 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.31beta04 - July 9, 2017 +Libpng 1.6.31beta04 - July 11, 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. @@ -23,42 +23,7 @@ Other information: 1.6.31beta04-LICENSE.txt libpng-1.6.31beta04-*.asc (armored detached GPG signatures) -Changes since the last public release (1.6.29): - -Version 1.6.30beta01 [April 1, 2017] - Added missing "$(CPPFLAGS)" to the compile line for c.pic.o in - makefile.linux and makefile.solaris-x86 (Cosmin). - Revised documentation of png_get_error_ptr() in the libpng manual. - Silence clang -Wcomma and const drop warnings (Viktor Szakats). - Update Sourceforge URLs in documentation (https instead of http). - -Version 1.6.30beta02 [April 22, 2017] - Document need to check for integer overflow when allocating a pixel - buffer for multiple rows in contrib/gregbook, contrib/pngminus, - example.c, and in the manual (suggested by Jaeseung Choi). This - is similar to the bug reported against pngquant in CVE-2016-5735. - Removed reference to the obsolete PNG_SAFE_LIMITS macro in the documentation. - -Version 1.6.30beta03 [May 22, 2017] - Check for integer overflow in contrib/visupng and contrib/tools/genpng. - Do not double evaluate CMAKE_SYSTEM_PROCESSOR in CMakeLists.txt. - Test CMAKE_HOST_WIN32 instead of WIN32 in CMakeLists.txt. - Fix some URL in documentation. - -Version 1.6.30beta04 [June 7, 2017] - Avoid writing an empty IDAT when the last IDAT exactly fills the - compression buffer (bug report by Brian Baird). This bug was - introduced in libpng-1.6.0. - -Version 1.6.30rc01 [June 14, 2017] - No changes. - -Version 1.6.30rc02 [June 25, 2017] - Update copyright year in pnglibconf.h, make ltmain.sh executable. - Add a reference to the libpng.download site in README. - -Version 1.6.30 [June 28, 2017] - No changes. +Changes since the last public release (1.6.30): Version 1.6.31beta01 [July 5, 2017] Guard the definition of _POSIX_SOURCE in pngpriv.h (AIX already defines it; @@ -81,7 +46,17 @@ Version 1.6.31beta03 [July 9, 2017] Quieted "declaration after statement" warnings in intel/filter_sse2.c. Added scripts/makefile-linux-opt, which has hardware optimizations enabled. -Version 1.6.31beta04 [July 9, 2017] +Version 1.6.31beta04 [July 11, 2017] + Removed one of the GCC-7.1.0 'strict-overflow' warnings that result when + integers appear on both sides of a compare. Worked around the others by + forcing the strict-overflow setting in the relevant functions to a level + where they are not reported (John Bowler). + Changed "FALL THROUGH" comments to "FALLTHROUGH" because GCC doesn't like + the space. + Worked around some C-style casts from (void*) because g++ 5.4.0 objects + to them. + Increased the buffer size for 'sprint' to pass the gcc 7.1.0 'sprint + overflow' check that is on by default with -Wall -Wextra. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 730c3ec08..1f9d79553 100644 --- a/CHANGES +++ b/CHANGES @@ -5876,7 +5876,7 @@ Version 1.6.31beta03 [July 9, 2017] Quieted "declaration after statement" warnings in intel/filter_sse2.c. Added scripts/makefile-linux-opt, which has hardware optimizations enabled. -Version 1.6.31beta04 [July 9, 2017] +Version 1.6.31beta04 [July 11, 2017] Removed one of the GCC-7.1.0 'strict-overflow' warnings that result when integers appear on both sides of a compare. Worked around the others by forcing the strict-overflow setting in the relevant functions to a level diff --git a/LICENSE b/LICENSE index fa49884ac..8a22990ff 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.6.31beta04, July 9, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.31beta04, July 11, 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 diff --git a/README b/README index 060f5fb31..6325191cd 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.31beta04 - July 9, 2017 (shared library 16.0) +README for libpng version 1.6.31beta04 - July 11, 2017 (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/libpng-manual.txt b/libpng-manual.txt index 6b2516b59..5201c4ba6 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.31beta04 - July 9, 2017 + libpng version 1.6.31beta04 - July 11, 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.6.31beta04 - July 9, 2017 + libpng versions 0.97, January 1998, through 1.6.31beta04 - July 11, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson diff --git a/libpng.3 b/libpng.3 index 9293fbcfd..2cdf74b2b 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "July 9, 2017" +.TH LIBPNG 3 "July 11, 2017" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.31beta04 .SH SYNOPSIS @@ -510,7 +510,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.31beta04 - July 9, 2017 + libpng version 1.6.31beta04 - July 11, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -521,7 +521,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.31beta04 - July 9, 2017 + libpng versions 0.97, January 1998, through 1.6.31beta04 - July 11, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -6056,7 +6056,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.31beta04 - July 9, 2017: +Libpng version 1.6.31beta04 - July 11, 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). @@ -6081,7 +6081,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.31beta04, July 9, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.31beta04, July 11, 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 @@ -6209,7 +6209,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 9, 2017 +July 11, 2017 .\" end of man page diff --git a/png.c b/png.c index 77b4cf340..d95ef2087 100644 --- a/png.c +++ b/png.c @@ -796,14 +796,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.31beta04 - July 9, 2017" PNG_STRING_NEWLINE \ + "libpng version 1.6.31beta04 - July 11, 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.6.31beta04 - July 9, 2017\ + return "libpng version 1.6.31beta04 - July 11, 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 5d28efec1..157d0b3fe 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.31beta04, July 9, 2017 + * libpng version 1.6.31beta04, July 11, 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.6.31beta04, July 9, 2017: + * libpng versions 0.97, January 1998, through 1.6.31beta04, July 11, 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.6.31beta04, July 9, 2017 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.31beta04, July 11, 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,7 +241,7 @@ * Y2K compliance in libpng: * ========================= * - * July 9, 2017 + * July 11, 2017 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -310,7 +310,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.31beta04" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.31beta04 - July 9, 2017\n" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.31beta04 - July 11, 2017\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index b4dc0ea5b..6c508286d 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.31beta04, July 9, 2017 + * libpng version 1.6.31beta04, July 11, 2017 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 296ce53a4..5aca5de32 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.31beta04 - July 9, 2017 +libpng version 1.6.31beta04 - July 11, 2017 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 9dcf76f21..d572b357c 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@