[libpng15] Imported from libpng-1.5.11beta01.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index b82d8e7..a29e717 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.5.11beta01 - April 27, 2012
+Libpng 1.5.11beta01 - April 28, 2012
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.
@@ -26,13 +26,13 @@
Changes since the last public release (1.5.10):
-Version 1.5.11 [April 27, 2012]
+Version 1.5.11 [April 28, 2012]
Revised scripts/makefile.darwin: use system zlib; remove quotes around
architecture list; add missing ppc architecture; add architecture options
to shared library link; don't try to create a shared lib based on missing
RELEASE variable.
Enable png_set_check_for_invalid_index() for both read and write.
- Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around
+ Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED/#endif in pngpriv.h around
declaration of png_handle_unknown().
Added -lssp_nonshared in a comment in scripts/makefile.freebsd
and changed deprecated NOOBJ and NOPROFILE to NO_OBJ and NO_PROFILE.
diff --git a/CHANGES b/CHANGES
index d797e67..52bd77b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3854,13 +3854,13 @@
Revised png_set_text_2() to avoid potential memory corruption (fixes
CVE-2011-3048).
-Version 1.5.11 [April 27, 2012]
+Version 1.5.11 [April 28, 2012]
Revised scripts/makefile.darwin: use system zlib; remove quotes around
architecture list; add missing ppc architecture; add architecture options
to shared library link; don't try to create a shared lib based on missing
RELEASE variable.
Enable png_set_check_for_invalid_index() for both read and write.
- Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around
+ Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED/#endif in pngpriv.h around
declaration of png_handle_unknown().
Added -lssp_nonshared in a comment in scripts/makefile.freebsd
and changed deprecated NOOBJ and NOPROFILE to NO_OBJ and NO_PROFILE.
diff --git a/LICENSE b/LICENSE
index 3858bcb..7aab249 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.11beta01, April 12, 2012, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.11beta01, April 28, 2012, 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
-April 12, 2012
+April 28, 2012
diff --git a/README b/README
index eadbd03..ce0d4e4 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.5.11beta01 - April 12, 2012 (shared library 15.0)
+README for libpng version 1.5.11beta01 - April 28, 2012 (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 ff5aae8..69e7d80 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-manual.txt - A description on how to use and modify libpng
- libpng version 1.5.11beta01 - April 12, 2012
+ libpng version 1.5.11beta01 - April 28, 2012
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.11beta01 - April 12, 2012
+ libpng versions 0.97, January 1998, through 1.5.11beta01 - April 28, 2012
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -799,7 +799,7 @@
will still have linear components.
Use this format if you have control over your
-compositing software and do don't do other arithmetic
+compositing software and so don't do other arithmetic
(such as scaling) on the data you get from libpng. Your
compositing software can simply copy opaque pixels to
the output but still has linear values for the
@@ -1130,6 +1130,11 @@
png_get_<chunk> are set directly if they are simple data types, or a
pointer into the info_ptr is returned for any complex types.
+The colorspace data from gAMA, cHRM, sRGB, iCCP, and sBIT chunks
+is simply returned to give the application information about how the
+image was encoded. Libpng itself only does transformations using the file
+gamma when combining semitransparent pixels with the background color.
+
png_get_PLTE(png_ptr, info_ptr, &palette,
&num_palette);
@@ -1141,7 +1146,7 @@
png_get_gAMA(png_ptr, info_ptr, &file_gamma);
png_get_gAMA_fixed(png_ptr, info_ptr, &int_file_gamma);
- file_gamma - the gamma at which the file is
+ file_gamma - the gamma at which the file was
written (PNG_INFO_gAMA)
int_file_gamma - 100,000 times the gamma at which the
@@ -4597,7 +4602,7 @@
XIV. Y2K Compliance in libpng
-April 12, 2012
+April 28, 2012
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 a6a073e..92a1143 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "April 12, 2012"
+.TH LIBPNG 3 "April 28, 2012"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11beta01
.SH SYNOPSIS
@@ -979,9 +979,9 @@
compression library.
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-manual.txt - A description on how to use and modify libpng
- libpng version 1.5.11beta01 - April 12, 2012
+ libpng version 1.5.11beta01 - April 28, 2012
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -992,7 +992,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.5.11beta01 - April 12, 2012
+ libpng versions 0.97, January 1998, through 1.5.11beta01 - April 28, 2012
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -1780,7 +1780,7 @@
will still have linear components.
Use this format if you have control over your
-compositing software and do don't do other arithmetic
+compositing software and so don't do other arithmetic
(such as scaling) on the data you get from libpng. Your
compositing software can simply copy opaque pixels to
the output but still has linear values for the
@@ -2111,6 +2111,11 @@
png_get_<chunk> are set directly if they are simple data types, or a
pointer into the info_ptr is returned for any complex types.
+The colorspace data from gAMA, cHRM, sRGB, iCCP, and sBIT chunks
+is simply returned to give the application information about how the
+image was encoded. Libpng itself only does transformations using the file
+gamma when combining semitransparent pixels with the background color.
+
png_get_PLTE(png_ptr, info_ptr, &palette,
&num_palette);
@@ -2122,7 +2127,7 @@
png_get_gAMA(png_ptr, info_ptr, &file_gamma);
png_get_gAMA_fixed(png_ptr, info_ptr, &int_file_gamma);
- file_gamma - the gamma at which the file is
+ file_gamma - the gamma at which the file was
written (PNG_INFO_gAMA)
int_file_gamma - 100,000 times the gamma at which the
@@ -5579,7 +5584,7 @@
.SH XIV. Y2K Compliance in libpng
-April 12, 2012
+April 28, 2012
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -5855,7 +5860,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.5.11beta01 - April 12, 2012:
+Libpng version 1.5.11beta01 - April 28, 2012:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -5878,7 +5883,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.5.11beta01, April 12, 2012, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.11beta01, April 28, 2012, 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
@@ -5977,7 +5982,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-April 12, 2012
+April 28, 2012
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 2b66dbf..33890e2 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "April 12, 2012"
+.TH LIBPNGPF 3 "April 28, 2012"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11beta01
(private functions)
diff --git a/png.5 b/png.5
index 40d77ad..9e22ab6 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "April 12, 2012"
+.TH PNG 5 "April 28, 2012"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 6a6516b..b6ef3a6 100644
--- a/png.c
+++ b/png.c
@@ -655,13 +655,13 @@
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.5.11beta01 - April 12, 2012" PNG_STRING_NEWLINE \
+ "libpng version 1.5.11beta01 - April 28, 2012" 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.11beta01 - April 12, 2012\
+ return "libpng version 1.5.11beta01 - April 28, 2012\
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 71d3e21..257dfe0 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.5.11beta01 - April 12, 2012
+ * libpng version 1.5.11beta01 - April 28, 2012
* Copyright (c) 1998-2012 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.11beta01 - April 12, 2012: Glenn
+ * libpng versions 0.97, January 1998, through 1.5.11beta01 - April 28, 2012: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -206,7 +206,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.5.11beta01, April 12, 2012, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.5.11beta01, April 28, 2012, are
* Copyright (c) 2004, 2006-2012 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:
@@ -318,7 +318,7 @@
* Y2K compliance in libpng:
* =========================
*
- * April 12, 2012
+ * April 28, 2012
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -384,7 +384,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.5.11beta01"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.5.11beta01 - April 12, 2012\n"
+ " libpng version 1.5.11beta01 - April 28, 2012\n"
#define PNG_LIBPNG_VER_SONUM 15
#define PNG_LIBPNG_VER_DLLNUM 15
diff --git a/pngconf.h b/pngconf.h
index 1daf8d5..f7817ce 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.5.11beta01 - April 12, 2012
+ * libpng version 1.5.11beta01 - April 28, 2012
*
* Copyright (c) 1998-2012 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 173e9d4..24b9390 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.5.11beta01 - April 12, 2012
+libpng version 1.5.11beta01 - April 28, 2012
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 213a322..ab64899 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.11beta01 - April 12, 2012
+ * libpng version 1.5.11beta01 - April 28, 2012
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 6cda45e..6cf2dd0 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.5.11beta01 - April 12, 2012
+Makefiles for libpng version 1.5.11beta01 - April 28, 2012
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index f84928d..95142c3 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -3,7 +3,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng 1.5.11beta01 - April 12, 2012 */
+/* Libpng 1.5.11beta01 - April 28, 2012 */
/* Copyright (c) 1998-2012 Glenn Randers-Pehrson */
