From f4302a73ac35e1b7dedfb5762052b5e91ffe0c3e Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 25 Sep 2015 20:22:31 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.19beta03.tar --- ANNOUNCE | 4 ++-- CHANGES | 2 +- LICENSE | 4 ++-- README | 2 +- libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index d2cd717fc..c67292abc 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.19beta03 - September 25, 2015 +Libpng 1.6.19beta03 - September 26, 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. @@ -64,7 +64,7 @@ Version 1.6.19beta02 [August 19, 2015] in ANSI-C (unlike 0x80000000 in the signed case) the checking that occurs later can catch them (John Bowler). -Version 1.6.19beta03 [September 25, 2015] +Version 1.6.19beta03 [September 26, 2015] Fixed png_save_int_32 when int is not 2's complement (John Bowler). Updated libpng16 with all the recent test changes from libpng17, including changes to pngvalid.c to ensure that the original, diff --git a/CHANGES b/CHANGES index 6aab0d49a..90b4f8b14 100644 --- a/CHANGES +++ b/CHANGES @@ -5347,7 +5347,7 @@ Version 1.6.19beta02 [August 19, 2015] in ANSI-C (unlike 0x80000000 in the signed case) the checking that occurs later can catch them (John Bowler). -Version 1.6.19beta03 [September 25, 2015] +Version 1.6.19beta03 [September 26, 2015] Fixed png_save_int_32 when int is not 2's complement (John Bowler). Updated libpng16 with all the recent test changes from libpng17, including changes to pngvalid.c to ensure that the original, diff --git a/LICENSE b/LICENSE index 7d4300c88..137f4421e 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.19beta03, August 19, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.19beta03, September 26, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: @@ -104,4 +104,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 19, 2015 +September 26, 2015 diff --git a/README b/README index c3938dc0c..0001831fb 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.19beta03 - August 19, 2015 (shared library 16.0) +README for libpng version 1.6.19beta03 - September 26, 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 523eab730..3b3f185d4 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.19beta03 - September 25, 2015 + libpng version 1.6.19beta03 - September 26, 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.19beta03 - September 25, 2015 + libpng versions 0.97, January 1998, through 1.6.19beta03 - September 26, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5314,7 +5314,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -September 25, 2015 +September 26, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng.3 b/libpng.3 index a0cffd892..86343fb77 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "September 25, 2015" +.TH LIBPNG 3 "September 26, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.19beta03 .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.19beta03 - September 25, 2015 + libpng version 1.6.19beta03 - September 26, 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.19beta03 - September 25, 2015 + libpng versions 0.97, January 1998, through 1.6.19beta03 - September 26, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5822,7 +5822,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -September 25, 2015 +September 26, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6143,7 +6143,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.19beta03 - September 25, 2015: +Libpng version 1.6.19beta03 - September 26, 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). @@ -6166,7 +6166,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.6.19beta03, September 25, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.19beta03, September 26, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: @@ -6260,7 +6260,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -September 25, 2015 +September 26, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 18d498f74..048b478e1 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "August 19, 2015" +.TH LIBPNGPF 3 "September 26, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.19beta03 (private functions) diff --git a/png.5 b/png.5 index 9f4307ba5..cd628824a 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "August 19, 2015" +.TH PNG 5 "September 26, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 159062155..af69f6c14 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.19beta03 - August 21, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.6.19beta03 - September 26, 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.19beta03 - August 21, 2015\ + return "libpng version 1.6.19beta03 - September 26, 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 b7a284124..e854927c4 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.19beta03, September 25, 2015 + * libpng version 1.6.19beta03, September 26, 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.19beta03, September 25, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.6.19beta03, September 26, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -251,7 +251,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.6.19beta03, September 25, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.6.19beta03, September 26, 2015, are * Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.0.6 * with the following individuals added to the list of Contributing Authors: @@ -360,7 +360,7 @@ * Y2K compliance in libpng: * ========================= * - * September 25, 2015 + * September 26, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -430,7 +430,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.19beta03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.19beta03 - September 25, 2015\n" + " libpng version 1.6.19beta03 - September 26, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngtest.c b/pngtest.c index 8f0c2ea92..390f56b7f 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1057,7 +1057,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) #ifndef PNG_READ_INTERLACING_SUPPORTED /* num_pass will not be set below, set it here if the image is * interlaced: what happens is that write interlacing is *not* turned - * on an the partial interlaced rows are written directly. + * on and the partial interlaced rows are written directly. */ switch (interlace_type) { diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 8408b01ba..713bc8cef 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.19beta03 - August 19, 2015 +libpng version 1.6.19beta03 - September 26, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 3699eabc4..bf08a3916 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@