From 2fd3434fa473bd22204abdf8094e4a9239ba3f23 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 6 May 2013 09:13:14 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.3beta04.tar --- LICENSE | 4 ++-- README | 2 +- libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- pngrutil.c | 5 +++++ projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- 13 files changed, 31 insertions(+), 26 deletions(-) diff --git a/LICENSE b/LICENSE index 2fc7e86e0..3ccc6300c 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.3beta04, April 30, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.3beta04, May 6, 2013, are Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 30, 2013 +May 6, 2013 diff --git a/README b/README index 269bfbc29..6c9b99d84 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.3beta04 - April 30, 2013 (shared library 16.0) +README for libpng version 1.6.3beta04 - May 6, 2013 (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 2b9c6386d..a214c5998 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.3beta04 - April 30, 2013 + libpng version 1.6.3beta04 - May 6, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 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.3beta04 - April 30, 2013 + libpng versions 0.97, January 1998, through 1.6.3beta04 - May 6, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5197,7 +5197,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -April 30, 2013 +May 6, 2013 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 04875c7ab..4e2f40e79 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "April 30, 2013" +.TH LIBPNG 3 "May 6, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.3beta04 .SH SYNOPSIS @@ -504,7 +504,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.3beta04 - April 30, 2013 + libpng version 1.6.3beta04 - May 6, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.3beta04 - April 30, 2013 + libpng versions 0.97, January 1998, through 1.6.3beta04 - May 6, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5702,7 +5702,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -April 30, 2013 +May 6, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5979,7 +5979,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.3beta04 - April 30, 2013: +Libpng version 1.6.3beta04 - May 6, 2013: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6002,7 +6002,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.3beta04, April 30, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.3beta04, May 6, 2013, are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -6101,7 +6101,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 30, 2013 +May 6, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index b4693ac82..b9dc2f933 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "April 30, 2013" +.TH LIBPNGPF 3 "May 6, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.3beta04 (private functions) diff --git a/png.5 b/png.5 index 695d67423..fe2d20139 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "April 30, 2013" +.TH PNG 5 "May 6, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 892379016..68f6f5b5c 100644 --- a/png.c +++ b/png.c @@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.3beta04 - April 30, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.3beta04 - May 6, 2013" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2013 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.3beta04 - April 30, 2013\ + return "libpng version 1.6.3beta04 - May 6, 2013\ Copyright (c) 1998-2013 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 8a956e495..d860b9c1b 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.3beta04 - April 30, 2013 + * libpng version 1.6.3beta04 - May 6, 2013 * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,7 +11,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.3beta04 - April 30, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.3beta04 - May 6, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -207,7 +207,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.3beta04, April 30, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.3beta04, May 6, 2013, are * Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -319,7 +319,7 @@ * Y2K compliance in libpng: * ========================= * - * April 30, 2013 + * May 6, 2013 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -387,7 +387,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.3beta04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.3beta04 - April 30, 2013\n" + " libpng version 1.6.3beta04 - May 6, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 1af4f25d8..e2569d86f 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.3beta04 - April 30, 2013 + * libpng version 1.6.3beta04 - May 6, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index 9c10e26ba..305d8a5d7 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -4520,6 +4520,11 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) * windowBts predicted from the uncompressed data size, not the value from * the stream. If READ_OPTIMIZE_WINDOWBITS_SUPPORTED is not defined, then * simply use a 32kbyte window (windowBits=15). + * + * To do: make this behavior optional via a run-time png_set_something(), + * with options to use windowBits=0 (use the zlib header data), + * windowBits=15 (use a 32kbyte window), or required_window_bits + * computed from the image size, pixel size, and interlacing setting. */ #ifdef PNG_READ_OPTIMIZE_WINDOWBITS_SUPPORTED if (png_inflate_claim(png_ptr, png_IDAT, diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 8993d5cde..f1947f155 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.3beta04 - April 30, 2013 +libpng version 1.6.3beta04 - May 6, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index d41b78ece..82382a7ab 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@