[libpng16] Imported from libpng-1.6.0beta03.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 9041246..8f3385a 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -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 @@
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
diff --git a/CHANGES b/CHANGES
index c4a6b9d..d50b6e9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3810,7 +3810,7 @@
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
diff --git a/LICENSE b/LICENSE
index e49014b..afc0c3e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@
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 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-December 21, 2011
+December 22, 2011
diff --git a/README b/README
index 9c68ad2..8a08a40 100644
--- a/README
+++ b/README
@@ -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 a22d4db..fc780a0 100644
--- a/contrib/libtests/pngvalid.c
+++ b/contrib/libtests/pngvalid.c
@@ -3887,6 +3887,9 @@
{
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 @@
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 87f7617..e79740c 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 @@
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 @@
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.
diff --git a/libpng.3 b/libpng.3
index c71b348..06ae539 100644
--- a/libpng.3
+++ b/libpng.3
@@ -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 @@
.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 @@
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 @@
.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 @@
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 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 @@
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 f38a705..bad252c 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)
diff --git a/png.5 b/png.5
index d325601..a2934e0 100644
--- a/png.5
+++ b/png.5
@@ -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 eb0ab11..02aa3cc 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 6d75b74..56ce388 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
*
