[master] Imported from libpng-1.2.41beta03.tar
diff --git a/INSTALL b/INSTALL
index dc8c2f7..ff76d0f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.41beta03 - September 30, 2009
+Installing libpng version 1.2.41beta03 - October 1, 2009
On Unix/Linux and similar systems, you can simply type
diff --git a/LICENSE b/LICENSE
index 0cf2d04..51fe301 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.2.41beta03, September 30, 2009, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.41beta03, October 1, 2009, are
Copyright (c) 2004, 2006-2009 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
-September 30, 2009
+October 1, 2009
diff --git a/README b/README
index ce76b2c..4ad8e9c 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.2.41beta03 - September 30, 2009 (shared library 12.0)
+README for libpng version 1.2.41beta03 - October 1, 2009 (shared library 12.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/Y2KINFO b/Y2KINFO
index 6e896ae..8d8995e 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,7 +1,7 @@
Y2K compliance in libpng:
=========================
- September 30, 2009
+ October 1, 2009
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 0ccd463..409a0e5 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "September 30, 2009"
+.TH LIBPNG 3 "October 1, 2009"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.41beta03
.SH SYNOPSIS
@@ -821,7 +821,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.41beta03 - September 30, 2009
+ libpng version 1.2.41beta03 - October 1, 2009
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -832,7 +832,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.2.41beta03 - September 30, 2009
+ libpng versions 0.97, January 1998, through 1.2.41beta03 - October 1, 2009
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -1366,10 +1366,33 @@
for PNG 1.0)
interlace_type - (PNG_INTERLACE_NONE or
PNG_INTERLACE_ADAM7)
- Any or all of interlace_type, compression_type, of
+
+ Any or all of interlace_type, compression_type, or
filter_method can be NULL if you are
not interested in their values.
+ Note that png_get_IHDR() returns 32-bit data into
+ the application's width and height variables.
+ This is an unsafe situation if these are 16-bit
+ variables. In such situations, the
+ png_get_image_width() and png_get_image_height()
+ functions described below are safer.
+
+ width = png_get_image_width(png_ptr,
+ info_ptr);
+ height = png_get_image_height(png_ptr,
+ info_ptr);
+ bit_depth = png_get_bit_depth(png_ptr,
+ info_ptr);
+ color_type = png_get_color_type(png_ptr,
+ info_ptr);
+ filter_method = png_get_filter_type(png_ptr,
+ info_ptr);
+ compression_type = png_get_compression_type(png_ptr,
+ info_ptr);
+ interlace_type = png_get_interlace_type(png_ptr,
+ info_ptr);
+
channels = png_get_channels(png_ptr, info_ptr);
channels - number of channels of info for the
color type (valid values are 1 (GRAY,
@@ -1389,23 +1412,6 @@
be in signature[4] through signature[7]
(see png_set_sig_bytes())).
-
- width = png_get_image_width(png_ptr,
- info_ptr);
- height = png_get_image_height(png_ptr,
- info_ptr);
- bit_depth = png_get_bit_depth(png_ptr,
- info_ptr);
- color_type = png_get_color_type(png_ptr,
- info_ptr);
- filter_method = png_get_filter_type(png_ptr,
- info_ptr);
- compression_type = png_get_compression_type(png_ptr,
- info_ptr);
- interlace_type = png_get_interlace_type(png_ptr,
- info_ptr);
-
-
These are also important, but their validity depends on whether the chunk
has been read. The png_get_valid(png_ptr, info_ptr, PNG_INFO_<chunk>) and
png_get_<chunk>(png_ptr, info_ptr, ...) functions return non-zero if the
@@ -3803,6 +3809,15 @@
are usually indented the same as the first line of the statement
plus four more spaces.
+For macro definitions we use 2-space indentation, always leaving the "#"
+in the first column.
+
+ #ifndef PNG_NO_FEATURE
+ # ifndef PNG_FEATURE_SUPPORTED
+ # define PNG_FEATURE_SUPPORTED
+ # endif
+ #endif
+
Comments appear with the leading "/*" at the same indentation as
the statement that follows the comment:
@@ -3879,7 +3894,7 @@
.SH XIII. Y2K Compliance in libpng
-September 30, 2009
+October 1, 2009
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -4225,7 +4240,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.41beta03 - September 30, 2009:
+Libpng version 1.2.41beta03 - October 1, 2009:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -4248,7 +4263,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.2.41beta03, September 30, 2009, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.41beta03, October 1, 2009, are
Copyright (c) 2004,2006-2008 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
@@ -4347,7 +4362,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-September 30, 2009
+October 1, 2009
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 1233a2f..84a69f0 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "September 30, 2009"
+.TH LIBPNGPF 3 "October 1, 2009"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.41beta03
(private functions)
diff --git a/png.5 b/png.5
index 0577d65..321e83a 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "September 30, 2009"
+.TH PNG 5 "October 1, 2009"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.h b/png.h
index 2289109..2da05be 100644
--- a/png.h
+++ b/png.h
@@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.41beta03 - September 30, 2009
+ * libpng version 1.2.41beta03 - October 1, 2009
* Copyright (c) 1998-2009 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.)
@@ -10,7 +10,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.2.41beta03 - September 30, 2009: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.41beta03 - October 1, 2009: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -277,7 +277,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.2.41beta03, September 30, 2009, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.41beta03, October 1, 2009, are
* Copyright (c) 2004, 2006-2009 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:
@@ -389,7 +389,7 @@
* Y2K compliance in libpng:
* =========================
*
- * September 30, 2009
+ * October 1, 2009
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -453,7 +453,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.41beta03"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.41beta03 - September 30, 2009\n"
+ " libpng version 1.2.41beta03 - October 1, 2009\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
diff --git a/pngconf.h b/pngconf.h
index bfb86c4..95a30f7 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.2.41beta03 - September 30, 2009
+ * libpng version 1.2.41beta03 - October 1, 2009
* Copyright (c) 1998-2009 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.)
diff --git a/pngwutil.c b/pngwutil.c
index ddbfa66..af36302 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@
/* pngwutil.c - utilities to write a PNG file
*
- * Last changed in libpng 1.2.40 [September 30, 2009]
+ * Last changed in libpng 1.2.40 [October 1, 2009]
* Copyright (c) 1998-2009 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.)
