From 90a87c88534f22c8f5ef9b7cd35d34ae90338981 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 5 Dec 2011 12:05:43 -0600 Subject: [PATCH] [libpng15] Bump version to libpng-1.6.0alpha01 --- LICENSE | 4 ++-- README | 2 +- libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 8 ++++---- png.5 | 2 +- png.c | 23 +++++++++-------------- 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 +- 13 files changed, 37 insertions(+), 42 deletions(-) diff --git a/LICENSE b/LICENSE index 6be1c7493..aa028caa8 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.0alpha01, November 27, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0alpha01, December 5, 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 27, 2011 +December 5, 2011 diff --git a/README b/README index 90900cd09..aef7ff3fc 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.0alpha01 - November 27, 2011 (shared library 16.0) +README for libpng version 1.6.0alpha01 - December 5, 2011 (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 731bd1bd0..8579c9cf7 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.0alpha01 - November 27, 2011 + libpng version 1.6.0alpha01 - December 5, 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.6.0alpha01 - November 27, 2011 + libpng versions 0.97, January 1998, through 1.6.0alpha01 - December 5, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4573,7 +4573,7 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -November 27, 2011 +December 5, 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 937318120..82febebe8 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "November 27, 2011" +.TH LIBPNG 3 "December 5, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0alpha01 .SH SYNOPSIS @@ -1007,7 +1007,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.0alpha01 - November 27, 2011 + libpng version 1.6.0alpha01 - December 5, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -1018,7 +1018,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.0alpha01 - November 27, 2011 + libpng versions 0.97, January 1998, through 1.6.0alpha01 - December 5, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5581,7 +5581,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -November 27, 2011 +December 5, 2011 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5847,7 +5847,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.0alpha01 - November 27, 2011: +Libpng version 1.6.0alpha01 - December 5, 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). @@ -5870,7 +5870,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0alpha01, November 27, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0alpha01, December 5, 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 @@ -5969,7 +5969,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 27, 2011 +December 5, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index a9929a6ab..9e6c569a5 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "November 27, 2011" +.TH LIBPNGPF 3 "December 5, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0alpha01 (private functions) @@ -18,9 +18,9 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0alpha01 \fI\fB .SH DESCRIPTION -The functions previously listed here are used privately by libpng -and are not recommended for use by applications. They are -not "exported" to applications using shared libraries. +The functions previously listed here are used privately by libpng and are not +available for use by applications. They are not "exported" to applications +using shared libraries. .SH SEE ALSO .BR "png"(5), " libpng"(3), " zlib"(3), " deflate"(5), " " and " zlib"(5) diff --git a/png.5 b/png.5 index 7319871ea..61685ba30 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 27, 2011" +.TH PNG 5 "December 5, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 369c7fa57..70b92223e 100644 --- a/png.c +++ b/png.c @@ -655,13 +655,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.0alpha01 - November 28, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.6.0alpha01 - December 5, 2011" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2011 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.0alpha01 - November 28, 2011\ + return "libpng version 1.6.0alpha01 - December 5, 2011\ Copyright (c) 1998-2011 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -2157,6 +2157,9 @@ png_64bit_product (long v1, long v2, unsigned long *hi_product, #ifdef PNG_READ_GAMMA_SUPPORTED /* gamma table code */ #ifndef PNG_FLOATING_ARITHMETIC_SUPPORTED /* Fixed point gamma. + * + * The code to calculate the tables used below can be found in the shell script + * contrib/tools/intgamma.sh * * To calculate gamma this code implements fast log() and exp() calls using only * fixed point arithmetic. This code has sufficient precision for either 8-bit @@ -2171,12 +2174,9 @@ png_64bit_product (long v1, long v2, unsigned long *hi_product, * 255, so it's the base 2 logarithm of a normalized 8-bit floating point * mantissa. The numbers are 32-bit fractions. */ -static png_uint_32 +static const png_uint_32 png_8bit_l2[128] = { -# ifdef PNG_DO_BC - for (i=128;i<256;++i) { .5 - l(i/255)/l(2)*65536*65536; } -# else 4270715492U, 4222494797U, 4174646467U, 4127164793U, 4080044201U, 4033279239U, 3986864580U, 3940795015U, 3895065449U, 3849670902U, 3804606499U, 3759867474U, 3715449162U, 3671346997U, 3627556511U, 3584073329U, 3540893168U, 3498011834U, @@ -2199,7 +2199,6 @@ png_8bit_l2[128] = 324227938U, 298676034U, 273229066U, 247886176U, 222646516U, 197509248U, 172473545U, 147538590U, 122703574U, 97967701U, 73330182U, 48790236U, 24347096U, 0U -# endif #if 0 /* The following are the values for 16-bit tables - these work fine for the @@ -2343,21 +2342,17 @@ png_log16bit(png_uint_32 x) * frational part of the logarithm by using an accurate 32-bit value from the * top four fractional bits then multiplying in the remaining bits. */ -static png_uint_32 +static const png_uint_32 png_32bit_exp[16] = { -# ifdef PNG_DO_BC - for (i=0;i<16;++i) { .5 + e(-i/16*l(2))*2^32; } -# else /* NOTE: the first entry is deliberately set to the maximum 32-bit value. */ 4294967295U, 4112874773U, 3938502376U, 3771522796U, 3611622603U, 3458501653U, 3311872529U, 3171459999U, 3037000500U, 2908241642U, 2784941738U, 2666869345U, 2553802834U, 2445529972U, 2341847524U, 2242560872U -# endif }; /* Adjustment table; provided to explain the numbers in the code below. */ -#ifdef PNG_DO_BC +#if 0 for (i=11;i>=0;--i){ print i, " ", (1 - e(-(2^i)/65536*l(2))) * 2^(32-i), "\n"} 11 44937.64284865548751208448 10 45180.98734845585101160448 @@ -2872,7 +2867,7 @@ png_build_gamma_table(png_structp png_ptr, int bit_depth) #if defined PNG_SIMPLIFIED_READ_SUPPORTED ||\ defined PNG_SIMPLIFIED_WRITE_SUPPORTED /* sRGB conversion tables; these are machine generated with the code in - * contrib/sRGBtables/makesRGB.c. The sRGB to linear table is exact (to the + * contrib/tools/makesRGB.c. The sRGB to linear table is exact (to the * nearest 16 bit linear fraction). The inverse (linear to sRGB) table has * accuracies as follows: * diff --git a/png.h b/png.h index e0167410c..9ba16deea 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.0alpha01 - November 27, 2011 + * libpng version 1.6.0alpha01 - December 5, 2011 * Copyright (c) 1998-2011 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.0alpha01 - November 27, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.6.0alpha01 - December 5, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -196,7 +196,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.0alpha01, November 27, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.0alpha01, December 5, 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: @@ -308,7 +308,7 @@ * Y2K compliance in libpng: * ========================= * - * November 27, 2011 + * December 5, 2011 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -374,7 +374,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.0alpha01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.0alpha01 - November 27, 2011\n" + " libpng version 1.6.0alpha01 - December 5, 2011\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index f35aaa67e..d5b1d6200 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.0alpha01 - December 2, 2011 + * libpng version 1.6.0alpha01 - December 5, 2011 * * Copyright (c) 1998-2011 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 2ec97be0f..fdb689e8c 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.0alpha01 - November 27, 2011 +libpng version 1.6.0alpha01 - December 5, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 0814ff4de..b201df97a 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@