From 6f9a39848e3140a6c41984e4acc23643f0f2022c Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 26 Sep 2016 07:58:33 -0500 Subject: [PATCH] [libpng17] Imported from libpng-1.7.0beta84.tar --- LICENSE | 4 ++-- Makefile.am | 4 ++-- README | 2 +- TODO | 4 +++- 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, 30 insertions(+), 28 deletions(-) diff --git a/LICENSE b/LICENSE index 2dab069f3..3bb4817f3 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.7.0beta84, August 8, 2016, are +libpng versions 1.0.7, July 1, 2000, through 1.7.0beta84, September 26, 2016, are Copyright (c) 2000-2002, 2004, 2006-2016 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 -August 8, 2016 +September 26, 2016 diff --git a/Makefile.am b/Makefile.am index 890f2ffdd..d443c99f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,13 +7,13 @@ PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ ACLOCAL_AMFLAGS = -I scripts # test programs - run on make check, make distcheck -check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage +check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage pngcp if HAVE_CLOCK_GETTIME check_PROGRAMS += timepng endif # Utilities - installed -bin_PROGRAMS= pngcp pngfix png-fix-itxt +bin_PROGRAMS= pngfix png-fix-itxt # This ensures that pnglibconf.h gets built at the start of 'make all' or # 'make check', but it does not add dependencies to the individual programs, diff --git a/README b/README index f449180c8..69d9145f3 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta84 - August 8, 2016 (shared library 17.0) +README for libpng version 1.7.0beta84 - September 26, 2016 (shared library 17.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/TODO b/TODO index 7f63cd8f5..b6ea77d61 100644 --- a/TODO +++ b/TODO @@ -5,7 +5,9 @@ Final bug fixes. Better C++ wrapper/full C++ implementation? Fix problem with C++ and EXTERN "C". cHRM transformation. -Remove setjmp/longjmp usage in favor of returning error codes. +Remove setjmp/longjmp usage in favor of returning error codes. As a start on + this, minimize the use of png_error(), replacing them with + png_warning(); return(0; or similar. Palette creation. Add "grayscale->palette" transformation and "palette->grayscale" detection. Improved dithering. diff --git a/libpng-manual.txt b/libpng-manual.txt index fa85ae7a0..ff504e6a4 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.7.0beta84 - August 8, 2016 + libpng version 1.7.0beta84 - September 26, 2016 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.7.0beta84 - August 8, 2016 + libpng versions 0.97, January 1998, through 1.7.0beta84 - September 26, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson diff --git a/libpng.3 b/libpng.3 index d0e6c7590..d86d5e321 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "August 8, 2016" +.TH LIBPNG 3 "September 26, 2016" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta84 .SH SYNOPSIS @@ -500,7 +500,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.7.0beta84 - August 8, 2016 + libpng version 1.7.0beta84 - September 26, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -511,7 +511,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta84 - August 8, 2016 + libpng versions 0.97, January 1998, through 1.7.0beta84 - September 26, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -6016,7 +6016,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta84 - August 8, 2016: +Libpng version 1.7.0beta84 - September 26, 2016: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6041,7 +6041,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.7.0beta84, August 8, 2016, are +libpng versions 1.0.7, July 1, 2000, through 1.7.0beta84, September 26, 2016, are Copyright (c) 2000-2002, 2004, 2006-2016 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 @@ -6140,7 +6140,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 8, 2016 +September 26, 2016 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index c0a7c5548..d6c38f83f 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "August 8, 2016" +.TH LIBPNGPF 3 "September 26, 2016" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta84 (private functions) diff --git a/png.5 b/png.5 index 2f72c0516..d95981c2e 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "August 8, 2016" +.TH PNG 5 "September 26, 2016" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index c6f41d539..bf574e0d0 100644 --- a/png.c +++ b/png.c @@ -704,14 +704,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta84 - August 8, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta84 - September 26, 2016" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2016 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.7.0beta84 - August 8, 2016\ + return "libpng version 1.7.0beta84 - September 26, 2016\ Copyright (c) 1998-2002,2004,2006-2016 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 089e778e6..c8dee446a 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta84, August 8, 2016 + * libpng version 1.7.0beta84, September 26, 2016 * * Copyright (c) 1998-2002,2004,2006-2016 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.7.0beta84, August 8, 2016: + * libpng versions 0.97, January 1998, through 1.7.0beta84, September 26, 2016: * 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.7.0beta84, August 8, 2016, are + * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta84, September 26, 2016, are * Copyright (c) 2000-2002, 2004, 2006-2016 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 @@ -217,7 +217,7 @@ * Y2K compliance in libpng: * ========================= * - * August 8, 2016 + * September 26, 2016 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -286,7 +286,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.7.0beta84" -#define PNG_HEADER_VERSION_STRING " libpng version 1.7.0beta84 - August 8, 2016\n" +#define PNG_HEADER_VERSION_STRING " libpng version 1.7.0beta84 - September 26, 2016\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 diff --git a/pngconf.h b/pngconf.h index 0d715eb7f..03b601b9b 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta84, August 8, 2016 + * libpng version 1.7.0beta84, September 26, 2016 * * 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 4431a874d..ac90424c4 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta84 - August 8, 2016 +libpng version 1.7.0beta84 - September 26, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 34a910b99..eb9dd285e 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@