[master] Imported from libpng-1.4.3rc03.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index a190cec..881d95c 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.4.3rc02 - June 23, 2010
+Libpng 1.4.3rc03 - June 24, 2010
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.
@@ -9,20 +9,20 @@
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- 1.4.3rc02.tar.xz (LZMA-compressed, recommended)
- 1.4.3rc02.tar.gz
- 1.4.3rc02.tar.bz2
+ 1.4.3rc03.tar.xz (LZMA-compressed, recommended)
+ 1.4.3rc03.tar.gz
+ 1.4.3rc03.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp143r02.zip
- lp143r02.7z
+ lp143r03.zip
+ lp143r03.7z
Other information:
- 1.4.3rc02-README.txt
- 1.4.3rc02-LICENSE.txt
+ 1.4.3rc03-README.txt
+ 1.4.3rc03-LICENSE.txt
Changes since the last public release (1.4.2):
@@ -49,9 +49,15 @@
version 1.4.3rc01 [June 21, 2010]
Revised some comments in png_process_IDAT_data().
-version 1.4.2rc02 [June 23, 2010]
+version 1.4.3rc03 [June 24, 2010]
+ Revised pngpread.c patch of beta05 to avoid an endless loop.
+
Changed char *msg to PNG_CONST char *msg in pngrutil.c
Stop memory leak when reading a malformed sCAL chunk.
+ Removed some trailing blanks.
+
+version 1.4.3rc03 [June 24, 2010]
+ Revised pngpread.c patch of beta05 to avoid an endless loop.
Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 0f3ebd3..f4f9cb8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2599,9 +2599,13 @@
version 1.4.3rc01 [June 21, 2010]
Revised some comments in png_process_IDAT_data().
-version 1.4.3rc02 [June 23, 2010]
+version 1.4.3rc02 [June 22, 2010]
Changed char *msg to PNG_CONST char *msg in pngrutil.c
Stop memory leak when reading a malformed sCAL chunk.
+ Removed some trailing blanks.
+
+version 1.4.3rc03 [June 24, 2010]
+ Revised pngpread.c patch of beta05 to avoid an endless loop.
Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3be461d..4fee5c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -213,7 +213,7 @@
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 14.${PNGLIB_RELEASE}.1.4.3rc02
+# VERSION 14.${PNGLIB_RELEASE}.1.4.3rc03
VERSION 14.${PNGLIB_RELEASE}.0
SOVERSION 14
CLEAN_DIRECT_OUTPUT 1)
diff --git a/INSTALL b/INSTALL
index e7481ab..73c0991 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.4.3rc02 - June 23, 2010
+Installing libpng version 1.4.3rc03 - June 24, 2010
On Unix/Linux and similar systems, you can simply type
@@ -46,7 +46,7 @@
correspond to the version of zlib that's installed.
You can rename the directories that you downloaded (they
-might be called "libpng-1.4.3rc02" or "libpng14" and "zlib-1.2.3"
+might be called "libpng-1.4.3rc03" or "libpng14" and "zlib-1.2.3"
or "zlib123") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:
diff --git a/LICENSE b/LICENSE
index ee637f2..512ec3b 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.4.3rc02, June 23, 2010, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.3rc03, June 24, 2010, 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
@@ -108,4 +108,4 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-June 23, 2010
+June 24, 2010
diff --git a/Makefile.am b/Makefile.am
index 24112f0..b7edcd2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,7 +73,7 @@
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.4.3rc02.txt
+ example.c libpng-1.4.3rc03.txt
CLEANFILES= pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \
libpng.sym
diff --git a/Makefile.in b/Makefile.in
index 1398a3a..1be1275 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -333,7 +333,7 @@
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.4.3rc02.txt
+ example.c libpng-1.4.3rc03.txt
CLEANFILES = pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \
libpng.sym
diff --git a/README b/README
index ab62b3c..b7a70cf 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.3rc02 - June 23, 2010 (shared library 14.0)
+README for libpng version 1.4.3rc03 - June 24, 2010 (shared library 14.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@@ -185,9 +185,9 @@
makefile.std => Generic UNIX makefile (cc, creates static
libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng14.so.14.1.4.3rc02)
+ gcc, creates libpng14.so.14.1.4.3rc03)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.14.1.4.3rc02)
+ (gcc, creates libpng14.so.14.1.4.3rc03)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@@ -209,12 +209,12 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
- (gcc, creates libpng14.so.14.1.4.3rc02)
+ (gcc, creates libpng14.so.14.1.4.3rc03)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng14.so.14.1.4.3rc02)
+ (gcc, creates libpng14.so.14.1.4.3rc03)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng14.so.14.1.4.3rc02)
+ (gcc, creates libpng14.so.14.1.4.3rc03)
makefile.32sunu => Sun Ultra 32-bit makefile
makefile.64sunu => Sun Ultra 64-bit makefile
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
diff --git a/configure b/configure
index 874c9e5..677ccff 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for libpng 1.4.3rc02.
+# Generated by GNU Autoconf 2.65 for libpng 1.4.3rc03.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -701,8 +701,8 @@
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.4.3rc02'
-PACKAGE_STRING='libpng 1.4.3rc02'
+PACKAGE_VERSION='1.4.3rc03'
+PACKAGE_STRING='libpng 1.4.3rc03'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''
@@ -1432,7 +1432,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libpng 1.4.3rc02 to adapt to many kinds of systems.
+\`configure' configures libpng 1.4.3rc03 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1502,7 +1502,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.4.3rc02:";;
+ short | recursive ) echo "Configuration of libpng 1.4.3rc03:";;
esac
cat <<\_ACEOF
@@ -1607,7 +1607,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.4.3rc02
+libpng configure 1.4.3rc03
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2032,7 +2032,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libpng $as_me 1.4.3rc02, which was
+It was created by libpng $as_me 1.4.3rc03, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2840,7 +2840,7 @@
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.4.3rc02'
+ VERSION='1.4.3rc03'
cat >>confdefs.h <<_ACEOF
@@ -2904,7 +2904,7 @@
-PNGLIB_VERSION=1.4.3rc02
+PNGLIB_VERSION=1.4.3rc03
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
PNGLIB_RELEASE=3
@@ -12032,7 +12032,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libpng $as_me 1.4.3rc02, which was
+This file was extended by libpng $as_me 1.4.3rc03, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12098,7 +12098,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libpng config.status 1.4.3rc02
+libpng config.status 1.4.3rc03
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 1635a21..2f220f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@
dnl Version number stuff here:
-AC_INIT([libpng], [1.4.3rc02], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.4.3rc03], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.4.3rc02
+PNGLIB_VERSION=1.4.3rc03
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
PNGLIB_RELEASE=3
diff --git a/libpng-1.4.3rc02.txt b/libpng-1.4.3rc03.txt
similarity index 99%
rename from libpng-1.4.3rc02.txt
rename to libpng-1.4.3rc03.txt
index 0a6f431..dfcf1c5 100644
--- a/libpng-1.4.3rc02.txt
+++ b/libpng-1.4.3rc03.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.3rc02 - June 23, 2010
+ libpng version 1.4.3rc03 - June 24, 2010
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.4.3rc02 - June 23, 2010
+ libpng versions 0.97, January 1998, through 1.4.3rc03 - June 24, 2010
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -903,7 +903,7 @@
As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
added. It expands the sample depth without changing tRNS to alpha.
-As of libpng version 1.4.3rc02, not all possible expansions are supported.
+As of libpng version 1.4.3rc03, not all possible expansions are supported.
In the following table, the 01 means grayscale with depth<8, 31 means
indexed with depth<8, other numerals represent the color type, "T" means
@@ -3297,13 +3297,13 @@
XIII. Y2K Compliance in libpng
-June 23, 2010
+June 24, 2010
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.4.3rc02 are Y2K compliant. It is my belief that earlier
+upward through 1.4.3rc03 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
Libpng only has three year fields. One is a 2-byte unsigned integer that
diff --git a/libpng.3 b/libpng.3
index 775c7f4..6d28f5e 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "June 23, 2010"
+.TH LIBPNG 3 "June 24, 2010"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.3rc02
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.3rc03
.SH SYNOPSIS
\fI\fB
@@ -785,7 +785,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.3rc02 - June 23, 2010
+ libpng version 1.4.3rc03 - June 24, 2010
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -796,7 +796,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.4.3rc02 - June 23, 2010
+ libpng versions 0.97, January 1998, through 1.4.3rc03 - June 24, 2010
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -1688,7 +1688,7 @@
As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
added. It expands the sample depth without changing tRNS to alpha.
-As of libpng version 1.4.3rc02, not all possible expansions are supported.
+As of libpng version 1.4.3rc03, not all possible expansions are supported.
In the following table, the 01 means grayscale with depth<8, 31 means
indexed with depth<8, other numerals represent the color type, "T" means
@@ -4082,13 +4082,13 @@
.SH XIII. Y2K Compliance in libpng
-June 23, 2010
+June 24, 2010
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.4.3rc02 are Y2K compliant. It is my belief that earlier
+upward through 1.4.3rc03 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
Libpng only has three year fields. One is a 2-byte unsigned integer that
@@ -4270,7 +4270,7 @@
1.4.2rc02-06 14 10402 14.so.14.2[.0]
1.4.2 14 10402 14.so.14.2[.0]
1.4.3beta01-05 14 10403 14.so.14.3[.0]
- 1.4.3rc01-02 14 10403 14.so.14.3[.0]
+ 1.4.3rc01-03 14 10403 14.so.14.3[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -4326,7 +4326,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.4.3rc02 - June 23, 2010:
+Libpng version 1.4.3rc03 - June 24, 2010:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -4349,7 +4349,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.4.3rc02, June 23, 2010, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.3rc03, June 24, 2010, 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
@@ -4448,7 +4448,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-June 23, 2010
+June 24, 2010
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index af67adc..6c30c18 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "June 23, 2010"
+.TH LIBPNGPF 3 "June 24, 2010"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.3rc02
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.3rc03
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index d0e6a03..92016a0 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "June 23, 2010"
+.TH PNG 5 "June 24, 2010"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 2621d10..64d8005 100644
--- a/png.c
+++ b/png.c
@@ -17,7 +17,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_3rc02 Your_png_h_is_not_version_1_4_3rc02;
+typedef version_1_4_3rc03 Your_png_h_is_not_version_1_4_3rc03;
/* Version information for C files. This had better match the version
* string defined in png.h.
@@ -551,13 +551,13 @@
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
- "libpng version 1.4.3rc02 - June 23, 2010" PNG_STRING_NEWLINE \
+ "libpng version 1.4.3rc03 - June 24, 2010" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2010 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 ((png_charp) "libpng version 1.4.3rc02 - June 23, 2010\
+ return ((png_charp) "libpng version 1.4.3rc03 - June 24, 2010\
Copyright (c) 1998-2010 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 b6c0739..10dd55c 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.4.3rc02 - June 23, 2010
+ * libpng version 1.4.3rc03 - June 24, 2010
* Copyright (c) 1998-2010 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.4.3rc02 - June 23, 2010: Glenn
+ * libpng versions 0.97, January 1998, through 1.4.3rc03 - June 24, 2010: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -143,7 +143,7 @@
* 1.4.2rc02-06 14 10402 14.so.14.2[.0]
* 1.4.2 14 10402 14.so.14.2[.0]
* 1.4.3beta01-05 14 10403 14.so.14.3[.0]
- * 1.4.3rc01-02 14 10403 14.so.14.3[.0]
+ * 1.4.3rc01-03 14 10403 14.so.14.3[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -175,7 +175,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.4.3rc02, June 23, 2010, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.3rc03, June 24, 2010, are
* Copyright (c) 2004, 2006-2010 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:
@@ -287,13 +287,13 @@
* Y2K compliance in libpng:
* =========================
*
- * June 23, 2010
+ * June 24, 2010
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
- * upward through 1.4.3rc02 are Y2K compliant. It is my belief that earlier
+ * upward through 1.4.3rc03 are Y2K compliant. It is my belief that earlier
* versions were also Y2K compliant.
*
* Libpng only has three year fields. One is a 2-byte unsigned integer
@@ -349,9 +349,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.4.3rc02"
+#define PNG_LIBPNG_VER_STRING "1.4.3rc03"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.4.3rc02 - June 23, 2010\n"
+ " libpng version 1.4.3rc03 - June 24, 2010\n"
#define PNG_LIBPNG_VER_SONUM 14
#define PNG_LIBPNG_VER_DLLNUM 14
@@ -364,7 +364,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
-#define PNG_LIBPNG_VER_BUILD 02
+#define PNG_LIBPNG_VER_BUILD 03
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -1473,7 +1473,7 @@
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
-typedef png_structp version_1_4_3rc02;
+typedef png_structp version_1_4_3rc03;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index ecce58b..929a8b7 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.4.3rc02 - June 23, 2010
+ * libpng version 1.4.3rc03 - June 24, 2010
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngpread.c b/pngpread.c
index 1f48d4a..00dd831 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode
*
- * Last changed in libpng 1.4.3 [June 23, 2010]
+ * Last changed in libpng 1.4.3 [June 24, 2010]
* Copyright (c) 1998-2010 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.)
@@ -910,11 +910,11 @@
/* Do we have a complete row? */
if (png_ptr->zstream.avail_out == 0)
png_push_process_row(png_ptr);
-
- /* And check for the end of the stream. */
- if (ret == Z_STREAM_END)
- png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
}
+
+ /* And check for the end of the stream. */
+ if (ret == Z_STREAM_END)
+ png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
}
/* All the data should have been processed, if anything
@@ -1429,7 +1429,7 @@
tmp = text;
text = (png_charp)png_malloc(png_ptr, text_size +
- (png_ptr->zbuf_size
+ (png_ptr->zbuf_size
- png_ptr->zstream.avail_out + 1));
png_memcpy(text, tmp, text_size);
@@ -1651,7 +1651,7 @@
}
#endif
png_memcpy((png_charp)png_ptr->unknown_chunk.name,
- (png_charp)png_ptr->chunk_name,
+ (png_charp)png_ptr->chunk_name,
png_sizeof(png_ptr->unknown_chunk.name));
png_ptr->unknown_chunk.name[png_sizeof(png_ptr->unknown_chunk.name) - 1]
= '\0';
diff --git a/pngpriv.h b/pngpriv.h
index 2d56057..f6467a7 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
- * libpng version 1.4.3rc02 - June 23, 2010
+ * libpng version 1.4.3rc03 - June 24, 2010
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrutil.c b/pngrutil.c
index cacd676..6a6c7e3 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
- * Last changed in libpng 1.4.3 [June 23, 2010]
+ * Last changed in libpng 1.4.3 [June 24, 2010]
* Copyright (c) 1998-2010 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.)
@@ -326,8 +326,10 @@
if (png_ptr->user_chunk_malloc_max &&
(prefix_size + expanded_size >= png_ptr->user_chunk_malloc_max - 1))
#else
+# ifdef PNG_USER_CHUNK_MALLOC_MAX
if ((PNG_USER_CHUNK_MALLOC_MAX > 0) &&
prefix_size + expanded_size >= PNG_USER_CHUNK_MALLOC_MAX - 1)
+# endif
#endif
png_warning(png_ptr, "Exceeded size limit while expanding chunk");
@@ -363,7 +365,7 @@
*newlength = prefix_size + expanded_size;
return; /* The success return! */
}
-
+
png_warning(png_ptr, "png_inflate logic error");
png_free(png_ptr, text);
}
diff --git a/pngtest.c b/pngtest.c
index 7341d02..f639811 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1627,4 +1627,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_3rc02 your_png_h_is_not_version_1_4_3rc02;
+typedef version_1_4_3rc03 your_png_h_is_not_version_1_4_3rc03;
diff --git a/pngwutil.c b/pngwutil.c
index 20cff32..19feb1d 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -2106,7 +2106,7 @@
png_uint_32 row_bytes = row_info->rowbytes;
#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
int num_p_filters = (int)png_ptr->num_prev_filters;
-#endif
+#endif
png_debug(1, "in png_write_find_filter");
@@ -2116,7 +2116,7 @@
/* These will never be selected so we need not test them. */
filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_PAETH);
}
-#endif
+#endif
/* Find out how many bytes offset each pixel is */
bpp = (row_info->pixel_depth + 7) >> 3;
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 585b816..6e0a023 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.4.3rc02 - June 23, 2010
+libpng version 1.4.3rc03 - June 24, 2010
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index bae9906..22c1b86 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source and build
*
- * libpng version 1.4.3rc02 - June 23, 2010
+ * libpng version 1.4.3rc03 - June 24, 2010
*
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
diff --git a/projects/xcode/libpng.xcodeproj/project.pbxproj b/projects/xcode/libpng.xcodeproj/project.pbxproj
index 834224b..80155d2 100644
--- a/projects/xcode/libpng.xcodeproj/project.pbxproj
+++ b/projects/xcode/libpng.xcodeproj/project.pbxproj
@@ -226,7 +226,7 @@
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 14;
DYLIB_CURRENT_VERSION = 14;
- FRAMEWORK_VERSION = 1.4.3rc02;
+ FRAMEWORK_VERSION = 1.4.3rc03;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = Info.plist;
@@ -244,7 +244,7 @@
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 14;
DYLIB_CURRENT_VERSION = 14;
- FRAMEWORK_VERSION = 1.4.3rc02;
+ FRAMEWORK_VERSION = 1.4.3rc03;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = Info.plist;
diff --git a/scripts/README.txt b/scripts/README.txt
index e30d245..156a95f 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,8 +1,8 @@
-Makefiles for libpng version 1.4.3rc02 - June 23, 2010
+Makefiles for libpng version 1.4.3rc03 - June 24, 2010
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.14.1.4.3rc02)
+ (gcc, creates libpng14.so.14.1.4.3rc03)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@@ -20,7 +20,7 @@
makefile.dec => DEC Alpha UNIX makefile
makefile.dj2 => DJGPP 2 makefile
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng14.so.14.1.4.3rc02)
+ gcc, creates libpng14.so.14.1.4.3rc03)
makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile
makefile.hpgcc => HPUX makefile using gcc
@@ -36,12 +36,12 @@
makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def)
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
makefile.sggcc => Silicon Graphics (gcc,
- creates libpng14.so.14.1.4.3rc02)
+ creates libpng14.so.14.1.4.3rc03)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng14.so.14.1.4.3rc02)
+ creates libpng14.so.14.1.4.3rc03)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng14.so.14.1.4.3rc02)
+ creates libpng14.so.14.1.4.3rc03)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index 9dd5a58..229a199 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
-version=1.4.3rc02
+version=1.4.3rc03
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 612033d..ff252d7 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@
Name: libpng
Description: Loads and saves PNG files
-Version: 1.4.3rc02
+Version: 1.4.3rc03
Libs: -L${libdir} -lpng14
Cflags: -I${includedir}
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 9eb26f5..2f33e2d 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@
LIB= png14
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.3rc02
+SHLIB_MINOR= 1.4.3rc03
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index af1d09b..9b867cb 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -17,7 +17,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.4.3rc02
+SHLIB_MINOR= 1.4.3rc03
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index 743df63..6f5b473 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -11,7 +11,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.3rc02
+SHLIB_MINOR= 1.4.3rc03
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/png32ce.def b/scripts/png32ce.def
index ad83931..9a4d8db 100644
--- a/scripts/png32ce.def
+++ b/scripts/png32ce.def
@@ -15,7 +15,7 @@
png_get_int_32
EXPORTS
-;Version 1.4.3rc02
+;Version 1.4.3rc03
png_build_grayscale_palette @1
; png_check_sig @2
png_chunk_error @3
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index eba3a92..a1b6a49 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.4.3rc02
+; Version 1.4.3rc03
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngwin.def b/scripts/pngwin.def
index 0b33fc0..20b5ff3 100644
--- a/scripts/pngwin.def
+++ b/scripts/pngwin.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.4.3rc02
+;Version 1.4.3rc03
png_build_grayscale_palette
png_chunk_error
png_chunk_warning
