Imported from libpng-1.4.0beta23.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 6f48b69..3d5d002 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.4.0beta22 - July 21, 2008
+Libpng 1.4.0beta23 - July 22, 2008
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,27 +9,27 @@
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- 1.4.0beta22.tar.gz
- 1.4.0beta22.tar.bz2
+ 1.4.0beta23.tar.gz
+ 1.4.0beta23.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- 1.4.0beta22-no-config.tar.gz
- 1.4.0beta22-no-config.tar.bz2
+ 1.4.0beta23-no-config.tar.gz
+ 1.4.0beta23-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp140b22.zip
- lp140b22.tar.bz2
+ lp140b23.zip
+ lp140b23.tar.bz2
Other information:
- 1.4.0beta22-README.txt
- 1.4.0beta22-KNOWNBUGS.txt
- 1.4.0beta22-LICENSE.txt
- 1.4.0beta22-Y2K-compliance.txt
+ 1.4.0beta23-README.txt
+ 1.4.0beta23-KNOWNBUGS.txt
+ 1.4.0beta23-LICENSE.txt
+ 1.4.0beta23-Y2K-compliance.txt
Changes since the last public release (1.2.10):
@@ -252,7 +252,7 @@
Revised makefile.mingw
Prefer PNG_USE_PNGVCRD when _MSC_VER is defined in pngconf.h
-version 1.4.0beta21 [July 21, 2008]
+version 1.4.0beta21 [July 22, 2008]
Moved local array "chunkdata" from pngrutil.c to the png_struct, so
it will be freed by png_read_destroy() in case of a read error.
diff --git a/CHANGES b/CHANGES
index 309d518..3121b54 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1932,6 +1932,10 @@
version 1.4.0beta22 [July 21, 2008]
Change "purpose" and "buffer" to png_ptr->chunkdata to avoid memory leaking.
+version 1.4.0beta23 [July 22, 2008]
+ Change "chunkdata = NULL" to "png_ptr->chunkdata = NULL" several places in
+ png_decompress_chunk().
+
version 1.4.0betaN [future]
Build shared libraries with -lz and sometimes -lm.
diff --git a/INSTALL b/INSTALL
index 4aa2b3d..f8923ef 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.4.0beta22 - July 21, 2008
+Installing libpng version 1.4.0beta23 - July 22, 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.4.0beta22" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.4.0beta23" 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:
@@ -95,14 +95,14 @@
CMakeLists.txt => "cmake" script
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng14.so.1.1.4.0beta22)
+ gcc, creates libpng14.so.1.1.4.0beta23)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.1.1.4.0beta22)
+ (gcc, creates libpng14.so.1.1.4.0beta23)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng14.so.1.1.4.0beta22,
+ (gcc, creates libpng14.so.1.1.4.0beta23,
uses assembler code tuned for Intel MMX platform)
makefile.nommx => Linux/ELF makefile
- (gcc, creates libpng14.so.1.1.4.0beta22
+ (gcc, creates libpng14.so.1.1.4.0beta23
does not use Intel MMX assembler code)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
@@ -125,12 +125,12 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.sggcc => Silicon Graphics (gcc,
- creates libpng14.so.1.1.4.0beta22)
+ creates libpng14.so.1.1.4.0beta23)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng14.so.1.1.4.0beta22)
+ creates libpng14.so.1.1.4.0beta23)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng14.so.1.1.4.0beta22)
+ creates libpng14.so.1.1.4.0beta23)
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 c58ed00..071f191 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.4.0beta22
+Known bugs in libpng version 1.4.0beta23
1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when
reading interlaced PNG files, when assembler code is enabled but running
diff --git a/LICENSE b/LICENSE
index 8929d8e..b764cf2 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.4.0beta22, July 21, 2008, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0beta23, July 22, 2008, 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
@@ -106,4 +106,4 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-July 21, 2008
+July 22, 2008
diff --git a/README b/README
index e04cafd..2d8e1f2 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.0beta22 - July 21, 2008 (shared library 14.0)
+README for libpng version 1.4.0beta23 - July 22, 2008 (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.
@@ -184,11 +184,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 libpng14.so.1.1.4.0beta22)
+ gcc, creates libpng14.so.1.1.4.0beta23)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.1.1.4.0beta22)
+ (gcc, creates libpng14.so.1.1.4.0beta23)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng14.so.1.1.4.0beta22,
+ (gcc, creates libpng14.so.1.1.4.0beta23,
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
@@ -210,12 +210,12 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
- (gcc, creates libpng14.so.1.1.4.0beta22)
+ (gcc, creates libpng14.so.1.1.4.0beta23)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng14.so.1.1.4.0beta22)
+ (gcc, creates libpng14.so.1.1.4.0beta23)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng14.so.1.1.4.0beta22)
+ (gcc, creates libpng14.so.1.1.4.0beta23)
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 dab90d7..04f8df4 100755
--- a/configure
+++ b/configure
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.4.0beta22'
-PACKAGE_STRING='libpng 1.4.0beta22'
+PACKAGE_VERSION='1.4.0beta23'
+PACKAGE_STRING='libpng 1.4.0beta23'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
@@ -1404,7 +1404,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.0beta22 to adapt to many kinds of systems.
+\`configure' configures libpng 1.4.0beta23 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1474,7 +1474,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.4.0beta22:";;
+ short | recursive ) echo "Configuration of libpng 1.4.0beta23:";;
esac
cat <<\_ACEOF
@@ -1584,7 +1584,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.4.0beta22
+libpng configure 1.4.0beta23
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1598,7 +1598,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.0beta22, which was
+It was created by libpng $as_me 1.4.0beta23, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2268,7 +2268,7 @@
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.4.0beta22'
+ VERSION='1.4.0beta23'
cat >>confdefs.h <<_ACEOF
@@ -2439,7 +2439,7 @@
-PNGLIB_VERSION=1.4.0beta22
+PNGLIB_VERSION=1.4.0beta23
PNGLIB_MAJOR=14
PNGLIB_MINOR=0
@@ -21119,7 +21119,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.0beta22, which was
+This file was extended by libpng $as_me 1.4.0beta23, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21172,7 +21172,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libpng config.status 1.4.0beta22
+libpng config.status 1.4.0beta23
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index e32f5d4..8e0d5ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@
dnl Version number stuff here:
-AC_INIT([libpng], [1.4.0beta22], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.4.0beta23], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.4.0beta22
+PNGLIB_VERSION=1.4.0beta23
PNGLIB_MAJOR=14
PNGLIB_MINOR=0
diff --git a/example.c b/example.c
index 429975f..b96a4e3 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.4.0 [July 21, 2008]
+ * Last changed in libpng 1.4.0 [July 22, 2008]
* This file has been placed in the public domain by the authors.
* Maintained 1998-2008 Glenn Randers-Pehrson
* Maintained 1996, 1997 Andreas Dilger)
diff --git a/libpng-1.4.0beta22.txt b/libpng-1.4.0beta23.txt
similarity index 99%
rename from libpng-1.4.0beta22.txt
rename to libpng-1.4.0beta23.txt
index 5e0e283..0c6e4fd 100644
--- a/libpng-1.4.0beta22.txt
+++ b/libpng-1.4.0beta23.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.0beta22 - July 21, 2008
+ libpng version 1.4.0beta23 - July 22, 2008
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -2917,13 +2917,13 @@
IX. Y2K Compliance in libpng
-July 21, 2008
+July 22, 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.4.0beta22 are Y2K compliant. It is my belief that earlier
+upward through 1.4.0beta23 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 60b997b..e6822e7 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "July 21, 2008"
+.TH LIBPNG 3 "July 22, 2008"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta22
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta23
.SH SYNOPSIS
\fI\fB
@@ -797,7 +797,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.0beta22 - July 21, 2008
+ libpng version 1.4.0beta23 - July 22, 2008
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -3714,13 +3714,13 @@
.SH IX. Y2K Compliance in libpng
-July 21, 2008
+July 22, 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.4.0beta22 are Y2K compliant. It is my belief that earlier
+upward through 1.4.0beta23 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
@@ -3887,7 +3887,7 @@
1.2.12 13 10212 12.so.0.12[.0]
1.4.0beta9-14 14 10400 14.so.0.0[.0]
1.2.13 13 10213 12.so.0.13[.0]
- 1.4.0beta15-22 14 10400 14.so.0.0[.0]
+ 1.4.0beta15-23 14 10400 14.so.0.0[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3943,7 +3943,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.4.0beta22 - July 21, 2008:
+Libpng version 1.4.0beta23 - July 22, 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).
@@ -3964,7 +3964,7 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.4.0beta22, July 21, 2008, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0beta23, July 22, 2008, 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
@@ -4063,7 +4063,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-July 21, 2008
+July 22, 2008
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 7315b24..b7e44b7 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "July 21, 2008"
+.TH LIBPNGPF 3 "July 22, 2008"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta22
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta23
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 72529a6..7f4da5d 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "July 21, 2008"
+.TH PNG 5 "July 22, 2008"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 9688952..0fdc9ab 100644
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
- * Last changed in libpng 1.2.30 [July 21, 2008]
+ * Last changed in libpng 1.2.30 [July 22, 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)
@@ -13,7 +13,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_0beta22 Your_png_h_is_not_version_1_4_0beta22;
+typedef version_1_4_0beta23 Your_png_h_is_not_version_1_4_0beta23;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@@ -638,7 +638,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.4.0beta22 - July 21, 2008\n\
+ return ((png_charp) "\n libpng version 1.4.0beta23 - July 22, 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 91bc912..8cc9211 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.4.0beta22 - July 21, 2008
+ * libpng version 1.4.0beta23 - July 22, 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.)
@@ -9,7 +9,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.0beta22 - July 21, 2008: Glenn
+ * libpng versions 0.97, January 1998, through 1.4.0beta23 - July 22, 2008: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -126,7 +126,7 @@
* 1.2.12 13 10212 12.so.0.10[.0]
* 1.4.0beta9-14 14 10400 14.so.0.0[.0]
* 1.2.13 13 10213 12.so.0.10[.0]
- * 1.4.0beta15-22 14 10400 14.so.0.0[.0]
+ * 1.4.0beta15-23 14 10400 14.so.0.0[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -156,7 +156,7 @@
* If you modify libpng you may insert additional notices immediately following
* this sentence.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta22, July 21, 2008, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta23, July 22, 2008, 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:
@@ -274,7 +274,7 @@
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
- * upward through 1.4.0beta22 are Y2K compliant. It is my belief that earlier
+ * upward through 1.4.0beta23 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
@@ -330,9 +330,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.4.0beta22"
+#define PNG_LIBPNG_VER_STRING "1.4.0beta23"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.4.0beta22 - July 21, 2008\n"
+ " libpng version 1.4.0beta23 - July 22, 2008\n"
#define PNG_LIBPNG_VER_SONUM 1
#define PNG_LIBPNG_VER_DLLNUM 14
@@ -344,7 +344,7 @@
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero: */
-#define PNG_LIBPNG_VER_BUILD 22
+#define PNG_LIBPNG_VER_BUILD 23
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -1347,7 +1347,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_0beta22;
+typedef png_structp version_1_4_0beta23;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngerror.c b/pngerror.c
index ea343e2..11c8989 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,7 +1,7 @@
/* pngerror.c - stub functions for i/o and memory allocation
*
- * Last changed in libpng 1.4.0 [July 21, 2008]
+ * Last changed in libpng 1.4.0 [July 22, 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/pngget.c b/pngget.c
index bf150eb..b88536f 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
/* pngget.c - retrieval of values from info struct
*
- * Last changed in libpng 1.40. [July 21, 2008]
+ * Last changed in libpng 1.40. [July 22, 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/pngmem.c b/pngmem.c
index fb6bea3..238df97 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@
/* pngmem.c - stub functions for memory allocation
*
- * Last changed in libpng 1.4.0 [July 21, 2008]
+ * Last changed in libpng 1.4.0 [July 22, 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/pngpread.c b/pngpread.c
index 10aaa91..51b2366 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.0 [July 21, 2008]
+ * Last changed in libpng 1.4.0 [July 22, 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/pngpriv.h b/pngpriv.h
index b16c4a4..e1550e6 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
- * libpng version 1.4.0beta22 - July 21, 2008
+ * libpng version 1.4.0beta23 - July 22, 2008
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngread.c b/pngread.c
index 2086537..b189732 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
- * Last changed in libpng 1.4.0 [July 21, 2008]
+ * Last changed in libpng 1.4.0 [July 22, 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/pngrio.c b/pngrio.c
index 7e0500a..fae6320 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,7 +1,7 @@
/* pngrio.c - functions for data input
*
- * Last changed in libpng 1.4.0 [July 21, 2008]
+ * Last changed in libpng 1.4.0 [July 22, 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/pngrtran.c b/pngrtran.c
index fa059bd..26b85f0 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,7 +1,7 @@
/* pngrtran.c - transforms the data in a row for PNG readers
*
- * Last changed in libpng 1.4.0 [July 21, 2008]
+ * Last changed in libpng 1.4.0 [July 22, 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 f158db7..4e2d399 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.0 [July 21, 2008]
+ * Last changed in libpng 1.4.0 [July 22, 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)
@@ -246,7 +246,7 @@
if (text == NULL)
{
png_free(png_ptr, chunkdata);
- chunkdata = NULL;
+ png_ptr->chunkdata = NULL;
png_error(png_ptr, "Not enough memory to decompress chunk");
}
png_memcpy(text, chunkdata, prefix_size);
@@ -271,7 +271,7 @@
if (text == NULL)
{
png_free(png_ptr, chunkdata);
- chunkdata = NULL;
+ png_ptr->chunkdata = NULL;
png_error(png_ptr,
"Not enough memory to decompress chunk");
}
@@ -292,7 +292,7 @@
{
png_free(png_ptr, tmp);
png_free(png_ptr, chunkdata);
- chunkdata = NULL;
+ png_ptr->chunkdata = NULL;
png_error(png_ptr,
"Not enough memory to decompress chunk");
}
@@ -341,7 +341,7 @@
if (text == NULL)
{
png_free(png_ptr, chunkdata);
- chunkdata = NULL;
+ png_ptr->chunkdata = NULL;
png_error(png_ptr, "Not enough memory for text");
}
png_memcpy(text, chunkdata, prefix_size);
@@ -1094,7 +1094,7 @@
/* Check the profile_size recorded in the first 32 bits of the ICC profile */
pC = (png_bytep)(png_ptr->chunkdata + prefix_length);
- profile_size = ((*(pC ))<<24) |
+ profile_size = ((*(pC ))<<24) |
((*(pC + 1))<<16) |
((*(pC + 2))<< 8) |
((*(pC + 3)) );
diff --git a/pngset.c b/pngset.c
index 19cdf58..493cfa5 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
- * Last changed in libpng 1.4.0 [July 21, 2008]
+ * Last changed in libpng 1.4.0 [July 22, 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/pngtest.c b/pngtest.c
index 6a15da6..39c4276 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1,7 +1,7 @@
/* pngtest.c - a simple test program to test libpng
*
- * Last changed in libpng 1.4.0 [July 21, 2008]
+ * Last changed in libpng 1.4.0 [July 22, 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)
@@ -1612,4 +1612,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_0beta22 your_png_h_is_not_version_1_4_0beta22;
+typedef version_1_4_0beta23 your_png_h_is_not_version_1_4_0beta23;
diff --git a/pngtrans.c b/pngtrans.c
index 44eb99a..6047233 100644
--- a/pngtrans.c
+++ b/pngtrans.c
@@ -1,7 +1,7 @@
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
*
- * Last changed in libpng 1.4.0 [July 21, 2008]
+ * Last changed in libpng 1.4.0 [July 22, 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/pngwio.c b/pngwio.c
index 1b29223..142a39b 100644
--- a/pngwio.c
+++ b/pngwio.c
@@ -1,7 +1,7 @@
/* pngwio.c - functions for data output
*
- * Last changed in libpng 1.4.0 [July 21, 2008]
+ * Last changed in libpng 1.4.0 [July 22, 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/pngwrite.c b/pngwrite.c
index 02dbd6e..2c93114 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file
*
- * Last changed in libpng 1.4.0 [July 21, 2008]
+ * Last changed in libpng 1.4.0 [July 22, 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/pngwtran.c b/pngwtran.c
index b4222e7..9c4da1b 100644
--- a/pngwtran.c
+++ b/pngwtran.c
@@ -1,7 +1,7 @@
/* pngwtran.c - transforms the data in a row for PNG writers
*
- * Last changed in libpng 1.4.0 [July 21, 2008]
+ * Last changed in libpng 1.4.0 [July 22, 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/pngwutil.c b/pngwutil.c
index 3b765b1..1845302 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@
/* pngwutil.c - utilities to write a PNG file
*
- * Last changed in libpng 1.4.0 [July 21, 2008]
+ * Last changed in libpng 1.4.0 [July 22, 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/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 504eee8..b5e1974 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -178,7 +178,7 @@
# SET UP LINKS
set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 0.${PNGLIB_RELEASE}.1.4.0beta22
+# VERSION 0.${PNGLIB_RELEASE}.1.4.0beta23
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 ebf1d23..341623d 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.4.0beta22
+version=1.4.0beta23
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index c4bf98e..bc23126 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.0beta22
+Version: 1.4.0beta23
Libs: -L${libdir} -lpng14
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 73da4dd..147db5b 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index a8063bd..4c4b953 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 7b3fb77..a5c95e7 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@
LIBNAME=libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index c9006fd..c0294c8 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 8aa1156..4f8c9c1 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -65,7 +65,7 @@
LIBNAME = libpng14
PNGMAJ = 1
CYGDLL = 14
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index f2915d2..cfdbd16 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index bf83091..dbddbf3 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index f1d6220..f58a7cf 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index a77902c..7f1071b 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index e39ddf8..007eeb9 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index 17c12b4..e7a8d27 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 1cd4eb9..0b9cf48 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 64fb8a2..9f744f0 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index 2f0f7a4..95e0c8e 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -81,7 +81,7 @@
LIBNAME = libpng14
PNGMAJ = 1
MINGDLL = 14
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 8505da8..f8b9dcc 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -14,7 +14,7 @@
LIB= png14
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.0beta22
+SHLIB_MINOR= 1.4.0beta23
SRCS= pnggccrd.c 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 2eef55f..fb31fac 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.4.0beta22
+SHLIB_MINOR= 1.4.0beta23
SRCS= pnggccrd.c 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 83ed006..5348b85 100644
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index e059497..5e444da 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -8,7 +8,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.0beta22
+SHLIB_MINOR= 1.4.0beta23
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index da1ba60..c5d0146 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 29e45b7..9b88b4b 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 7885833..a4fef8a 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index f1607ab..eb9b67b 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 76a346c..5bb90e8 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta22
+PNGMIN = 1.4.0beta23
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index ec79a56..0ed08f8 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.4.0beta22
+; Version 1.4.0beta23
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngwin.def b/scripts/pngwin.def
index 675e8cf..bf141f9 100644
--- a/scripts/pngwin.def
+++ b/scripts/pngwin.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.4.0beta22
+;Version 1.4.0beta23
png_build_grayscale_palette
png_chunk_error
png_chunk_warning
