From 26942c818e05ae2c514483dd8e9fd964ba0f5a0b Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 19 Nov 2015 21:50:00 -0600 Subject: [PATCH] [libpng16] Imported from libpng-1.6.20beta01.tar --- ANNOUNCE | 2 +- CHANGES | 4 ++-- LICENSE | 4 ++-- README | 2 +- libpng-manual.txt | 4 ++-- libpng.3 | 12 ++++++------ libpngpf.3 | 2 +- png.5 | 2 +- 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 +- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 36539f2af..f4e2475d9 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.20beta01 - November 17, 2015 +Libpng 1.6.20beta01 - November 20, 2015 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. diff --git a/CHANGES b/CHANGES index 8332dda49..4bf131097 100644 --- a/CHANGES +++ b/CHANGES @@ -5415,8 +5415,8 @@ Version 1.6.19 [November 12, 2015] Cleaned up coding style in png_handle_PLTE(). Version 1.6.20beta01 [(PENDING RELEASE)] - Avoid potential pointer overflow/underflow in png_handle_sPLT() - and png_handle_pCAL() (Bug report by John Regehr). + Avoid potential pointer overflow/underflow in png_handle_sPLT() and + png_handle_pCAL() (Bug report by John Regehr). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/LICENSE b/LICENSE index 9bf1cb797..e07024008 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.20beta01, November 13, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.20beta01, November 20, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 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 @@ -109,4 +109,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 13, 2015 +November 20, 2015 diff --git a/README b/README index ae7e5682b..58e649563 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.20beta01 - November 13, 2015 (shared library 16.0) +README for libpng version 1.6.20beta01 - November 20, 2015 (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 8728a9c96..e222d9027 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.20beta01 - November 13, 2015 + libpng version 1.6.20beta01 - November 20, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 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.20beta01 - November 13, 2015 + libpng versions 0.97, January 1998, through 1.6.20beta01 - November 20, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson diff --git a/libpng.3 b/libpng.3 index 520f9cc96..f0df0d39e 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "November 13, 2015" +.TH LIBPNG 3 "November 20, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.20beta01 .SH SYNOPSIS @@ -508,7 +508,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.20beta01 - November 13, 2015 + libpng version 1.6.20beta01 - November 20, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -519,7 +519,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.20beta01 - November 13, 2015 + libpng versions 0.97, January 1998, through 1.6.20beta01 - November 20, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5989,7 +5989,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.20beta01 - November 13, 2015: +Libpng version 1.6.20beta01 - November 20, 2015: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6014,7 +6014,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.6.20beta01, November 13, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.20beta01, November 20, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 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 @@ -6113,7 +6113,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 13, 2015 +November 20, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 4a38c6946..45ba84686 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "November 13, 2015" +.TH LIBPNGPF 3 "November 20, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.20beta01 (private functions) diff --git a/png.5 b/png.5 index bdb2c7338..9ad6aa818 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 13, 2015" +.TH PNG 5 "November 20, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 78d4bed75..4d5a4596e 100644 --- a/png.c +++ b/png.c @@ -775,13 +775,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.20beta01 - November 13, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.6.20beta01 - November 20, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 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.20beta01 - November 13, 2015\ + return "libpng version 1.6.20beta01 - November 20, 2015\ Copyright (c) 1998-2015 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 68a507d19..f7ce38abe 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.20beta01, November 13, 2015 + * libpng version 1.6.20beta01, November 20, 2015 * * Copyright (c) 1998-2015 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.20beta01, November 13, 2015: + * libpng versions 0.97, January 1998, through 1.6.20beta01, November 20, 2015: * 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.20beta01, November 13, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.6.20beta01, November 20, 2015, are * Copyright (c) 2000-2002, 2004, 2006-2015 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 @@ -214,7 +214,7 @@ * Y2K compliance in libpng: * ========================= * - * November 13, 2015 + * November 20, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -284,7 +284,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.20beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.20beta01 - November 13, 2015\n" + " libpng version 1.6.20beta01 - November 20, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index ea1f3ddad..c39683250 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.20beta01, November 13, 2015 + * libpng version 1.6.20beta01, November 20, 2015 * * Copyright (c) 1998-2015 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 d11346650..83ae142f3 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.20beta01 - November 13, 2015 +libpng version 1.6.20beta01 - November 20, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 270cceac6..df1455ede 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@