From e0acad59cb4b145d94779bbcb56f05ff9e587fae Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 5 Apr 2016 12:29:04 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.22beta04.tar --- LICENSE | 4 ++-- Makefile.am | 5 ++++- README | 2 +- libpng-manual.txt | 4 ++-- libpng.3 | 16 ++++++++-------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 14 +++++++------- pngconf.h | 2 +- projects/vstudio/README.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 14 files changed, 33 insertions(+), 30 deletions(-) diff --git a/LICENSE b/LICENSE index 5f8384414..446f0539c 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.22beta04, March 9, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.22beta04, April 5, 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 @@ -127,4 +127,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 9, 2016 +April 5, 2016 diff --git a/Makefile.am b/Makefile.am index 5c517b993..51685ce8d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ 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 timepng # Utilities - installed bin_PROGRAMS= pngfix png-fix-itxt @@ -42,6 +42,9 @@ pngunknown_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la pngimage_SOURCES = contrib/libtests/pngimage.c pngimage_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la +timepng_SOURCES = contrib/libtests/timepng.c +timepng_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la + pngfix_SOURCES = contrib/tools/pngfix.c pngfix_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la diff --git a/README b/README index 77b8f4c5e..eb875d9b4 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.22beta04 - March 9, 2016 (shared library 16.0) +README for libpng version 1.6.22beta04 - April 5, 2016 (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 1bb94850e..a29972ddc 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.22beta04 - March 9, 2016 + libpng version 1.6.22beta04 - April 5, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 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.22beta04 - March 9, 2016 + libpng versions 0.97, January 1998, through 1.6.22beta04 - April 5, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson diff --git a/libpng.3 b/libpng.3 index 1a01b4724..39d7bc1a3 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "March 9, 2016" +.TH LIBPNG 3 "April 5, 2016" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22beta04 .SH SYNOPSIS @@ -510,7 +510,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.22beta04 - March 9, 2016 + libpng version 1.6.22beta04 - April 5, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -521,7 +521,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.22beta04 - March 9, 2016 + libpng versions 0.97, January 1998, through 1.6.22beta04 - April 5, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5945,9 +5945,9 @@ the first widely used release: ... 1.0.19 10 10019 10.so.0.19[.0] ... - 1.2.53 13 10253 12.so.0.53[.0] + 1.2.56 13 10256 12.so.0.56[.0] ... - 1.5.23 15 10523 15.so.15.23[.0] + 1.5.25 15 10525 15.so.15.25[.0] ... 1.6.22 16 10622 16.so.16.22[.0] @@ -6005,7 +6005,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.22beta04 - March 9, 2016: +Libpng version 1.6.22beta04 - April 5, 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). @@ -6030,7 +6030,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.22beta04, March 9, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.22beta04, April 5, 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 @@ -6155,7 +6155,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 9, 2016 +April 5, 2016 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 6f18b8aa1..63ef8f37b 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "March 9, 2016" +.TH LIBPNGPF 3 "April 5, 2016" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22beta04 (private functions) diff --git a/png.5 b/png.5 index e9d82c2a2..36d0181fd 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "March 9, 2016" +.TH PNG 5 "April 5, 2016" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index c625df6d5..a7f4c154e 100644 --- a/png.c +++ b/png.c @@ -775,14 +775,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.22beta04 - March 9, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.6.22beta04 - April 5, 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.6.22beta04 - March 9, 2016\ + return "libpng version 1.6.22beta04 - April 5, 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 0e3dd3070..fcb94d36c 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.22beta04, March 9, 2016 + * libpng version 1.6.22beta04, April 5, 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.6.22beta04, March 9, 2016: + * libpng versions 0.97, January 1998, through 1.6.22beta04, April 5, 2016: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -29,7 +29,7 @@ * files that are distributed with libpng have other copyright owners and * are released under other open source licenses. * - * libpng versions 1.0.7, July 1, 2000 through 1.6.22beta04, March 9, 2016 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.22beta04, April 5, 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 @@ -213,9 +213,9 @@ * ... * 1.0.19 10 10019 10.so.0.19[.0] * ... - * 1.2.53 13 10253 12.so.0.53[.0] + * 1.2.56 13 10256 12.so.0.56[.0] * ... - * 1.5.23 15 10523 15.so.15.23[.0] + * 1.5.25 15 10525 15.so.15.25[.0] * ... * 1.6.22 16 10622 16.so.16.22[.0] * @@ -245,7 +245,7 @@ * Y2K compliance in libpng: * ========================= * - * March 9, 2016 + * April 5, 2016 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -315,7 +315,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.22beta04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.22beta04 - March 9, 2016\n" + " libpng version 1.6.22beta04 - April 5, 2016\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 03ec615ae..d465a5327 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.22beta04, March 9, 2016 + * libpng version 1.6.22beta04, April 5, 2016 * * Copyright (c) 1998-2002,2004,2006-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 8547af489..ce465ebf6 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.22beta04 - March 9, 2016 +libpng version 1.6.22beta04 - April 5, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index b7d0ab1bd..a1073a5e4 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@