From 33ced44f9e141bdc1d96ced0c4aebd4a830a3e99 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 27 Apr 2011 14:58:06 -0500 Subject: [PATCH] [devel] Bump to version libpng-1.5.3beta04 --- ANNOUNCE | 7 ++++--- CHANGES | 4 +++- LICENSE | 4 ++-- README | 2 +- libpng-manual.txt | 13 +++++++------ libpng.3 | 21 +++++++++++---------- 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 +- 14 files changed, 41 insertions(+), 36 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 722289447..341402fb1 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.3beta04 - April 18, 2011 +Libpng 1.5.3beta04 - April 27, 2011 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. @@ -54,7 +54,7 @@ Version 1.5.3beta03 [April 16, 2011] Fixed bug with stripping the filler or alpha channel when writing, that was introduced in libpng-1.5.2beta01 (bug report by Andrew Church). -Version 1.5.3beta04 [April 18, 2011] +Version 1.5.3beta04 [April 27, 2011] Updated pngtest.png with the new zlib CMF optimization. Cleaned up conditional compilation code and of background/gamma handling Internal changes only except a new option to avoid compiling the @@ -73,7 +73,8 @@ Version 1.5.3beta04 [April 18, 2011] A serious bug in the pngvalid internal routine 'standard_display_init' has been fixed - this failed to initialize the red channel and accidentally initialized the alpha channel twice. - + Changed png_struct jmp_buf member name from png_jmpbuf to tmp_jmpbuf to + avoid a clash with the png_jmpbuf macro on some platforms. Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index 7f157d0df..926e90cc0 100644 --- a/CHANGES +++ b/CHANGES @@ -3315,7 +3315,7 @@ Version 1.5.3beta03 [April 16, 2011] Fixed bug with stripping the filler or alpha channel when writing, that was introduced in libpng-1.5.2beta01 (bug report by Andrew Church). -Version 1.5.3beta04 [April 18, 2011] +Version 1.5.3beta04 [April 27, 2011] Updated pngtest.png with the new zlib CMF optimization. Cleaned up conditional compilation code and of background/gamma handling Internal changes only except a new option to avoid compiling the @@ -3334,6 +3334,8 @@ Version 1.5.3beta04 [April 18, 2011] A serious bug in the pngvalid internal routine 'standard_display_init' has been fixed - this failed to initialize the red channel and accidentally initialized the alpha channel twice. + Changed png_struct jmp_buf member name from png_jmpbuf to tmp_jmpbuf to + avoid a clash with the png_jmpbuf macro on some platforms. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/LICENSE b/LICENSE index e89c16d6f..b46aea3da 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.5.3beta04, April 17, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.3beta04, April 27, 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 -April 17, 2011 +April 27, 2011 diff --git a/README b/README index 07984e72d..5d178c79f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.3beta04 - April 17, 2011 (shared library 15.0) +README for libpng version 1.5.3beta04 - April 27, 2011 (shared library 15.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 ba6283039..52ba56723 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.5.3beta04 - April 21, 2011 + libpng version 1.5.3beta04 - April 27, 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.5.3beta04 - April 21, 2011 + libpng versions 0.97, January 1998, through 1.5.3beta04 - April 27, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -3822,9 +3822,10 @@ absolutely necessary) interlace an image. libpng 1.5.0 adds an API png_longjmp(png_ptr, value). This API calls the application-provided png_longjmp_ptr on the internal, but application -initialized, longjmp buffer. It is provided as a convenience to avoid the need -to use the png_jmpbuf macro, which had the unnecessary side effect of -resetting the internal png_longjmp_ptr value. +initialized, jmpbuf. It is provided as a convenience to avoid the need +initialized, longjmp buffer. It is provided as a convenience to avoid +the need to use the png_jmpbuf macro, which had the unnecessary side +effect of resetting the internal png_longjmp_ptr value. libpng 1.5.0 includes a complete fixed point API. By default this is present along with the corresponding floating point API. In general the @@ -4192,7 +4193,7 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -April 21, 2011 +April 27, 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 5294eeb16..022701101 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "April 21, 2011" +.TH LIBPNG 3 "April 27, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.3beta04 .SH SYNOPSIS @@ -943,7 +943,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.5.3beta04 - April 21, 2011 + libpng version 1.5.3beta04 - April 27, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -954,7 +954,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.3beta04 - April 21, 2011 + libpng versions 0.97, January 1998, through 1.5.3beta04 - April 27, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4765,9 +4765,10 @@ absolutely necessary) interlace an image. libpng 1.5.0 adds an API png_longjmp(png_ptr, value). This API calls the application-provided png_longjmp_ptr on the internal, but application -initialized, longjmp buffer. It is provided as a convenience to avoid the need -to use the png_jmpbuf macro, which had the unnecessary side effect of -resetting the internal png_longjmp_ptr value. +initialized, jmpbuf. It is provided as a convenience to avoid the need +initialized, longjmp buffer. It is provided as a convenience to avoid +the need to use the png_jmpbuf macro, which had the unnecessary side +effect of resetting the internal png_longjmp_ptr value. libpng 1.5.0 includes a complete fixed point API. By default this is present along with the corresponding floating point API. In general the @@ -5135,7 +5136,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -April 21, 2011 +April 27, 2011 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5387,7 +5388,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.3beta04 - April 21, 2011: +Libpng version 1.5.3beta04 - April 27, 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). @@ -5410,7 +5411,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.3beta04, April 21, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.3beta04, April 27, 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 @@ -5509,7 +5510,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 21, 2011 +April 27, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 5c0f99d0f..31078ee91 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "April 18, 2011" +.TH LIBPNGPF 3 "April 27, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.3beta04 (private functions) diff --git a/png.5 b/png.5 index 205b32df5..b87628d2c 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "April 17, 2011" +.TH PNG 5 "April 27, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index d62dee33d..41996e493 100644 --- a/png.c +++ b/png.c @@ -555,13 +555,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.3beta04 - April 17, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.5.3beta04 - April 27, 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.5.3beta04 - April 17, 2011\ + return "libpng version 1.5.3beta04 - April 27, 2011\ Copyright (c) 1998-2011 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 7f162ba0b..6c900120e 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.3beta04 - April 17, 2011 + * libpng version 1.5.3beta04 - April 27, 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.5.3beta04 - April 17, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.5.3beta04 - April 27, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -182,7 +182,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.3beta04, April 17, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.3beta04, April 27, 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: @@ -294,7 +294,7 @@ * Y2K compliance in libpng: * ========================= * - * April 17, 2011 + * April 27, 2011 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -358,7 +358,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.5.3beta04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.3beta04 - April 17, 2011\n" + " libpng version 1.5.3beta04 - April 27, 2011\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 diff --git a/pngconf.h b/pngconf.h index 96feeb414..84e9dd3a9 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.3beta04 - April 17, 2011 + * libpng version 1.5.3beta04 - April 27, 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 635dbbe97..280ce2cfc 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.3beta04 - April 17, 2011 +libpng version 1.5.3beta04 - April 27, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index b25efd939..15d99ed69 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@