From 6b570f11e1936b54de9f22e2e3bad047369cee4a Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 25 Mar 2014 10:31:12 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.11beta02.tar --- ANNOUNCE | 4 ++-- CHANGES | 2 +- LICENSE | 4 ++-- README | 2 +- contrib/libtests/pngvalid.c | 28 ++++++++++++++-------------- libpng-manual.txt | 8 +++++--- libpng.3 | 16 +++++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 16 files changed, 48 insertions(+), 44 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 4ff19ac30..10c9e8b80 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.11beta02 - March 22, 2014 +Libpng 1.6.11beta02 - March 25, 2014 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. @@ -31,7 +31,7 @@ Version 1.6.11beta01 [March 17, 2014] Changed ZlibSrcDir from 1.2.5 to 1.2.8 in projects/vstudio. Moved configuration information from the manual to the INSTALL file. -Version 1.6.11beta02 [March 22, 2014] +Version 1.6.11beta02 [March 25, 2014] Removed #if/#else/#endif from inside two pow() calls in pngvalid.c because they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3 when using its "__builtin_pow()" function. diff --git a/CHANGES b/CHANGES index 7033d80a2..514b8d058 100644 --- a/CHANGES +++ b/CHANGES @@ -4880,7 +4880,7 @@ Version 1.6.11beta01 [March 17, 2014] Changed ZlibSrcDir from 1.2.5 to 1.2.8 in projects/vstudio. Moved configuration information from the manual to the INSTALL file. -Version 1.6.11beta02 [March 22, 2014] +Version 1.6.11beta02 [March 25, 2014] Removed #if/#else/#endif from inside two pow() calls in pngvalid.c because they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3 when using its "__builtin_pow()" function. diff --git a/LICENSE b/LICENSE index 0cc4a4f5d..ac3e40dd0 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.11beta02, March 17, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.11beta02, March 25, 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 -March 17, 2014 +March 25, 2014 diff --git a/README b/README index 38ab68696..4914687d5 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.11beta02 - March 17, 2014 (shared library 16.0) +README for libpng version 1.6.11beta02 - March 25, 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/pngvalid.c b/contrib/libtests/pngvalid.c index 7a5d3e316..e8401c93f 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -386,9 +386,9 @@ next_format(png_bytep colour_type, png_bytep bit_depth, /* Palette images are restricted to 8 bit depth */ if (*bit_depth <= 8 -# ifdef DO_16BIT +#ifdef DO_16BIT || (*colour_type != 3 && *bit_depth <= 16) -# endif +#endif ) return 1; @@ -3155,10 +3155,10 @@ init_standard_palette(png_store *ps, png_structp pp, png_infop pi, int npalette, for (; i<256; ++i) tRNS[i] = 24; -# ifdef PNG_WRITE_tRNS_SUPPORTED +# ifdef PNG_WRITE_tRNS_SUPPORTED if (j > 0) png_set_tRNS(pp, pi, tRNS, j, 0/*color*/); -# endif +# endif } } @@ -6777,13 +6777,13 @@ image_transform_png_set_rgb_to_gray_ini(PNG_CONST image_transform *this, * +/-(1<<(15-PNG_MAX_GAMMA_8)) in the 8-bit case. */ that->pm->limit += -# if PNG_MAX_GAMMA_8 < 14 - pow((that->this.bit_depth == 16 ? 8. : - 6. + (1<<(15-PNG_MAX_GAMMA_8)))/65535, data.gamma); -# else - pow((that->this.bit_depth == 16 ? 8. : - 8. + (1<<(15-PNG_MAX_GAMMA_8)))/65535, data.gamma); -# endif +# if PNG_MAX_GAMMA_8 < 14 + pow((that->this.bit_depth == 16 ? + 8. : 6. + (1<<(15-PNG_MAX_GAMMA_8)))/65535, data.gamma); +# else + pow((that->this.bit_depth == 16 ? + 8. : 8. + (1<<(15-PNG_MAX_GAMMA_8)))/65535, data.gamma); +# endif } else @@ -6802,11 +6802,11 @@ image_transform_png_set_rgb_to_gray_ini(PNG_CONST image_transform *this, * pngvalid on the output errors. */ that->pm->limit += -# if DIGITIZE +# if DIGITIZE pow(1.1 /255, data.gamma); -# else +# else pow(1.0 /255, data.gamma); -# endif +# endif } } diff --git a/libpng-manual.txt b/libpng-manual.txt index e43fb88f3..4815c0d34 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.11beta02 - March 17, 2014 + libpng version 1.6.11beta02 - March 25, 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.11beta02 - March 17, 2014 + libpng versions 0.97, January 1998, through 1.6.11beta02 - March 25, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4293,6 +4293,8 @@ zlib.h for more information on what these mean. png_set_compression_method(png_ptr, method); +This controls the size of the IDAT chunks (default 8192): + png_set_compression_buffer_size(png_ptr, size); As of libpng version 1.5.4, additional APIs became @@ -5260,7 +5262,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -March 17, 2014 +March 25, 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 a22e8d325..b80b12594 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "March 17, 2014" +.TH LIBPNG 3 "March 25, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11beta02 .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.11beta02 - March 17, 2014 + libpng version 1.6.11beta02 - March 25, 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.11beta02 - March 17, 2014 + libpng versions 0.97, January 1998, through 1.6.11beta02 - March 25, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4797,6 +4797,8 @@ zlib.h for more information on what these mean. png_set_compression_method(png_ptr, method); +This controls the size of the IDAT chunks (default 8192): + png_set_compression_buffer_size(png_ptr, size); As of libpng version 1.5.4, additional APIs became @@ -5764,7 +5766,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -March 17, 2014 +March 25, 2014 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6061,7 +6063,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.11beta02 - March 17, 2014: +Libpng version 1.6.11beta02 - March 25, 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). @@ -6084,7 +6086,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.11beta02, March 17, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.11beta02, March 25, 2014, 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 @@ -6183,7 +6185,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 17, 2014 +March 25, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index c5abccf41..9925a4b01 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "March 17, 2014" +.TH LIBPNGPF 3 "March 25, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11beta02 (private functions) diff --git a/png.5 b/png.5 index f0157e441..53b38f02c 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "March 17, 2014" +.TH PNG 5 "March 25, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 386a09346..3038e304a 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.11beta02 - March 22, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.11beta02 - March 25, 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.11beta02 - March 22, 2014\ + return "libpng version 1.6.11beta02 - March 25, 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 b235f2399..057a87c8f 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.11beta02 - March 17, 2014 + * libpng version 1.6.11beta02 - March 25, 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.11beta02 - March 17, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.11beta02 - March 25, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -227,7 +227,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.11beta02, March 17, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.11beta02, March 25, 2014, 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: @@ -339,7 +339,7 @@ * Y2K compliance in libpng: * ========================= * - * March 17, 2014 + * March 25, 2014 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -409,7 +409,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.11beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.11beta02 - March 17, 2014\n" + " libpng version 1.6.11beta02 - March 25, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 6bbbcb92c..7c32e5ef0 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.11beta02 - March 17, 2014 + * libpng version 1.6.11beta02 - March 25, 2014 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 8d1f71847..095b663da 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.11beta02 - March 17, 2014 +libpng version 1.6.11beta02 - March 25, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 0040f7e10..34fcfb871 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@