diff options
| -rw-r--r-- | ANNOUNCE | 4 | ||||
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | LICENSE | 4 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | contrib/libtests/pngvalid.c | 13 | ||||
| -rw-r--r-- | libpng-manual.txt | 6 | ||||
| -rw-r--r-- | libpng.3 | 14 | ||||
| -rw-r--r-- | libpngpf.3 | 2 | ||||
| -rw-r--r-- | png.5 | 2 | ||||
| -rw-r--r-- | projects/vstudio/readme.txt | 2 | ||||
| -rw-r--r-- | projects/vstudio/zlib.props | 2 |
11 files changed, 32 insertions, 21 deletions
@@ -1,5 +1,5 @@ -Libpng 1.6.0beta03 - December 21, 2011 +Libpng 1.6.0beta03 - December 22, 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. @@ -59,7 +59,7 @@ Version 1.6.0beta02 [December 21, 2011] The include path of 'config.h' was erroneously made relative in pngvalid.c in libpng 1.5.7. -Version 1.6.0beta03 [December 21, 2011] +Version 1.6.0beta03 [December 22, 2011] Start-up code size improvements, error handler flexibility. These changes alter how the tricky allocation of the initial png_struct and png_info structures are handled. png_info is now handled in pretty much the same @@ -3810,7 +3810,7 @@ Version 1.6.0beta02 [December 21, 2011] The include path of 'config.h' was erroneously made relative in pngvalid.c in libpng 1.5.7. -Version 1.6.0beta03 [December 21, 2011] +Version 1.6.0beta03 [December 22, 2011] Start-up code size improvements, error handler flexibility. These changes alter how the tricky allocation of the initial png_struct and png_info structures are handled. png_info is now handled in pretty much the same @@ -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.0beta03, December 21, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta03, December 22, 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 -December 21, 2011 +December 22, 2011 @@ -1,4 +1,4 @@ -README for libpng version 1.6.0beta03 - December 21, 2011 (shared library 16.0) +README for libpng version 1.6.0beta03 - December 22, 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/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index a22d4dbb4..fc780a0fc 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -3887,6 +3887,9 @@ perform_formatting_test(png_store *volatile ps) { png_const_charp correct = "29 Aug 2079 13:53:60 +0000"; png_const_charp result; +# if PNG_LIBPNG_VER >= 10600 + char timestring[29]; +# endif png_structp pp; png_time pt; @@ -3904,7 +3907,15 @@ perform_formatting_test(png_store *volatile ps) pt.minute = 53; pt.second = 60; /* a leap second */ - result = png_convert_to_rfc1123(pp, &pt); +# if PNG_LIBPNG_VER < 10600 + result = png_convert_to_rfc1123(pp, &pt); +# else + if (png_convert_to_rfc1123_buffer(timestring, &pt)) + result = timestring; + + else + result = NULL; +# endif if (result == NULL) png_error(pp, "png_convert_to_rfc1123 failed"); diff --git a/libpng-manual.txt b/libpng-manual.txt index 87f76178b..e79740cf5 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.0beta03 - December 21, 2011 + libpng version 1.6.0beta03 - December 22, 2011 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.0beta03 - December 21, 2011 + libpng versions 0.97, January 1998, through 1.6.0beta03 - December 22, 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 -December 21, 2011 +December 22, 2011 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "December 21, 2011" +.TH LIBPNG 3 "December 22, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta03 .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.0beta03 - December 21, 2011 + libpng version 1.6.0beta03 - December 22, 2011 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.0beta03 - December 21, 2011 + libpng versions 0.97, January 1998, through 1.6.0beta03 - December 22, 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 -December 21, 2011 +December 22, 2011 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5850,7 +5850,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.0beta03 - December 21, 2011: +Libpng version 1.6.0beta03 - December 22, 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). @@ -5873,7 +5873,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0beta03, December 21, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta03, December 22, 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 @@ -5972,7 +5972,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 21, 2011 +December 22, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index f38a7059f..bad252cb5 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "December 21, 2011" +.TH LIBPNGPF 3 "December 22, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta03 (private functions) @@ -1,4 +1,4 @@ -.TH PNG 5 "December 21, 2011" +.TH PNG 5 "December 22, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index eb0ab1108..02aa3ccb4 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.0beta03 - December 21, 2011 +libpng version 1.6.0beta03 - December 22, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 6d75b7484..56ce38823 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source * - * libpng version 1.6.0beta03 - December 21, 2011 + * libpng version 1.6.0beta03 - December 22, 2011 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * |