From d2fcc41eec2e9318bbca3ed4d8365f6019e7120f Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 17 Jul 2017 06:08:01 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.31beta06.tar --- ANNOUNCE | 4 ++-- CHANGES | 2 +- LICENSE | 2 +- README | 2 +- libpng-manual.txt | 4 ++-- libpng.3 | 12 ++++++------ png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- pngstruct.h | 2 +- projects/vstudio/README.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index d01b8c95b..3ef8cca4e 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.31beta06 - July 16, 2017 +Libpng 1.6.31beta06 - July 17, 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. @@ -61,7 +61,7 @@ Version 1.6.31beta04 [July 11, 2017] Version 1.6.31beta05 [July 13, 2017] Added eXIf chunk support. -Version 1.6.31beta06 [July 16, 2017] +Version 1.6.31beta06 [July 17, 2017] Added a minimal eXIf chunk (with Orientation and FocalLengthIn35mmFilm tags) to pngtest.png. diff --git a/CHANGES b/CHANGES index 016363ca2..4be45cfb1 100644 --- a/CHANGES +++ b/CHANGES @@ -5891,7 +5891,7 @@ Version 1.6.31beta04 [July 11, 2017] Version 1.6.31beta05 [July 13, 2017] Added eXIf chunk support. -Version 1.6.31beta06 [July 16, 2017] +Version 1.6.31beta06 [July 17, 2017] Added a minimal eXIf chunk (with Orientation and FocalLengthIn35mmFilm tags) to pngtest.png. diff --git a/LICENSE b/LICENSE index 58d141472..5e5f269c8 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.31beta06, July 13, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.31beta06, July 17, 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 ce4580e04..24eb96189 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.31beta06 - July 13, 2017 (shared library 16.0) +README for libpng version 1.6.31beta06 - July 17, 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 16bea5631..42e1253ac 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.31beta06 - July 13, 2017 + libpng version 1.6.31beta06 - July 17, 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.31beta06 - July 13, 2017 + libpng versions 0.97, January 1998, through 1.6.31beta06 - July 17, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson diff --git a/libpng.3 b/libpng.3 index fc1d05ff5..f343085f8 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "July 13, 2017" +.TH LIBPNG 3 "July 17, 2017" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.31beta06 .SH SYNOPSIS @@ -514,7 +514,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.31beta06 - July 13, 2017 + libpng version 1.6.31beta06 - July 17, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -525,7 +525,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.31beta06 - July 13, 2017 + libpng versions 0.97, January 1998, through 1.6.31beta06 - July 17, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -6076,7 +6076,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.31beta06 - July 13, 2017: +Libpng version 1.6.31beta06 - July 17, 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). @@ -6101,7 +6101,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.31beta06, July 13, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.31beta06, July 17, 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 @@ -6229,7 +6229,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 13, 2017 +July 17, 2017 .\" end of man page diff --git a/png.c b/png.c index f4c02ba0f..f42f92a03 100644 --- a/png.c +++ b/png.c @@ -806,14 +806,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.31beta06 - July 13, 2017" PNG_STRING_NEWLINE \ + "libpng version 1.6.31beta06 - July 17, 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.31beta06 - July 13, 2017\ + return "libpng version 1.6.31beta06 - July 17, 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 04a2972c4..18085a8cb 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.31beta06, July 13, 2017 + * libpng version 1.6.31beta06, July 17, 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.31beta06, July 13, 2017: + * libpng versions 0.97, January 1998, through 1.6.31beta06, July 17, 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.31beta06, July 13, 2017 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.31beta06, July 17, 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 13, 2017 + * July 17, 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.31beta06" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.31beta06 - July 13, 2017\n" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.31beta06 - July 17, 2017\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 643f9317d..0dd7101a4 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.31beta06, July 13, 2017 + * libpng version 1.6.31beta06, July 17, 2017 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngstruct.h b/pngstruct.h index 1e1c5f8f3..44b79dea7 100644 --- a/pngstruct.h +++ b/pngstruct.h @@ -480,7 +480,7 @@ struct png_struct_def #endif #endif -/* New member added in libpng-1.6.30 */ +/* New member added in libpng-1.6.31 */ int num_exif; }; #endif /* PNGSTRUCT_H */ diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 6c8908b42..8a52a64ca 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.31beta06 - July 13, 2017 +libpng version 1.6.31beta06 - July 17, 2017 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 6bd0e4361..8d5aa2227 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@