From 8c87dc88d63b18210f8c2441f8f6cf05f11b85b5 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 4 Mar 2013 17:38:04 -0600 Subject: [PATCH] [libpng16] Imported from libpng-1.6.1beta06.tar --- LICENSE | 4 ++-- README | 2 +- libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- pngconf.h | 2 +- pngrutil.c | 4 ++++ projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- 11 files changed, 23 insertions(+), 19 deletions(-) diff --git a/LICENSE b/LICENSE index af7484cc6..bd8f35b53 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.1beta06, March 2, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.1beta06, March 4, 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 -March 2, 2013 +March 4, 2013 diff --git a/README b/README index 7bf03fb2b..4d9508142 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.1beta06 - March 2, 2013 (shared library 16.0) +README for libpng version 1.6.1beta06 - March 4, 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 898f09574..9b5aa02b8 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.1beta06 - March 2, 2013 + libpng version 1.6.1beta06 - March 4, 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.1beta06 - March 2, 2013 + libpng versions 0.97, January 1998, through 1.6.1beta06 - March 4, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5161,7 +5161,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -March 2, 2013 +March 4, 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 dadbb3dbd..6eb98d443 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "March 2, 2013" +.TH LIBPNG 3 "March 4, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta06 .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.1beta06 - March 2, 2013 + libpng version 1.6.1beta06 - March 4, 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.1beta06 - March 2, 2013 + libpng versions 0.97, January 1998, through 1.6.1beta06 - March 4, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5666,7 +5666,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -March 2, 2013 +March 4, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5937,7 +5937,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.1beta06 - March 2, 2013: +Libpng version 1.6.1beta06 - March 4, 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). @@ -5960,7 +5960,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.1beta06, March 2, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.1beta06, March 4, 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 @@ -6059,7 +6059,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 2, 2013 +March 4, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 4a2a61670..e2b2c4674 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "March 2, 2013" +.TH LIBPNGPF 3 "March 4, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta06 (private functions) diff --git a/png.5 b/png.5 index cf5a14bed..12df1bac0 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "March 2, 2013" +.TH PNG 5 "March 4, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/pngconf.h b/pngconf.h index fdf4ca44c..6c8ea559e 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.1beta06 - March 2, 2013 + * libpng version 1.6.1beta06 - March 4, 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 10e097da4..c7f4abf26 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -2817,9 +2817,13 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr, { # ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED if (png_ptr->unknown_default < PNG_HANDLE_CHUNK_IF_SAFE) + { + png_chunk_warning(png_ptr, "Saving unknown chunk:"); png_app_warning(png_ptr, "forcing save of an unhandled chunk;" " please call png_set_keep_unknown_chunks"); + /* with keep = PNG_HANDLE_CHUNK_IF_SAFE */ + } # endif keep = PNG_HANDLE_CHUNK_IF_SAFE; } diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index a2d5754ea..0160f93ca 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.1beta06 - March 2, 2013 +libpng version 1.6.1beta06 - March 4, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 8f08a8e31..03bdef17e 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@