From c2c8b398a92206b23b7d4c5d64cf5e26bfc73d53 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 2 Sep 2017 19:34:09 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.33beta02.tar --- LICENSE | 4 ++-- README | 2 +- contrib/oss-fuzz/libpng_read_fuzzer.cc | 2 +- libpng-manual.txt | 4 ++-- libpng.3 | 12 ++++++------ png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- pngrutil.c | 2 +- projects/vstudio/README.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/LICENSE b/LICENSE index e63054fc3..7765ac641 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.33beta02, August 30, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.33beta02, September 3, 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 @@ -130,4 +130,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 1, 2017 +September 3, 2017 diff --git a/README b/README index 5e0a9d483..cdfef1df2 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.33beta02 - August 30, 2017 (shared library 16.0) +README for libpng version 1.6.33beta02 - September 3, 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/contrib/oss-fuzz/libpng_read_fuzzer.cc b/contrib/oss-fuzz/libpng_read_fuzzer.cc index a27eb15fd..dd23563a5 100644 --- a/contrib/oss-fuzz/libpng_read_fuzzer.cc +++ b/contrib/oss-fuzz/libpng_read_fuzzer.cc @@ -5,7 +5,7 @@ // Use of this source code is governed by a BSD-style license that may // be found in the LICENSE file https://cs.chromium.org/chromium/src/LICENSE -// Last changed in libpng 1.6.33beta02 [September 2, 2017] +// Last changed in libpng 1.6.33beta02 [September 3, 2017] // The modifications in 2017 by Glenn Randers-Pehrson include // 1. addition of a PNG_CLEANUP macro, diff --git a/libpng-manual.txt b/libpng-manual.txt index dd4c3d5e1..356d4499b 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.33beta02 - August 30, 2017 + libpng version 1.6.33beta02 - September 3, 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.33beta02 - August 30, 2017 + libpng versions 0.97, January 1998, through 1.6.33beta02 - September 3, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson diff --git a/libpng.3 b/libpng.3 index b1fd29533..03d07436f 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "August 30, 2017" +.TH LIBPNG 3 "September 3, 2017" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.33beta02 .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.33beta02 - August 30, 2017 + libpng version 1.6.33beta02 - September 3, 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.33beta02 - August 30, 2017 + libpng versions 0.97, January 1998, through 1.6.33beta02 - September 3, 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.33beta02 - August 30, 2017: +Libpng version 1.6.33beta02 - September 3, 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.33beta02, August 30, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.33beta02, September 3, 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 30, 2017 +September 3, 2017 .\" end of man page diff --git a/png.c b/png.c index 2aa141503..82fa2b670 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.33beta02 - August 30, 2017" PNG_STRING_NEWLINE \ + "libpng version 1.6.33beta02 - September 3, 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.33beta02 - August 30, 2017\ + return "libpng version 1.6.33beta02 - September 3, 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 0e103712a..dfba65e7e 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.33beta02, August 30, 2017 + * libpng version 1.6.33beta02, September 3, 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.33beta02, August 30, 2017: + * libpng versions 0.97, January 1998, through 1.6.33beta02, September 3, 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.33beta02, August 30, 2017 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.33beta02, September 3, 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 30, 2017 + * September 3, 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.33beta02" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.33beta02 - August 30, 2017\n" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.33beta02 - September 3, 2017\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index da7c17f35..232d102e1 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.33beta02, August 30, 2017 + * libpng version 1.6.33beta02, September 3, 2017 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index ccf5405e1..9dc8825f1 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.6.32 [August 24, 2017] + * Last changed in libpng 1.6.33 [(PENDING RELEASE)] * Copyright (c) 1998-2002,2004,2006-2017 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.) diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 88cfd78d6..cdde44d60 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.33beta02 - August 30, 2017 +libpng version 1.6.33beta02 - September 3, 2017 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 5b83436bb..294f7fbe7 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@