From 3fdef04d5506eb181786936d8cb3b1472bbcdad5 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 16 Sep 2013 11:24:26 -0500 Subject: [PATCH] [libpng17] Imported from libpng-1.7.0beta18.tar --- ANNOUNCE | 7 +++++-- CHANGES | 5 ++++- LICENSE | 4 ++-- README | 2 +- arm/arm_init.c | 2 +- arm/filter_neon.S | 2 +- libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 8 ++++---- png.h | 10 +++++----- pngconf.h | 2 +- pngpriv.h | 6 ++---- pngrutil.c | 8 +++----- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 19 files changed, 45 insertions(+), 43 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index da4238ec9..fb367f671 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta18 - August 22, 2013 +Libpng 1.7.0beta18 - September 16, 2013 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -352,7 +352,10 @@ Version 1.7.0beta17 [August 21, 2013] Delay calling png_init_filter_functions() until a row with nonzero filter is found. -Version 1.7.0beta18 [August 22, 2013] +Version 1.7.0beta18 [September 16, 2013] + Fixed inconsistent conditional compilation of png_chunk_unknown_handling() + prototype, definition, and usage. Made it depend on + PNG_HANDLE_AS_UNKNOWN_SUPPORTED everywhere. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 5de2fddf8..1ee693835 100644 --- a/CHANGES +++ b/CHANGES @@ -4641,7 +4641,10 @@ Version 1.7.0beta17 [August 21, 2013] Delay calling png_init_filter_functions() until a row with nonzero filter is found. -Version 1.7.0beta18 [August 22, 2013] +Version 1.7.0beta18 [September 16, 2013] + Fixed inconsistent conditional compilation of png_chunk_unknown_handling() + prototype, definition, and usage. Made it depend on + PNG_HANDLE_AS_UNKNOWN_SUPPORTED everywhere. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/LICENSE b/LICENSE index 752a59561..1f1f44b0e 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.7.0beta18, August 22, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta18, September 16, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 22, 2013 +September 16, 2013 diff --git a/README b/README index 26c3c3998..0eb4fa2b4 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta18 - August 22, 2013 (shared library 17.0) +README for libpng version 1.7.0beta18 - September 16, 2013 (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/arm/arm_init.c b/arm/arm_init.c index 33d667292..8f3377545 100644 --- a/arm/arm_init.c +++ b/arm/arm_init.c @@ -3,7 +3,7 @@ * * Copyright (c) 2013 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.5.17 [(PENDING RELEASE)] + * Last changed in libpng 1.6.6 [September 16, 2013] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/arm/filter_neon.S b/arm/filter_neon.S index 73520dd81..b8aef1053 100644 --- a/arm/filter_neon.S +++ b/arm/filter_neon.S @@ -3,7 +3,7 @@ * * Copyright (c) 2013 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.5.17 [(PENDING RELEASE)] + * Last changed in libpng 1.5.17 [July 18, 2013] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/libpng-manual.txt b/libpng-manual.txt index 41dbae7eb..168a79bd8 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.0beta18 - August 22, 2013 + libpng version 1.7.0beta18 - September 16, 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.7.0beta18 - August 22, 2013 + libpng versions 0.97, January 1998, through 1.7.0beta18 - September 16, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5247,7 +5247,7 @@ Other rules can be inferred by inspecting the libpng source. XVII. Y2K Compliance in libpng -August 22, 2013 +September 16, 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 a41b73bbd..74b876df1 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "August 22, 2013" +.TH LIBPNG 3 "September 16, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta18 .SH SYNOPSIS @@ -494,7 +494,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.0beta18 - August 22, 2013 + libpng version 1.7.0beta18 - September 16, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -505,7 +505,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta18 - August 22, 2013 + libpng versions 0.97, January 1998, through 1.7.0beta18 - September 16, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5742,7 +5742,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVII. Y2K Compliance in libpng -August 22, 2013 +September 16, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6012,7 +6012,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta18 - August 22, 2013: +Libpng version 1.7.0beta18 - September 16, 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). @@ -6035,7 +6035,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.7.0beta18, August 22, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta18, September 16, 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 @@ -6134,7 +6134,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 22, 2013 +September 16, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 34176b1c7..12183a8b9 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "August 22, 2013" +.TH LIBPNGPF 3 "September 16, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta18 (private functions) diff --git a/png.5 b/png.5 index 6e024b11d..cb99ac67d 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "August 22, 2013" +.TH PNG 5 "September 16, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 6b3709012..0b5827b1e 100644 --- a/png.c +++ b/png.c @@ -691,13 +691,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta18 - August 22, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta18 - September 16, 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.7.0beta18 - August 22, 2013\ + return "libpng version 1.7.0beta18 - September 16, 2013\ Copyright (c) 1998-2013 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -778,7 +778,7 @@ png_handle_as_unknown(png_const_structrp png_ptr, png_const_bytep chunk_name) return PNG_HANDLE_CHUNK_AS_DEFAULT; } -#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED +#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED int /* PRIVATE */ png_chunk_unknown_handling(png_const_structrp png_ptr, png_uint_32 chunk_name) { @@ -787,7 +787,7 @@ png_chunk_unknown_handling(png_const_structrp png_ptr, png_uint_32 chunk_name) PNG_CSTRING_FROM_CHUNK(chunk_string, chunk_name); return png_handle_as_unknown(png_ptr, chunk_string); } -#endif /* READ_UNKNOWN_CHUNKS */ +#endif /* HANDLE_AS_UNKNOWN */ #endif /* SET_UNKNOWN_CHUNKS */ /* This function was added to libpng-1.0.7 */ diff --git a/png.h b/png.h index 1298a87d3..6a28a1170 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta18 - August 22, 2013 + * libpng version 1.7.0beta18 - September 16, 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.7.0beta18 - August 22, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.7.0beta18 - September 16, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -200,7 +200,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta18, August 22, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta18, September 16, 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: @@ -312,7 +312,7 @@ * Y2K compliance in libpng: * ========================= * - * August 22, 2013 + * September 16, 2013 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -380,7 +380,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.7.0beta18" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta18 - August 22, 2013\n" + " libpng version 1.7.0beta18 - September 16, 2013\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 diff --git a/pngconf.h b/pngconf.h index a5b93976c..dc0c6f11a 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta18 - August 22, 2013 + * libpng version 1.7.0beta18 - September 16, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index 3f0766cd6..9597d6159 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1343,15 +1343,13 @@ PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr, * just skips the chunk or errors out if it is critical. */ -#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED -#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED +#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED PNG_INTERNAL_FUNCTION(int,png_chunk_unknown_handling, (png_const_structrp png_ptr, png_uint_32 chunk_name),PNG_EMPTY); /* Exactly as the API png_handle_as_unknown() except that the argument is a * 32-bit chunk name, not a string. */ -#endif -#endif /* PNG_READ_UNKNOWN_CHUNKS_SUPPORTED */ +#endif /* PNG_HANDLE_AS_UNKNOWN_SUPPORTED */ #endif /* PNG_READ_SUPPORTED */ /* Handle the transformations for reading and writing */ diff --git a/pngrutil.c b/pngrutil.c index aefbf36c1..73dd3e840 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -2746,7 +2746,6 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr, png_debug(1, "in png_handle_unknown"); -#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED /* NOTE: this code is based on the code in libpng-1.4.12 except for fixing * the bug which meant that setting a non-default behavior for a specific * chunk would be ignored (the default was always used unless a user @@ -2759,15 +2758,14 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr, * function. */ # ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED -# ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED - keep = png_chunk_unknown_handling(png_ptr, png_ptr->chunk_name); -# endif + keep = png_chunk_unknown_handling(png_ptr, png_ptr->chunk_name); # endif /* One of the following methods will read the chunk or skip it (at least one * of these is always defined because this is the only way to switch on * PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) */ +#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED # ifdef PNG_READ_USER_CHUNKS_SUPPORTED /* The user callback takes precedence over the chunk keep value, but the * keep value is still required to validate a save of a critical chunk. @@ -2853,7 +2851,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr, png_crc_finish(png_ptr, length); } -# endif +# endif /* PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED */ # ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED /* Now store the chunk in the chunk list if appropriate, and if the limits diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 273f32177..4a213f39b 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta18 - August 22, 2013 +libpng version 1.7.0beta18 - September 16, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 6bda68018..2a8b653a2 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@