[master] Imported from libpng-1.2.39beta05.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 5ea80a7..faacc36 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.2.39beta04 - August 1, 2009
+Libpng 1.2.39beta05 - August 1, 2009
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,36 +9,36 @@
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- libpng-1.2.39beta04.txz (LZMA-compressed, recommended)
- libpng-1.2.39beta04.tar.gz
- libpng-1.2.39beta04.tar.bz2
+ libpng-1.2.39beta05.txz (LZMA-compressed, recommended)
+ libpng-1.2.39beta05.tar.gz
+ libpng-1.2.39beta05.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- libpng-1.2.39beta04-no-config.txz (LZMA-compressed, recommended)
- libpng-1.2.39beta04-no-config.tar.gz
- libpng-1.2.39beta04-no-config.tar.bz2
+ libpng-1.2.39beta05-no-config.txz (LZMA-compressed, recommended)
+ libpng-1.2.39beta05-no-config.tar.gz
+ libpng-1.2.39beta05-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp1239b04.zip
- lp1239b04.7z
- lp1239b04.tar.bz2
+ lp1239b05.zip
+ lp1239b05.7z
+ lp1239b05.tar.bz2
Project files
- libpng-1.2.39beta04-project-netware.zip
- libpng-1.2.39beta04-project-wince.zip
+ libpng-1.2.39beta05-project-netware.zip
+ libpng-1.2.39beta05-project-wince.zip
Other information:
- libpng-1.2.39beta04-README.txt
- libpng-1.2.39beta04-KNOWNBUGS.txt
- libpng-1.2.39beta04-LICENSE.txt
- libpng-1.2.39beta04-Y2K-compliance.txt
- libpng-1.2.39beta04-[previous version]-diff.txt
+ libpng-1.2.39beta05-README.txt
+ libpng-1.2.39beta05-KNOWNBUGS.txt
+ libpng-1.2.39beta05-LICENSE.txt
+ libpng-1.2.39beta05-Y2K-compliance.txt
+ libpng-1.2.39beta05-[previous version]-diff.txt
Changes since the last public release (1.2.38):
@@ -55,6 +55,14 @@
the documentation.
Rebuilt configure scripts with autoconf-2.64.
+version 1.2.39beta04 [August 1, 2009]
+ Replaced *.tar.lzma with *.txz in distribution. Get the xz codec
+ from <http://tukaani.org/xz>.
+
+version 1.2.39beta05 [August 1, 2009]
+ Reject attempt to write iCCP chunk with negative embedded profile length
+ (JD Chen)
+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 6c4f92b..00f89c4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2449,6 +2449,10 @@
Replaced *.tar.lzma with *.txz in distribution. Get the xz codec
from <http://tukaani.org/xz>.
+version 1.2.39beta05 [August 1, 2009]
+ Reject attempt to write iCCP chunk with negative embedded profile length
+ (JD Chen)
+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/INSTALL b/INSTALL
index 38eed02..021a8ca 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.39beta04 - August 1, 2009
+Installing libpng version 1.2.39beta05 - August 1, 2009
On Unix/Linux and similar systems, you can simply type
@@ -44,7 +44,7 @@
correspond to the version of zlib that's installed.
You can rename the directories that you downloaded (they
-might be called "libpng-1.2.39beta04" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.39beta05" or "lpng109" and "zlib-1.2.1"
or "zlib121") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:
@@ -101,9 +101,9 @@
CMakeLists.txt => "cmake" script
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng12.so.0.1.2.39beta04)
+ gcc, creates libpng12.so.0.1.2.39beta05)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.39beta04)
+ (gcc, creates libpng12.so.0.1.2.39beta05)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@@ -125,14 +125,14 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.sggcc => Silicon Graphics (gcc,
- creates libpng12.so.0.1.2.39beta04)
+ creates libpng12.so.0.1.2.39beta05)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng12.so.0.1.2.39beta04)
+ creates libpng12.so.0.1.2.39beta05)
makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc,
- creates libpng12.so.0.1.2.39beta04)
+ creates libpng12.so.0.1.2.39beta05)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng12.so.0.1.2.39beta04)
+ creates libpng12.so.0.1.2.39beta05)
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/KNOWNBUG b/KNOWNBUG
index 268f60a..ad879c8 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.2.39beta04
+Known bugs in libpng version 1.2.39beta05
1. February 23, 2006: The custom makefiles don't build libpng with -lz.
diff --git a/LICENSE b/LICENSE
index 383ab25..20c8a6c 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.39beta04, August 1, 2009, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.39beta05, August 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
diff --git a/Makefile.am b/Makefile.am
index 121a3ef..e6b9888 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,7 +86,7 @@
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.2.39beta04.txt pngvcrd.c
+ example.c libpng-1.2.39beta05.txt pngvcrd.c
CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \
libpng.sym
diff --git a/Makefile.in b/Makefile.in
index 11ab721..ee8e4fa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -352,7 +352,7 @@
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.2.39beta04.txt pngvcrd.c
+ example.c libpng-1.2.39beta05.txt pngvcrd.c
CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers \
libpng.sym
diff --git a/README b/README
index 354d78f..bfd5492 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.2.39beta04 - August 1, 2009 (shared library 12.0)
+README for libpng version 1.2.39beta05 - August 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.
@@ -194,11 +194,11 @@
descrip.mms => VMS makefile for MMS or MMK
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng12.so.0.1.2.39beta04)
+ gcc, creates libpng12.so.0.1.2.39beta05)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.39beta04)
+ (gcc, creates libpng12.so.0.1.2.39beta05)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.39beta04,
+ (gcc, creates libpng12.so.0.1.2.39beta05,
uses assembler code tuned for Intel MMX platform)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
@@ -220,12 +220,12 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
- (gcc, creates libpng12.so.0.1.2.39beta04)
+ (gcc, creates libpng12.so.0.1.2.39beta05)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng12.so.0.1.2.39beta04)
+ (gcc, creates libpng12.so.0.1.2.39beta05)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng12.so.0.1.2.39beta04)
+ (gcc, creates libpng12.so.0.1.2.39beta05)
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/Y2KINFO b/Y2KINFO
index 3a368c3..e3b3eca 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -7,7 +7,7 @@
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
- upward through 1.2.39beta04 are Y2K compliant. It is my belief that earlier
+ upward through 1.2.39beta05 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
diff --git a/configure b/configure
index c5a30a2..2e54104 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.64 for libpng 1.2.39beta04.
+# Generated by GNU Autoconf 2.64 for libpng 1.2.39beta05.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -698,8 +698,8 @@
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.2.39beta04'
-PACKAGE_STRING='libpng 1.2.39beta04'
+PACKAGE_VERSION='1.2.39beta05'
+PACKAGE_STRING='libpng 1.2.39beta05'
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.2.39beta04 to adapt to many kinds of systems.
+\`configure' configures libpng 1.2.39beta05 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.2.39beta04:";;
+ short | recursive ) echo "Configuration of libpng 1.2.39beta05:";;
esac
cat <<\_ACEOF
@@ -1609,7 +1609,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.2.39beta04
+libpng configure 1.2.39beta05
generated by GNU Autoconf 2.64
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2034,7 +2034,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.2.39beta04, which was
+It was created by libpng $as_me 1.2.39beta05, which was
generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
@@ -2842,7 +2842,7 @@
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.2.39beta04'
+ VERSION='1.2.39beta05'
cat >>confdefs.h <<_ACEOF
@@ -2906,7 +2906,7 @@
-PNGLIB_VERSION=1.2.39beta04
+PNGLIB_VERSION=1.2.39beta05
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=39
@@ -12047,7 +12047,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.2.39beta04, which was
+This file was extended by libpng $as_me 1.2.39beta05, which was
generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12111,7 +12111,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-libpng config.status 1.2.39beta04
+libpng config.status 1.2.39beta05
configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index ac78ea2..ed5604c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@
dnl Version number stuff here:
-AC_INIT([libpng], [1.2.39beta04], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.39beta05], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.2.39beta04
+PNGLIB_VERSION=1.2.39beta05
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=39
diff --git a/libpng-1.2.39beta04.txt b/libpng-1.2.39beta05.txt
similarity index 99%
rename from libpng-1.2.39beta04.txt
rename to libpng-1.2.39beta05.txt
index 986d906..e24cd12 100644
--- a/libpng-1.2.39beta04.txt
+++ b/libpng-1.2.39beta05.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.39beta04 - August 1, 2009
+ libpng version 1.2.39beta05 - August 1, 2009
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.2.39beta04 - August 1, 2009
+ libpng versions 0.97, January 1998, through 1.2.39beta05 - August 1, 2009
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -3063,7 +3063,7 @@
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.39beta04 are Y2K compliant. It is my belief that earlier
+upward through 1.2.39beta05 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 d206c76..2e086a0 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
.TH LIBPNG 3 "August 1, 2009"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.39beta04
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.39beta05
.SH SYNOPSIS
\fI\fB
@@ -821,7 +821,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.39beta04 - August 1, 2009
+ libpng version 1.2.39beta05 - August 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.39beta04 - August 1, 2009
+ libpng versions 0.97, January 1998, through 1.2.39beta05 - August 1, 2009
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -3884,7 +3884,7 @@
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.39beta04 are Y2K compliant. It is my belief that earlier
+upward through 1.2.39beta05 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
@@ -4159,7 +4159,7 @@
1.2.38rc01-03 13 10238 12.so.0.38[.0]
1.0.47 10 10047 10.so.0.47[.0]
1.2.38 13 10238 12.so.0.38[.0]
- 1.2.39beta01-04 13 10239 12.so.0.39[.0]
+ 1.2.39beta01-05 13 10239 12.so.0.39[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -4215,7 +4215,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.39beta04 - August 1, 2009:
+Libpng version 1.2.39beta05 - August 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).
@@ -4238,7 +4238,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.2.39beta04, August 1, 2009, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.39beta05, August 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
diff --git a/libpngpf.3 b/libpngpf.3
index 3ce18d6..ac09837 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "August 1, 2009"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.39beta04
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.39beta05
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.c b/png.c
index 3608a55..7a663be 100644
--- a/png.c
+++ b/png.c
@@ -16,7 +16,7 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_39beta04 Your_png_h_is_not_version_1_2_39beta04;
+typedef version_1_2_39beta05 Your_png_h_is_not_version_1_2_39beta05;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@@ -705,7 +705,7 @@
png_get_copyright(png_structp png_ptr)
{
png_ptr = png_ptr; /* Silence compiler warning about unused png_ptr */
- return ((png_charp) "\n libpng version 1.2.39beta04 - August 1, 2009\n\
+ return ((png_charp) "\n libpng version 1.2.39beta05 - August 1, 2009\n\
Copyright (c) 1998-2009 Glenn Randers-Pehrson\n\
Copyright (c) 1996-1997 Andreas Dilger\n\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
diff --git a/png.h b/png.h
index c7ccf03..3002f7c 100644
--- a/png.h
+++ b/png.h
@@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.39beta04 - August 1, 2009
+ * libpng version 1.2.39beta05 - August 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.39beta04 - August 1, 2009: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.39beta05 - August 1, 2009: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -237,7 +237,7 @@
* 1.2.38rc01-03 13 10238 12.so.0.38[.0]
* 1.0.47 10 10047 10.so.0.47[.0]
* 1.2.38 13 10238 12.so.0.38[.0]
- * 1.2.39beta01-04 13 10239 12.so.0.39[.0]
+ * 1.2.39beta01-05 13 10239 12.so.0.39[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -269,7 +269,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.2.39beta04, August 1, 2009, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.39beta05, August 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:
@@ -387,7 +387,7 @@
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
- * upward through 1.2.39beta04 are Y2K compliant. It is my belief that earlier
+ * upward through 1.2.39beta05 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
@@ -443,9 +443,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.39beta04"
+#define PNG_LIBPNG_VER_STRING "1.2.39beta05"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.39beta04 - August 1, 2009\n"
+ " libpng version 1.2.39beta05 - August 1, 2009\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@@ -458,7 +458,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
-#define PNG_LIBPNG_VER_BUILD 04
+#define PNG_LIBPNG_VER_BUILD 05
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -1510,7 +1510,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_2_39beta04;
+typedef png_structp version_1_2_39beta05;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index cd09f4e..cc235e4 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.2.39beta04 - August 1, 2009
+ * libpng version 1.2.39beta05 - August 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/pngtest.c b/pngtest.c
index 191944f..84bb24d 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1689,4 +1689,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_39beta04 your_png_h_is_not_version_1_2_39beta04;
+typedef version_1_2_39beta05 your_png_h_is_not_version_1_2_39beta05;
diff --git a/pngwutil.c b/pngwutil.c
index cd0d3d3..333a9e4 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -788,6 +788,14 @@
((*( (png_bytep)profile + 2))<< 8) |
((*( (png_bytep)profile + 3)) );
+ if (embedded_profile_len < 0)
+ {
+ png_warning(png_ptr,
+ "Embedded profile length in iCCP chunk is negative");
+ png_free(png_ptr, new_name);
+ return;
+ }
+
if (profile_len < embedded_profile_len)
{
png_warning(png_ptr,
@@ -2119,9 +2127,12 @@
png_uint_32 mins, bpp;
png_byte filter_to_do = png_ptr->do_filter;
png_uint_32 row_bytes = row_info->rowbytes;
-#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+#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");
+
png_debug(1, "in png_write_find_filter");
/* Find out how many bytes offset each pixel is */
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 79db3cf..943e529 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -172,7 +172,7 @@
# SET UP LINKS
set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 0.${PNGLIB_RELEASE}.1.2.39beta04
+# VERSION 0.${PNGLIB_RELEASE}.1.2.39beta05
VERSION 0.${PNGLIB_RELEASE}.0
SOVERSION 0
CLEAN_DIRECT_OUTPUT 1)
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index 17e1d0d..1d0a092 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
-version=1.2.39beta04
+version=1.2.39beta05
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 6544d36..d5954cb 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.2.39beta04
+Version: 1.2.39beta05
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 6349f96..48993cf 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 7812a34..9d82f1e 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index bc0d761..94bbea0 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -23,7 +23,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 3e4ce55..db46654 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 8158ab0..bbd8717 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -77,7 +77,7 @@
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 4e3460a..660fe5a 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -22,7 +22,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 12
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 44002b0..2410f2b 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index f9eebcb..bae8a5f 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index bf640dd..bded8bf 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -17,7 +17,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index e2788a4..cd587fb 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -21,7 +21,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index 0ac23f3..6cc3795 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index f4d43d2..e4a6f8b 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -21,7 +21,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 5e9e51c..69e4d92 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index d9b5973..cf1024a 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -77,7 +77,7 @@
LIBNAME = libpng12
PNGMAJ = 0
MINGDLL = 12
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index f90e253..0f95b3e 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.39beta04
+SHLIB_MINOR= 1.2.39beta05
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 c0f38e7..df00212 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -17,7 +17,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.2.39beta04
+SHLIB_MINOR= 1.2.39beta05
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.nommx b/scripts/makefile.nommx
index 2db803e..da772e2 100644
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index 3330e64..6eb7b50 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -11,7 +11,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.39beta04
+SHLIB_MINOR= 1.2.39beta05
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 92064d0..fb13dfb 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 17bbd16..b3a0d33 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -9,7 +9,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index bdbc835..796c976 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -9,7 +9,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 64ddd27..5cc7509 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -11,7 +11,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 5bcdf18..ae484d9 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index 1468850..bee8cb7 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.39beta04
+PNGMIN = 1.2.39beta05
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index a274f54..eb10fde 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.2.39beta04
+; Version 1.2.39beta05
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index dc4fc8b..73225b4 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.2.39beta04
+;Version 1.2.39beta05
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
