From 6d8e090419bc29e0a6fd2229c5634849788ad275 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 11 Nov 2011 18:41:59 -0600 Subject: [libpng15] Imported from libpng-1.5.7beta02.tar --- LICENSE | 4 ++-- README | 2 +- libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- pngconf.h | 2 +- pngread.c | 5 +++-- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 12 files changed, 23 insertions(+), 22 deletions(-) diff --git a/LICENSE b/LICENSE index 1957b05ec..2a846e7b1 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.5.7beta02, November 4, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.7beta02, November 12, 2011, are Copyright (c) 2004, 2006-2011 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 -November 4, 2011 +November 12, 2011 diff --git a/README b/README index c5d17ae08..8b666f71c 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.7beta02 - November 4, 2011 (shared library 15.0) +README for libpng version 1.5.7beta02 - November 12, 2011 (shared library 15.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 7ab475242..b91f6447a 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.5.7beta02 - November 8, 2011 + libpng version 1.5.7beta02 - November 12, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 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.5.7beta02 - November 8, 2011 + libpng versions 0.97, January 1998, through 1.5.7beta02 - November 12, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4566,7 +4566,7 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -November 8, 2011 +November 12, 2011 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 d1d815411..9b548d7d2 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "November 8, 2011" +.TH LIBPNG 3 "November 12, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.7beta02 .SH SYNOPSIS @@ -1037,7 +1037,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.5.7beta02 - November 8, 2011 + libpng version 1.5.7beta02 - November 12, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -1048,7 +1048,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.7beta02 - November 8, 2011 + libpng versions 0.97, January 1998, through 1.5.7beta02 - November 12, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5604,7 +5604,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -November 8, 2011 +November 12, 2011 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5869,7 +5869,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.7beta02 - November 8, 2011: +Libpng version 1.5.7beta02 - November 12, 2011: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5892,7 +5892,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.7beta02, November 8, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.7beta02, November 12, 2011, 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 @@ -5991,7 +5991,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 8, 2011 +November 12, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 1add03f33..4a3ee90f5 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "November 4, 2011" +.TH LIBPNGPF 3 "November 12, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.7beta02 (private functions) diff --git a/png.5 b/png.5 index 0f629f379..9d3c04568 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 4, 2011" +.TH PNG 5 "November 12, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/pngconf.h b/pngconf.h index fe36ddf02..ca7ae727a 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.7beta02 - November 4, 2011 + * libpng version 1.5.7beta02 - November 12, 2011 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngread.c b/pngread.c index b90fdc1b4..3d33f4ee9 100644 --- a/pngread.c +++ b/pngread.c @@ -1463,8 +1463,9 @@ png_image_read_header(png_voidp argument) else if (info_ptr->valid & PNG_INFO_iCCP) { -# if 0 /* TODO: IMPLEMENT THIS! Remember to remove iCCP from - the list of unused chunks */ +# if 0 + /* TODO: IMPLEMENT THIS! Remember to remove iCCP from + the chunks_to_ignore list */ /* Here if we just have an iCCP chunk. */ if (!png_iCCP_is_sRGB(png_ptr, info_ptr)) # endif diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index cae86a312..911313cb0 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.7beta02 - November 4, 2011 +libpng version 1.5.7beta02 - November 12, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 5bb92e261..0adddf8ee 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@