From 36b246a571f1ad4904234d1aeec08a3921d79809 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 27 Sep 2014 08:59:52 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.14beta04.tar --- LICENSE | 4 ++-- README | 2 +- contrib/libtests/fakepng.c | 2 +- contrib/libtests/pngvalid.c | 2 +- libpng-manual.txt | 21 +++++++++++---------- libpng.3 | 29 +++++++++++++++-------------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- pngrtran.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 16 files changed, 46 insertions(+), 44 deletions(-) diff --git a/LICENSE b/LICENSE index b26dc8f99..f97c7b7bd 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.14beta04, September 19, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.14beta04, September 27, 2014, are Copyright (c) 2004, 2006-2014 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 -September 19, 2014 +September 27, 2014 diff --git a/README b/README index 401079086..897b7badf 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.14beta04 - September 19, 2014 (shared library 16.0) +README for libpng version 1.6.14beta04 - September 27, 2014 (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/contrib/libtests/fakepng.c b/contrib/libtests/fakepng.c index ba360d15a..fcc111286 100644 --- a/contrib/libtests/fakepng.c +++ b/contrib/libtests/fakepng.c @@ -52,6 +52,6 @@ main(void) fwrite(signature, sizeof signature, 1, stdout); put_chunk(IHDR, sizeof IHDR); - for(;;) + for (;;) put_chunk(unknown, sizeof unknown); } diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index 0c833dac8..e1d6fb0f7 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -696,7 +696,7 @@ static png_uint_32 random_32(void) { - for(;;) + for (;;) { png_byte mark[4]; png_uint_32 result; diff --git a/libpng-manual.txt b/libpng-manual.txt index a0a7bf911..9b3a2abc0 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.14beta04 - September 19, 2014 + libpng version 1.6.14beta04 - September 27, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.14beta04 - September 19, 2014 + libpng versions 0.97, January 1998, through 1.6.14beta04 - September 27, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5223,12 +5223,15 @@ We mark all non-exported functions with "/* PRIVATE */"": } The prototypes for non-exported functions (except for those in -pngtest) appear in -pngpriv.h -above the comment that says +pngtest) appear in pngpriv.h above the comment that says /* Maintainer: Put new private prototypes here ^ */ +To avoid polluting the global namespace, the names of all exported +functions and variables begin with "png_", and all publicly visible C +preprocessor macros begin with "PNG". We request that applications that +use libpng *not* begin any of their own symbols with either of these strings. + We put a space after the "sizeof" operator and we omit the optional parentheses around its argument when the argument is an expression, not a type name, and we always enclose the @@ -5240,10 +5243,8 @@ sizeof operator, with its argument, in parentheses: Prior to libpng-1.6.0 we used a "png_sizeof()" macro, formatted as though it were a function. -To avoid polluting the global namespace, the names of all exported -functions and variables begin with "png_", and all publicly visible C -preprocessor macros begin with "PNG". We request that applications that -use libpng *not* begin any of their own symbols with either of these strings. +Control keywords if, for, while, and switch are always followed by a space +to distinguish them from function calls, which have no trailing space. We put a space after each comma and after each semicolon in "for" statements, and we put spaces before and after each @@ -5276,7 +5277,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -September 19, 2014 +September 27, 2014 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 5af57df9c..56148e0f2 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "September 19, 2014" +.TH LIBPNG 3 "September 27, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.14beta04 .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.14beta04 - September 19, 2014 + libpng version 1.6.14beta04 - September 27, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.14beta04 - September 19, 2014 + libpng versions 0.97, January 1998, through 1.6.14beta04 - September 27, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5727,12 +5727,15 @@ We mark all non-exported functions with "/* PRIVATE */"": } The prototypes for non-exported functions (except for those in -pngtest) appear in -pngpriv.h -above the comment that says +pngtest) appear in pngpriv.h above the comment that says /* Maintainer: Put new private prototypes here ^ */ +To avoid polluting the global namespace, the names of all exported +functions and variables begin with "png_", and all publicly visible C +preprocessor macros begin with "PNG". We request that applications that +use libpng *not* begin any of their own symbols with either of these strings. + We put a space after the "sizeof" operator and we omit the optional parentheses around its argument when the argument is an expression, not a type name, and we always enclose the @@ -5744,10 +5747,8 @@ sizeof operator, with its argument, in parentheses: Prior to libpng-1.6.0 we used a "png_sizeof()" macro, formatted as though it were a function. -To avoid polluting the global namespace, the names of all exported -functions and variables begin with "png_", and all publicly visible C -preprocessor macros begin with "PNG". We request that applications that -use libpng *not* begin any of their own symbols with either of these strings. +Control keywords if, for, while, and switch are always followed by a space +to distinguish them from function calls, which have no trailing space. We put a space after each comma and after each semicolon in "for" statements, and we put spaces before and after each @@ -5780,7 +5781,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -September 19, 2014 +September 27, 2014 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6085,7 +6086,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.14beta04 - September 19, 2014: +Libpng version 1.6.14beta04 - September 27, 2014: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6108,7 +6109,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.14beta04, September 19, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.14beta04, September 27, 2014, are Copyright (c) 2004,2006-2014 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 @@ -6207,7 +6208,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -September 19, 2014 +September 27, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 7267812d9..83b7890db 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "September 19, 2014" +.TH LIBPNGPF 3 "September 27, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.14beta04 (private functions) diff --git a/png.5 b/png.5 index 968208ea3..a1b8a6c07 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "September 19, 2014" +.TH PNG 5 "September 27, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 53d55a5a3..8ffc006cf 100644 --- a/png.c +++ b/png.c @@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.14beta04 - September 20, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.14beta04 - September 27, 2014" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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.14beta04 - September 20, 2014\ + return "libpng version 1.6.14beta04 - September 27, 2014\ Copyright (c) 1998-2014 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 d4f9649f8..c8ca87004 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.14beta04 - September 20, 2014 + * libpng version 1.6.14beta04 - September 27, 2014 * Copyright (c) 1998-2014 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.14beta04 - September 20, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.14beta04 - September 27, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -235,7 +235,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.14beta04, September 20, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.14beta04, September 27, 2014, are * Copyright (c) 2004, 2006-2014 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: @@ -347,7 +347,7 @@ * Y2K compliance in libpng: * ========================= * - * September 20, 2014 + * September 27, 2014 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -417,7 +417,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.14beta04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.14beta04 - September 20, 2014\n" + " libpng version 1.6.14beta04 - September 27, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 146690ab3..474b661f8 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.14beta04 - September 19, 2014 + * libpng version 1.6.14beta04 - September 27, 2014 * * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index d8ab70513..91e647161 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -959,7 +959,7 @@ png_set_rgb_to_gray_fixed(png_structrp png_ptr, int error_action, if (!png_rtran_ok(png_ptr, 1)) return; - switch(error_action) + switch (error_action) { case PNG_ERROR_ACTION_NONE: png_ptr->transformations |= PNG_RGB_TO_GRAY; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index f5a0bfd65..c9a15bef9 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.14beta04 - September 19, 2014 +libpng version 1.6.14beta04 - September 27, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index f3d08de7e..be51bc02e 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@