[devel] Imported from libpng-1.5.1beta06.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 93dab38..beb458b 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.5.1beta06 - January 16, 2011
+Libpng 1.5.1beta06 - January 20, 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.
@@ -51,17 +51,18 @@
samples of each pixel, instead of sampling the red channel three times.
Prefixed variable names index, div, exp, gamma with "png_" to avoid "shadow"
warnings.
- Revised png_fixed() in png.c to avoid compiler warning about reaching the
- end without returning anything.
Version 1.5.1beta05 [January 16, 2011]
Changed variable names png_index, png_div, png_exp, and png_gamma to
char_index, divisor, exp_b10, and gamma_val, respectively, and
changed exp() back to png_exp().
-Version 1.5.1beta06 [January 16, 2011]
+Version 1.5.1beta06 [January 20, 2011]
Prevent png_push_crc_skip() from hanging while reading an unknown chunk
or an over-large compressed zTXt chunk with the progressive reader.
+ Eliminated more GCC "shadow" warnings.
+ Revised png_fixed() in png.c to avoid compiler warning about reaching the
+ end without returning anything.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 99d0fc9..abc6515 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3167,17 +3167,18 @@
samples of each pixel, instead of sampling the red channel three times.
Prefixed variable names index, div, exp, gamma with "png_" to avoid "shadow"
warnings, and (mistakenly) changed png_exp() to exp().
- Revised png_fixed() in png.c to avoid compiler warning about reaching the
- end without returning anything.
Version 1.5.1beta05 [January 16, 2011]
Changed variable names png_index, png_div, png_exp, and png_gamma to
char_index, divisor, exp_b10, and gamma_val, respectively, and
changed exp() back to png_exp().
-Version 1.5.1beta06 [January 16, 2011]
+Version 1.5.1beta06 [January 20, 2011]
Prevent png_push_crc_skip() from hanging while reading an unknown chunk
or an over-large compressed zTXt chunk with the progressive reader.
+ Eliminated more GCC "shadow" warnings.
+ Revised png_fixed() in png.c to avoid compiler warning about reaching the
+ end without returning anything.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/LICENSE b/LICENSE
index b3e10dc..94b6e30 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.5.1beta06, January 16, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.1beta06, January 20, 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
-January 16, 2011
+January 20, 2011
diff --git a/README b/README
index f4b595c..fbbc065 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.5.1beta06 - January 16, 2011 (shared library 15.0)
+README for libpng version 1.5.1beta06 - January 20, 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 0e98eaa..7c12547 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.1beta06 - January 16, 2011
+ libpng version 1.5.1beta06 - January 20, 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.5.1beta06 - January 16, 2011
+ libpng versions 0.97, January 1998, through 1.5.1beta06 - January 20, 2011
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -3853,7 +3853,7 @@
XIV. Y2K Compliance in libpng
-January 16, 2011
+January 20, 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 73fe26f..d234aa2 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "January 16, 2011"
+.TH LIBPNG 3 "January 20, 2011"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.1beta06
.SH SYNOPSIS
@@ -851,7 +851,7 @@
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.5.1beta06 - January 16, 2011
+ libpng version 1.5.1beta06 - January 20, 2011
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -862,7 +862,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.5.1beta06 - January 16, 2011
+ libpng versions 0.97, January 1998, through 1.5.1beta06 - January 20, 2011
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -4704,7 +4704,7 @@
.SH XIV. Y2K Compliance in libpng
-January 16, 2011
+January 20, 2011
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -4950,7 +4950,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.5.1beta06 - January 16, 2011:
+Libpng version 1.5.1beta06 - January 20, 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).
@@ -4973,7 +4973,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.5.1beta06, January 16, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.1beta06, January 20, 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
@@ -5072,7 +5072,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-January 16, 2011
+January 20, 2011
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 18eacd6..60f382b 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "January 16, 2011"
+.TH LIBPNGPF 3 "January 20, 2011"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.1beta06
(private functions)
diff --git a/png.5 b/png.5
index 8544738..6996ef2 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "January 16, 2011"
+.TH PNG 5 "January 20, 2011"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 28f2edb..2876293 100644
--- a/png.c
+++ b/png.c
@@ -555,13 +555,13 @@
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.5.1beta06 - January 16, 2011" PNG_STRING_NEWLINE \
+ "libpng version 1.5.1beta06 - January 20, 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.1beta06 - January 16, 2011\
+ return "libpng version 1.5.1beta06 - January 20, 2011\
Copyright (c) 1998-2011 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@@ -1460,11 +1460,10 @@
{
double r = floor(100000 * fp + .5);
- if (r <= 2147483647. && r >= -2147483648.)
- return (png_fixed_point)r;
+ if (r > 2147483647. || r < -2147483648.)
+ png_fixed_error(png_ptr, text);
- png_fixed_error(png_ptr, text);
- /*NOT REACHED*/
+ return (png_fixed_point)r;
}
#endif
diff --git a/png.h b/png.h
index c08ad50..92665b1 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.5.1beta06 - January 16, 2011
+ * libpng version 1.5.1beta06 - January 20, 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.1beta06 - January 16, 2011: Glenn
+ * libpng versions 0.97, January 1998, through 1.5.1beta06 - January 20, 2011: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -176,7 +176,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.5.1beta06, January 16, 2011, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.5.1beta06, January 20, 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:
@@ -288,7 +288,7 @@
* Y2K compliance in libpng:
* =========================
*
- * January 16, 2011
+ * January 20, 2011
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -352,7 +352,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.5.1beta06"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.5.1beta06 - January 16, 2011\n"
+ " libpng version 1.5.1beta06 - January 20, 2011\n"
#define PNG_LIBPNG_VER_SONUM 15
#define PNG_LIBPNG_VER_DLLNUM 15
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 98898f5..23a74b2 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.5.1beta06 - January 16, 2011
+libpng version 1.5.1beta06 - January 20, 2011
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 8892e3d..a7c9e73 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
- * libpng version 1.5.1beta06 - January 16, 2011
+ * libpng version 1.5.1beta06 - January 20, 2011
*
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 58c8983..6465b98 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.5.1beta06 - January 16, 2011
+Makefiles for libpng version 1.5.1beta06 - January 20, 2011
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
