[libpng10] Imported from libpng-1.0.41rc01.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 8917c5c..589cb92 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,53 +1,62 @@
-Libpng 1.0.40 - September 18, 2008
+Libpng 1.0.41rc01 - October 26, 2008
-This is a public release of libpng, intended for use in production codes.
+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.
Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- libpng-1.0.40.tar.gz
- libpng-1.0.40.tar.lzma
+ libpng-1.0.41rc01.tar.gz
+ libpng-1.0.41rc01.tar.lzma
(Get the lzma codec from <http://tukaani.org/lzma>).
- libpng-1.0.40.tar.bz2
+ libpng-1.0.41rc01.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- libpng-1.0.40-no-config.tar.gz
- libpng-1.0.40-no-config.tar.lzma
- libpng-1.0.40-no-config.tar.bz2
+ libpng-1.0.41rc01-no-config.tar.gz
+ libpng-1.0.41rc01-no-config.tar.lzma
+ libpng-1.0.41rc01-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lpng1040.zip
- lpng1040.7z
- lpng1040.tar.bz2
+ lp1041r01.zip
+ lp1041r01.7z
+ lp1041r01.tar.bz2
Project files
- libpng-1.0.40-project-netware.zip
- libpng-1.0.40-project-wince.zip
+ libpng-1.0.41rc01-project-netware.zip
+ libpng-1.0.41rc01-project-wince.zip
Other information:
- libpng-1.0.40-README.txt
- libpng-1.0.40-KNOWNBUGS.txt
- libpng-1.0.40-LICENSE.txt
- libpng-1.0.40-Y2K-compliance.txt
+ libpng-1.0.41rc01-README.txt
+ libpng-1.0.41rc01-KNOWNBUGS.txt
+ libpng-1.0.41rc01-LICENSE.txt
+ libpng-1.0.41rc01-Y2K-compliance.txt
+ libpng-1.0.41rc01-[previous version]-diff.txt
-Changes since the last public release (1.0.39):
+Changes since the last public release (1.0.40):
-version 1.0.40 [September 18, 2008]
+version 1.2.33beta01 [October 6, 2008]
+ Revised makefile.darwin to fix shared library numbering.
+ Change png_set_gray_1_2_4_to_8() to png_set_expand_gray_1_2_4_to_8()
+ in example.c (debian bug report)
- Shortened tIME_string to 29 bytes in pngtest.c
- Fixed off-by-one error introduced in png_push_read_zTXt() function in
- libpng-1.2.30/pngpread.c (Harald van Dijk)
+version 1.2.33rc01 [October 15, 2008]
+ No changes.
+
+version 1.0.41rc01, version 1.2.33rc02 [October 26, 2008]
+ Changed remaining "key" to "png_ptr->chunkdata" in png_handle_tTXt()
+ to avoid memory leak after memory failure while reading tEXt chunk.`
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
+
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
to subscribe) or to glennrp at users.sourceforge.net
diff --git a/CHANGES b/CHANGES
index 6a059cc..7417d8a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2175,7 +2175,7 @@
version 1.2.30beta04 [July 10, 2008]
Merged more cosmetic whitespace changes from libpng-1.4.0beta19.
-version 1.0.38rc01, 1.2.30rc01 [September 18, 2008]
+version 1.0.38rc01, 1.2.30rc01 [October 26, 2008]
No changes.
version 1.0.38rc02, 1.2.30rc02 [July 21, 2008]
@@ -2229,13 +2229,27 @@
No changes.
version 1.2.32beta01 [September 6, 2008]
- Shortened tIME_string to 29 bytes in pngtest.c
+ Shortened tIME_string to 29 bytes in pngtest.c (bug introduced in
+ libpng-1.2.22).
Fixed off-by-one error introduced in png_push_read_zTXt() function in
libpng-1.2.30beta04/pngpread.c (Harald van Dijk)
+ These bugs have been given the vulnerability id CVE-2008-3964.
-version 1.0.40, 1.2.32[September 18, 2008]
+version 1.0.40, 1.2.32 [September 18, 2008]
No changes.
+version 1.2.33beta01 [October 6, 2008]
+ Revised makefile.darwin to fix shared library numbering.
+ Change png_set_gray_1_2_4_to_8() to png_set_expand_gray_1_2_4_to_8()
+ in example.c (debian bug report)
+
+version 1.2.33rc01 [October 15, 2008]
+ No changes.
+
+version 1.0.41rc01, version 1.2.33rc02 [October 26, 2008]
+ Changed remaining "key" to "png_ptr->chunkdata" in png_handle_tEXt()
+ to avoid memory leak after memory failure while reading tEXt chunk.`
+
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 9bb2c81..4e6e619 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.0.40 - September 18, 2008
+Installing libpng version 1.0.41rc01 - October 26, 2008
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.0.40" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.0.41rc01" 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 libpng10.so.0.1.0.40)
+ gcc, creates libpng10.so.0.1.0.41rc01)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng10.so.0.1.0.40)
+ (gcc, creates libpng10.so.0.1.0.41rc01)
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 libpng10.so.0.1.0.40)
+ creates libpng10.so.0.1.0.41rc01)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng10.so.0.1.0.40)
+ creates libpng10.so.0.1.0.41rc01)
makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc,
- creates libpng10.so.0.1.0.40)
+ creates libpng10.so.0.1.0.41rc01)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng10.so.0.1.0.40)
+ creates libpng10.so.0.1.0.41rc01)
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 2fa14ca..98847cf 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.0.40
+Known bugs in libpng version 1.0.41rc01
1. February 23, 2006: The custom makefiles don't build libpng with -lz.
diff --git a/LICENSE b/LICENSE
index 79522e3..3df64c5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -8,7 +8,7 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.0.40, September 18, 2008, are
+libpng versions 1.2.6, August 15, 2004, through 1.0.41rc01, October 26, 2008, 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
@@ -106,4 +106,4 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-September 18, 2008
+October 26, 2008
diff --git a/Makefile.am b/Makefile.am
index 8405c73..d4c7fb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,7 +86,7 @@
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.0.40.txt pngvcrd.c
+ example.c libpng-1.0.41rc01.txt pngvcrd.c
CLEANFILES= pngout.png libpng10.pc libpng10-config libpng.vers \
libpng.sym
diff --git a/Makefile.in b/Makefile.in
index c4d2554..a679650 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -331,7 +331,7 @@
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.0.40.txt pngvcrd.c
+ example.c libpng-1.0.41rc01.txt pngvcrd.c
CLEANFILES = pngout.png libpng10.pc libpng10-config libpng.vers \
libpng.sym
diff --git a/README b/README
index 9e00291..7562277 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.0.40 - September 18, 2008 (shared library 10.0)
+README for libpng version 1.0.41rc01 - October 26, 2008 (shared library 10.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 libpng10.so.0.1.0.40)
+ gcc, creates libpng10.so.0.1.0.41rc01)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng10.so.0.1.0.40)
+ (gcc, creates libpng10.so.0.1.0.41rc01)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng10.so.0.1.0.40,
+ (gcc, creates libpng10.so.0.1.0.41rc01,
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 libpng10.so.0.1.0.40)
+ (gcc, creates libpng10.so.0.1.0.41rc01)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng10.so.0.1.0.40)
+ (gcc, creates libpng10.so.0.1.0.41rc01)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng10.so.0.1.0.40)
+ (gcc, creates libpng10.so.0.1.0.41rc01)
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 ffc2836..6962b8f 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- September 18, 2008
+ October 26, 2008
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.0.40 are Y2K compliant. It is my belief that earlier
+ upward through 1.0.41rc01 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 bf173a4..2ee5ff4 100755
--- a/configure
+++ b/configure
Binary files differ
diff --git a/configure.ac b/configure.ac
index 3e9413e..fea3022 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,15 +18,15 @@
dnl Version number stuff here:
-AC_INIT([libpng], [1.0.40], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.0.41rc01], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.0.40
+PNGLIB_VERSION=1.0.41rc01
PNGLIB_MAJOR=1
PNGLIB_MINOR=0
-PNGLIB_RELEASE=40
+PNGLIB_RELEASE=41
dnl End of version number stuff
diff --git a/example.c b/example.c
index 4d61ebb..e9dcd00 100644
--- a/example.c
+++ b/example.c
@@ -2,7 +2,7 @@
#if 0 /* in case someone actually tries to compile this */
/* example.c - an example of using libpng
- * Last changed in libpng 1.2.32 [September 18, 2008]
+ * Last changed in libpng 1.2.33 [October 26, 2008]
* This file has been placed in the public domain by the authors.
* Maintained 1998-2008 Glenn Randers-Pehrson
* Maintained 1996, 1997 Andreas Dilger)
@@ -204,7 +204,7 @@
/* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
- png_set_gray_1_2_4_to_8(png_ptr);
+ png_set_expand_gray_1_2_4_to_8(png_ptr);
/* Expand paletted or RGB images with transparency to full alpha channels
* so the data will be available as RGBA quartets.
diff --git a/libpng-1.0.40.txt b/libpng-1.0.41rc01.txt
similarity index 99%
rename from libpng-1.0.40.txt
rename to libpng-1.0.41rc01.txt
index dad9be6..8ec47bf 100644
--- a/libpng-1.0.40.txt
+++ b/libpng-1.0.41rc01.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.0.40 - September 18, 2008
+ libpng version 1.0.41rc01 - October 26, 2008
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2008 Glenn Randers-Pehrson
@@ -9,7 +9,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.0.40 - September 18, 2008
+ libpng versions 0.97, January 1998, through 1.0.41rc01 - October 26, 2008
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2008 Glenn Randers-Pehrson
@@ -325,8 +325,9 @@
Now you get to set the way the library processes unknown chunks in the
input PNG stream. Both known and unknown chunks will be read. Normal
behavior is that known chunks will be parsed into information in
-various info_ptr members while unknown chunks will be discarded. To change
-this, you can call:
+various info_ptr members while unknown chunks will be discarded. This
+behavior can be wasteful if your application will never use some known
+chunk types. To change this, you can call:
png_set_keep_unknown_chunks(png_ptr, keep,
chunk_list, num_chunks);
@@ -2815,13 +2816,13 @@
VIII. Y2K Compliance in libpng
-September 18, 2008
+October 26, 2008
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.0.40 are Y2K compliant. It is my belief that earlier
+upward through 1.0.41rc01 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 2b2c0a0..6efd9fc 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "September 18, 2008"
+.TH LIBPNG 3 "October 26, 2008"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.40
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.41rc01
.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.0.40 - September 18, 2008
+ libpng version 1.0.41rc01 - October 26, 2008
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2008 Glenn Randers-Pehrson
@@ -830,7 +830,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.0.40 - September 18, 2008
+ libpng versions 0.97, January 1998, through 1.0.41rc01 - October 26, 2008
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2008 Glenn Randers-Pehrson
@@ -1146,8 +1146,9 @@
Now you get to set the way the library processes unknown chunks in the
input PNG stream. Both known and unknown chunks will be read. Normal
behavior is that known chunks will be parsed into information in
-various info_ptr members while unknown chunks will be discarded. To change
-this, you can call:
+various info_ptr members while unknown chunks will be discarded. This
+behavior can be wasteful if your application will never use some known
+chunk types. To change this, you can call:
png_set_keep_unknown_chunks(png_ptr, keep,
chunk_list, num_chunks);
@@ -3636,13 +3637,13 @@
.SH VIII. Y2K Compliance in libpng
-September 18, 2008
+October 26, 2008
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.0.40 are Y2K compliant. It is my belief that earlier
+upward through 1.0.41rc01 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
@@ -3889,6 +3890,9 @@
1.2.32rc01 13 10232 12.so.0.32[.0]
1.0.40 10 10040 10.so.0.40[.0]
1.2.32 13 10232 12.so.0.32[.0]
+ 1.2.33beta01-02 13 10233 12.so.0.33[.0]
+ 1.2.33rc01-02 13 10233 12.so.0.33[.0]
+ 1.0.41rc01 10 10041 10.so.0.41[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3944,7 +3948,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.0.40 - September 18, 2008:
+Libpng version 1.0.41rc01 - October 26, 2008:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -3965,7 +3969,7 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.0.40, September 18, 2008, are
+libpng versions 1.2.6, August 15, 2004, through 1.0.41rc01, October 26, 2008, 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
@@ -4064,7 +4068,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-September 18, 2008
+October 26, 2008
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 2a0db22..ddf6d14 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "September 18, 2008"
+.TH LIBPNGPF 3 "October 26, 2008"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.40
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.41rc01
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 1108aa8..2560a68 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "September 18, 2008"
+.TH PNG 5 "October 26, 2008"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index ed8599e..e535b07 100644
--- a/png.c
+++ b/png.c
@@ -13,7 +13,7 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_0_40 Your_png_h_is_not_version_1_0_40;
+typedef version_1_0_41rc01 Your_png_h_is_not_version_1_0_41rc01;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@@ -694,7 +694,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.0.40 - September 18, 2008\n\
+ return ((png_charp) "\n libpng version 1.0.41rc01 - October 26, 2008\n\
Copyright (c) 1998-2008 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 cd84ab3..36cfb02 100644
--- a/png.h
+++ b/png.h
@@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.0.40 - September 18, 2008
+ * libpng version 1.0.41rc01 - October 26, 2008
* Copyright (c) 1998-2008 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.)
@@ -8,7 +8,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.0.40 - September 18, 2008: Glenn
+ * libpng versions 0.97, January 1998, through 1.0.41rc01 - October 26, 2008: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -207,6 +207,9 @@
* 1.2.32rc01 13 10232 12.so.0.32[.0]
* 1.0.40 10 10040 10.so.0.40[.0]
* 1.2.32 13 10232 12.so.0.32[.0]
+ * 1.2.33beta01-02 13 10233 12.so.0.33[.0]
+ * 1.2.33rc01-02 13 10233 12.so.0.33[.0]
+ * 1.0.41rc01 10 10041 10.so.0.41[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -236,7 +239,7 @@
* If you modify libpng you may insert additional notices immediately following
* this sentence.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.0.40, September 18, 2008, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.0.41rc01, October 26, 2008, 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:
@@ -348,13 +351,13 @@
* Y2K compliance in libpng:
* =========================
*
- * September 18, 2008
+ * October 26, 2008
*
* 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.0.40 are Y2K compliant. It is my belief that earlier
+ * upward through 1.0.41rc01 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
@@ -410,9 +413,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.0.40"
+#define PNG_LIBPNG_VER_STRING "1.0.41rc01"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.0.40 - September 18, 2008\n"
+ " libpng version 1.0.41rc01 - October 26, 2008\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 10
@@ -420,11 +423,11 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 0
-#define PNG_LIBPNG_VER_RELEASE 40
+#define PNG_LIBPNG_VER_RELEASE 41
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero: */
-#define PNG_LIBPNG_VER_BUILD 0
+#define PNG_LIBPNG_VER_BUILD 01
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -441,14 +444,14 @@
#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
PNG_LIBPNG_BUILD_PRIVATE */
-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
+#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC
/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
* We must not include leading zeros.
* Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
* version 1.0.0 was mis-numbered 100 instead of 10000). From
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */
-#define PNG_LIBPNG_VER 10040 /* 1.0.40 */
+#define PNG_LIBPNG_VER 10041 /* 1.0.41 */
#ifndef PNG_VERSION_INFO_ONLY
/* include the compression library's header */
@@ -1469,7 +1472,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_0_40;
+typedef png_structp version_1_0_41rc01;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index 88f1a47..8921a43 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.0.40 - September 18, 2008
+ * libpng version 1.0.41rc01 - October 26, 2008
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrutil.c b/pngrutil.c
index e8b0b79..f81e651 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
- * Last changed in libpng 1.2.31 [August 19, 2008]
+ * Last changed in libpng 1.2.33 [October 26, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1940,21 +1940,24 @@
}
#endif
- key = (png_charp)png_malloc_warn(png_ptr, length + 1);
- if (key == NULL)
+ png_free(png_ptr,png_ptr->chunkdata);
+ png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+ if (png_ptr->chunkdata == NULL)
{
png_warning(png_ptr, "No memory to process text chunk.");
return;
}
slength = (png_size_t)length;
- png_crc_read(png_ptr, (png_bytep)key, slength);
+ png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
if (png_crc_finish(png_ptr, skip))
{
- png_free(png_ptr, key);
+ png_free(png_ptr, png_ptr->chunkdata);
+ png_ptr->chunkdata = NULL;
return;
}
+ key = png_ptr->chunkdata;
key[slength] = 0x00;
for (text = key; *text; text++)
@@ -1968,7 +1971,8 @@
if (text_ptr == NULL)
{
png_warning(png_ptr, "Not enough memory to process text chunk.");
- png_free(png_ptr, key);
+ png_free(png_ptr, png_ptr->chunkdata);
+ png_ptr->chunkdata = NULL;
return;
}
text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
@@ -1983,7 +1987,8 @@
ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
- png_free(png_ptr, key);
+ png_free(png_ptr, png_ptr->chunkdata);
+ png_ptr->chunkdata = NULL;
png_free(png_ptr, text_ptr);
if (ret)
png_warning(png_ptr, "Insufficient memory to process text chunk.");
diff --git a/pngtest.c b/pngtest.c
index 52cc01c..0fb7f30 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1685,4 +1685,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_0_40 your_png_h_is_not_version_1_0_40;
+typedef version_1_0_41rc01 your_png_h_is_not_version_1_0_41rc01;
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 4945315..82d80b4 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -6,7 +6,7 @@
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 0)
-set(PNGLIB_RELEASE 40)
+set(PNGLIB_RELEASE 41)
set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
@@ -169,7 +169,7 @@
# SET UP LINKS
set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 0.${PNGLIB_RELEASE}.1.0.40
+# VERSION 0.${PNGLIB_RELEASE}.1.0.41rc01
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 59420d1..4558496 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.0.40
+version=1.0.41rc01
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index a9e70af..2fbd233 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.0.40
+Version: 1.0.41rc01
Libs: -L${libdir} -lpng10
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 1f4f57b..468bb5f 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index b0db722..9c63bd7 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index ea2f5e3..113851d 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 597b6bf..0d185d9 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 49b2ab3..49b7cbf 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -74,7 +74,7 @@
LIBNAME = libpng10
PNGMAJ = 0
CYGDLL = 10
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index e9ea9ff..3c79c58 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 12
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@@ -104,14 +104,14 @@
$(LIBSOVER): $(OBJSDLL)
$(CC) -dynamiclib \
-install_name $(LIBPATH)/$(LIBSOMAJ) \
- -current_version $(SONUM) -compatibility_version $(SONUM) \
+ -current_version 0 -compatibility_version 0 \
-o $(LIBSOVER) \
$(OBJSDLL) -L$(ZLIBLIB) -lz
$(OLDSOVER): $(OBJSDLL)
$(CC) -dynamiclib \
-install_name $(LIBPATH)/$(OLDSOMAJ) \
- -current_version %OLDSONUM% -compatibility_version %OLDSONUM% \
+ -current_version 2 -compatibility_version 2 \
-o $(OLDSOVER) \
$(OBJSDLL) -L$(ZLIBLIB) -lz
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 5790855..972777e 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng10
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index 41bc118..4907729 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -13,7 +13,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index c695b3a..46a3d9b 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -14,7 +14,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 33faea5..4ff8274 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index e30b9d0..a14f745 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index a62efce..38f7d21 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 2c38d0f..570eeb0 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -7,7 +7,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index 961da65..187e094 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -74,7 +74,7 @@
LIBNAME = libpng10
PNGMAJ = 0
MINGDLL = 10
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 6175607..23468ea 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -14,7 +14,7 @@
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.0.40
+SHLIB_MINOR= 1.0.41rc01
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 a608ae3..0e0c2c4 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -14,7 +14,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.0.40
+SHLIB_MINOR= 1.0.41rc01
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 c4efead..a049aae 100644
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -7,7 +7,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index 7c83a1d..cc85b90 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -8,7 +8,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.0.40
+SHLIB_MINOR= 1.0.41rc01
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 8c4d05b..f48ac19 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index cfdfdfb..ed54822 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index a99f1b5..45c280c 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index c7f175d..ef89020 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng10
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 3ad4ebb..8c6be93 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index e95cf74..e8eb887 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.40
+PNGMIN = 1.0.41rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 841b9d1..b220513 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.0.40
+; Version 1.0.41rc01
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index 3c0e6d3..2e95376 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.0.40
+;Version 1.0.41rc01
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
