From 3d7f3e57b5e98c3a71f4d3e9f36a983c64f8164d Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 4 Aug 2017 19:58:05 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.32beta10.tar --- ANNOUNCE | 4 ++-- CHANGES | 2 +- LICENSE | 2 +- Makefile.am | 1 + 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 +- tests/pngtest | 3 --- 15 files changed, 26 insertions(+), 28 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 8eda541cf..c46f03a62 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.32beta10 - August 4, 2017 +Libpng 1.6.32beta10 - August 5, 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. @@ -69,7 +69,7 @@ Version 1.6.32beta09 [August 3, 2017] no longer using deprecated cmake LOCATION feature (Clifford Yapp). Fixed five-byte error in the calculation of IDAT maximum possible size. -Version 1.6.32beta10 [August 4, 2017] +Version 1.6.32beta10 [August 5, 2017] Moved chunk-length check into a png_check_chunk_length() private function (Suggested by Max Stepin). Moved bad pngs from tests to contrib/libtests/crashers diff --git a/CHANGES b/CHANGES index f4c4aea9d..ac9f5524e 100644 --- a/CHANGES +++ b/CHANGES @@ -5952,7 +5952,7 @@ Version 1.6.32beta09 [August 3, 2017] no longer using deprecated cmake LOCATION feature (Clifford Yapp). Fixed five-byte error in the calculation of IDAT maximum possible size. -Version 1.6.32beta10 [August 4, 2017] +Version 1.6.32beta10 [August 5, 2017] Moved chunk-length check into a png_check_chunk_length() private function (Suggested by Max Stepin). Moved bad pngs from tests to contrib/libtests/crashers diff --git a/LICENSE b/LICENSE index 2d9ba5967..fa34b7d5d 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.32beta10, August 3, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.32beta10, August 5, 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/Makefile.am b/Makefile.am index 18ac74866..08db3e599 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,6 +60,7 @@ pngcp_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la # set of parameters: TESTS =\ tests/pngtest\ + tests/pngtest-badpngs\ tests/pngvalid-gamma-16-to-8 tests/pngvalid-gamma-alpha-mode\ tests/pngvalid-gamma-background tests/pngvalid-gamma-expand16-alpha-mode\ tests/pngvalid-gamma-expand16-background\ diff --git a/README b/README index 22bbaa85b..43ea2a0a4 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.32beta10 - August 3, 2017 (shared library 16.0) +README for libpng version 1.6.32beta10 - August 5, 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 e9bc2a763..bd7abf0b9 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.32beta10 - August 4, 2017 + libpng version 1.6.32beta10 - August 5, 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.32beta10 - August 4, 2017 + libpng versions 0.97, January 1998, through 1.6.32beta10 - August 5, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson diff --git a/libpng.3 b/libpng.3 index 2ac85ab7c..7bf413102 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "August 4, 2017" +.TH LIBPNG 3 "August 5, 2017" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta10 .SH SYNOPSIS @@ -518,7 +518,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.32beta10 - August 4, 2017 + libpng version 1.6.32beta10 - August 5, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -529,7 +529,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.32beta10 - August 4, 2017 + libpng versions 0.97, January 1998, through 1.6.32beta10 - August 5, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -6081,7 +6081,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.32beta10 - August 4, 2017: +Libpng version 1.6.32beta10 - August 5, 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). @@ -6106,7 +6106,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.32beta10, August 4, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.32beta10, August 5, 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 @@ -6234,7 +6234,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 4, 2017 +August 5, 2017 .\" end of man page diff --git a/png.c b/png.c index aa2efc913..b5607605d 100644 --- a/png.c +++ b/png.c @@ -816,14 +816,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.32beta10 - August 3, 2017" PNG_STRING_NEWLINE \ + "libpng version 1.6.32beta10 - August 5, 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.32beta10 - August 3, 2017\ + return "libpng version 1.6.32beta10 - August 5, 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 13e34153d..6056e6ce6 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.32beta10, August 4, 2017 + * libpng version 1.6.32beta10, August 5, 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.32beta10, August 4, 2017: + * libpng versions 0.97, January 1998, through 1.6.32beta10, August 5, 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.32beta10, August 4, 2017 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.32beta10, August 5, 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: * ========================= * - * August 4, 2017 + * August 5, 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.32beta10" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.32beta10 - August 4, 2017\n" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.32beta10 - August 5, 2017\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 9958b034d..4781b1e9c 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.32beta10, August 3, 2017 + * libpng version 1.6.32beta10, August 5, 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 609e1f31b..d03ce3017 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.32beta10 - August 3, 2017 +libpng version 1.6.32beta10 - August 5, 2017 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 81abd8bb0..44e5c8cba 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@