[libpng10] Imported from libpng-1.0.32.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 27eabfc..6efeffe 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.0.31 - February 18, 2008
+Libpng 1.0.32 - April 2, 2008
This is a public release of libpng, intended for use in production codes.
@@ -8,58 +8,50 @@
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- libpng-1.0.31.tar.gz
- libpng-1.0.31.tar.lzma
+ libpng-1.0.32.tar.gz
+ libpng-1.0.32.tar.lzma
(Get the lzma codec from <http://tukaani.org/lzma>).
- libpng-1.0.31.tar.bz2
+ libpng-1.0.32.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- libpng-1.0.31-no-config.tar.gz
- libpng-1.0.31-no-config.tar.lzma
- libpng-1.0.31-no-config.tar.bz2
+ libpng-1.0.32-no-config.tar.gz
+ libpng-1.0.32-no-config.tar.lzma
+ libpng-1.0.32-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lpng1031.zip
- lpng1031.7z
- lpng1031.tar.bz2
+ lpng1032.zip
+ lpng1032.7z
+ lpng1032.tar.bz2
Project files
- libpng-1.0.31-project-netware.zip
- libpng-1.0.31-project-wince.zip
+ libpng-1.0.32-project-netware.zip
+ libpng-1.0.32-project-wince.zip
Other information:
- libpng-1.0.31-README.txt
- libpng-1.0.31-KNOWNBUGS.txt
- libpng-1.0.31-LICENSE.txt
- libpng-1.0.31-Y2K-compliance.txt
+ libpng-1.0.32-README.txt
+ libpng-1.0.32-KNOWNBUGS.txt
+ libpng-1.0.32-LICENSE.txt
+ libpng-1.0.32-Y2K-compliance.txt
-Changes since the last public release (1.0.30):
+Changes since the last public release (1.0.31):
-version 1.0.31 [February 18, 2008]
+version 1.0.32 [April 2, 2008]
- Fixed bug with unknown chunk handling, introduced in version 1.2.17
- Prevent gamma from being applied twice.
- Fixed some continue-after-malloc-failure errors in pngset.c (David Hill)
- Check for info_ptr == NULL in png_read_info() and png_process_data().
- Check for possible use of NULL user_png_ver[] in png_create_read_struct().
- Fix overflow of "msg" in png_decompres_chunk().
- Added libpng-1.2.25.tar.lzma to distribution. Get the lzma codec
- from <http://tukaani.org/lzma>.
- Added lpng1225.7z to distribution. Get the 7-zip decoder from
- from <http://www.7-zip.org>.
- Fixed some broken links in the README file.
- Refactored png_read_push_finish_row() slightly, trying to satisfy Coverity.
- Fixed potential NULL dereference of png_ptr in png_destroy_write_struct();
- clarified potential NULL dereference of png_ptr in png_destroy_read_struct();
- fixed potential NULL dereference of info_ptr in png_handle_bKGD();
- fixed potential NULL dereference of user_png_ver[] in
- png_create_write_struct_2(). (Coverity)
+ Added missing "(" in pngmem.c. Bug introduced in libpng-1.2.2/1.0.13
+ Refined error message returned from deflateInit2 in pngwutil.c
+ Check IHDR length in png_push_read_chunk() before saving it.
+ Revised contrib/gregbook to handle premature end-of-file and file
+ read errors correctly.
+ Free png_ptr->big_row_buf and png_ptr->prev_row before allocating
+ new copies in png_read_start_row().
+ Avoid reallocating big_row_buf and prev_row when the size does not increase.
+ Ifdef out some code that is unused when interlacing is not supported.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 0b1bdc3..78609c1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2037,7 +2037,7 @@
Change "if (swidth == NULL)" to "if (sheight == NULL)" in png_handle_sCAL
(bug introduced in libpng-1.2.4/1.0.13).
Return from png_destroy_read_struct() if png_ptr_ptr is NULL.
- Fix overflow of "msg" in png_decompres_chunk().
+ Fix overflow of "msg" in png_decompress_chunk().
version 1.2.25beta04 [January 26, 2008]
Work around Coverity bug report by slightly refactoring
@@ -2065,6 +2065,30 @@
version 1.2.25 and 1.0.31 [February 18, 2008]
No changes.
+version 1.2.26beta01 [February 21, 2008]
+ Added missing "(" in pngmem.c. Bug introduced in libpng-1.2.2/1.0.13
+
+version 1.2.26beta02 [March 12, 2008]
+ Refined error message returned from deflateInit2 in pngwutil.c
+ Check IHDR length in png_push_read_chunk() before saving it.
+
+version 1.2.26beta03 [March 16, 2008]
+ Revised contrib/gregbook to handle premature end-of-file and file
+ read errors correctly.
+
+version 1.2.26beta04 [March 18, 2008]
+ Free png_ptr->big_row_buf and png_ptr->prev_row before allocating
+ new copies in png_read_start_row(). Bug introduced in libpng-1.2.22.
+
+version 1.2.26beta05 [March 19, 2008]
+ Removed extra png_free() added in libpng-1.2.26beta04.
+
+version 1.2.26beta06 [March 19, 2008]
+ Avoid reallocating big_row_buf and prev_row when the size does not increase.
+
+version 1.2.26rc01 [April 2, 2008]
+ Ifdef out some code that is unused when interlacing is not supported.
+
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 9f1097e..11e0dcb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.0.31 - February 18, 2008
+Installing libpng version 1.0.32 - April 2, 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.31" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.0.32" 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.31)
+ gcc, creates libpng10.so.0.1.0.32)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng10.so.0.1.0.31)
+ (gcc, creates libpng10.so.0.1.0.32)
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.31)
+ creates libpng10.so.0.1.0.32)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng10.so.0.1.0.31)
+ creates libpng10.so.0.1.0.32)
makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc,
- creates libpng10.so.0.1.0.31)
+ creates libpng10.so.0.1.0.32)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng10.so.0.1.0.31)
+ creates libpng10.so.0.1.0.32)
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 420d103..1bb8e72 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.0.31
+Known bugs in libpng version 1.0.32
1. February 23, 2006: The custom makefiles don't build libpng with -lz.
diff --git a/LICENSE b/LICENSE
index e51ddaf..087575c 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.31, February 18, 2008, are
+libpng versions 1.2.6, August 15, 2004, through 1.0.32, April 2, 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
-February 18, 2008
+April 2, 2008
diff --git a/README b/README
index 09b7bd2..ae511dd 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
-README for libpng version 1.0.31 - February 18, 2008 (shared library 10.0)
+README for libpng version 1.0.32 - April 2, 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.
Libpng comes in several distribution formats. Get libpng-*.tar.gz,
libpng-*.tar.lzma, or libpng-*.tar.bz2 if you want UNIX-style line
-endings in the text files, or lpng*.7z lpng*.zip if you want DOS-style
+endings in the text files, or lpng*.7z or lpng*.zip if you want DOS-style
line endings.
Version 0.89 was the first official release of libpng. Don't let the
@@ -191,11 +191,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.31)
+ gcc, creates libpng10.so.0.1.0.32)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng10.so.0.1.0.31)
+ (gcc, creates libpng10.so.0.1.0.32)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng10.so.0.1.0.31,
+ (gcc, creates libpng10.so.0.1.0.32,
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
@@ -217,12 +217,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.31)
+ (gcc, creates libpng10.so.0.1.0.32)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng10.so.0.1.0.31)
+ (gcc, creates libpng10.so.0.1.0.32)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng10.so.0.1.0.31)
+ (gcc, creates libpng10.so.0.1.0.32)
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 2c41ec2..1cfd45a 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- February 18, 2008
+ April 2, 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.31 are Y2K compliant. It is my belief that earlier
+ upward through 1.0.32 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 2432ff5..5a042c6 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.61 for libpng 1.0.31.
+# Generated by GNU Autoconf 2.61 for libpng 1.0.32.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.0.31'
-PACKAGE_STRING='libpng 1.0.31'
+PACKAGE_VERSION='1.0.32'
+PACKAGE_STRING='libpng 1.0.32'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
@@ -1406,7 +1406,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.0.31 to adapt to many kinds of systems.
+\`configure' configures libpng 1.0.32 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1476,7 +1476,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.0.31:";;
+ short | recursive ) echo "Configuration of libpng 1.0.32:";;
esac
cat <<\_ACEOF
@@ -1586,7 +1586,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.0.31
+libpng configure 1.0.32
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1600,7 +1600,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.0.31, which was
+It was created by libpng $as_me 1.0.32, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2270,7 +2270,7 @@
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.0.31'
+ VERSION='1.0.32'
cat >>confdefs.h <<_ACEOF
@@ -2441,10 +2441,10 @@
-PNGLIB_VERSION=1.0.31
+PNGLIB_VERSION=1.0.32
PNGLIB_MAJOR=1
PNGLIB_MINOR=0
-PNGLIB_RELEASE=31
+PNGLIB_RELEASE=32
@@ -21295,7 +21295,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.0.31, which was
+This file was extended by libpng $as_me 1.0.32, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21348,7 +21348,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libpng config.status 1.0.31
+libpng config.status 1.0.32
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 9efba73..cf1a110 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,15 +18,15 @@
dnl Version number stuff here:
-AC_INIT([libpng], [1.0.31], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.0.32], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.0.31
+PNGLIB_VERSION=1.0.32
PNGLIB_MAJOR=1
PNGLIB_MINOR=0
-PNGLIB_RELEASE=31
+PNGLIB_RELEASE=32
dnl End of version number stuff
diff --git a/contrib/gregbook/LICENSE b/contrib/gregbook/LICENSE
index a39264e..d956717 100644
--- a/contrib/gregbook/LICENSE
+++ b/contrib/gregbook/LICENSE
@@ -1,6 +1,6 @@
---------------------------------------------------------------------------
- Copyright (c) 1998-2007 Greg Roelofs. All rights reserved.
+ Copyright (c) 1998-2008 Greg Roelofs. All rights reserved.
This software is provided "as is," without warranty of any kind,
express or implied. In no event shall the author or contributors
diff --git a/contrib/gregbook/README b/contrib/gregbook/README
index 5b08bc6..cb6e525 100644
--- a/contrib/gregbook/README
+++ b/contrib/gregbook/README
@@ -56,7 +56,7 @@
Greg Roelofs
http://pobox.com/~newt/greg_contact.html
-2 June 2007
+16 March 2008
BUILD INSTRUCTIONS
diff --git a/contrib/gregbook/readpng2.h b/contrib/gregbook/readpng2.h
index 386e5ee..fbfffb4 100644
--- a/contrib/gregbook/readpng2.h
+++ b/contrib/gregbook/readpng2.h
@@ -4,7 +4,7 @@
---------------------------------------------------------------------------
- Copyright (c) 1998-2007 Greg Roelofs. All rights reserved.
+ Copyright (c) 1998-2008 Greg Roelofs. All rights reserved.
This software is provided "as is," without warranty of any kind,
express or implied. In no event shall the author or contributors
@@ -69,6 +69,12 @@
# define Trace(x) ;
#endif
+enum rpng2_states {
+ kPreInit = 0,
+ kWindowInit,
+ kDone
+};
+
typedef unsigned char uch;
typedef unsigned short ush;
typedef unsigned long ulg;
@@ -95,7 +101,7 @@
int nommxcombine;
int nommxinterlace;
#endif
- int done;
+ int state;
uch bg_red;
uch bg_green;
uch bg_blue;
diff --git a/contrib/gregbook/rpng-win.c b/contrib/gregbook/rpng-win.c
index b37c00a..2020961 100644
--- a/contrib/gregbook/rpng-win.c
+++ b/contrib/gregbook/rpng-win.c
@@ -23,10 +23,11 @@
command-line parsing bug
- 1.10: enabled "message window"/console (thanks to David Geldreich)
- 2.00: dual-licensed (added GNU GPL)
+ - 2.01: fixed improper display of usage screen on PNG error(s)
---------------------------------------------------------------------------
- Copyright (c) 1998-2007 Greg Roelofs. All rights reserved.
+ Copyright (c) 1998-2008 Greg Roelofs. All rights reserved.
This software is provided "as is," without warranty of any kind,
express or implied. In no event shall the author or contributors
@@ -77,7 +78,7 @@
#define PROGNAME "rpng-win"
#define LONGNAME "Simple PNG Viewer for Windows"
-#define VERSION "2.00 of 2 June 2007"
+#define VERSION "2.01 of 16 March 2008"
#include <stdio.h>
#include <stdlib.h>
@@ -271,40 +272,11 @@
}
}
- if (!filename) {
+ if (!filename)
++error;
- } else if (!(infile = fopen(filename, "rb"))) {
- fprintf(stderr, PROGNAME ": can't open PNG file [%s]\n", filename);
- ++error;
- } else {
- if ((rc = readpng_init(infile, &image_width, &image_height)) != 0) {
- switch (rc) {
- case 1:
- fprintf(stderr, PROGNAME
- ": [%s] is not a PNG file: incorrect signature\n",
- filename);
- break;
- case 2:
- fprintf(stderr, PROGNAME
- ": [%s] has bad IHDR (libpng longjmp)\n",
- filename);
- break;
- case 4:
- fprintf(stderr, PROGNAME ": insufficient memory\n");
- break;
- default:
- fprintf(stderr, PROGNAME
- ": unknown readpng_init() error\n");
- break;
- }
- ++error;
- }
- if (error)
- fclose(infile);
- }
- /* usage screen */
+ /* print usage screen if any errors up to this point */
if (error) {
int ch;
@@ -327,6 +299,47 @@
ch = _getch();
while (ch != 'q' && ch != 'Q' && ch != 0x1B);
exit(1);
+ }
+
+
+ if (!(infile = fopen(filename, "rb"))) {
+ fprintf(stderr, PROGNAME ": can't open PNG file [%s]\n", filename);
+ ++error;
+ } else {
+ if ((rc = readpng_init(infile, &image_width, &image_height)) != 0) {
+ switch (rc) {
+ case 1:
+ fprintf(stderr, PROGNAME
+ ": [%s] is not a PNG file: incorrect signature\n",
+ filename);
+ break;
+ case 2:
+ fprintf(stderr, PROGNAME
+ ": [%s] has bad IHDR (libpng longjmp)\n", filename);
+ break;
+ case 4:
+ fprintf(stderr, PROGNAME ": insufficient memory\n");
+ break;
+ default:
+ fprintf(stderr, PROGNAME
+ ": unknown readpng_init() error\n");
+ break;
+ }
+ ++error;
+ }
+ if (error)
+ fclose(infile);
+ }
+
+
+ if (error) {
+ int ch;
+
+ fprintf(stderr, PROGNAME ": aborting.\n");
+ do
+ ch = _getch();
+ while (ch != 'q' && ch != 'Q' && ch != 0x1B);
+ exit(2);
} else {
fprintf(stderr, "\n%s %s: %s\n", PROGNAME, VERSION, appname);
fprintf(stderr,
diff --git a/contrib/gregbook/rpng-x.c b/contrib/gregbook/rpng-x.c
index 9477260..0a98170 100644
--- a/contrib/gregbook/rpng-x.c
+++ b/contrib/gregbook/rpng-x.c
@@ -25,10 +25,11 @@
- 1.13: fixed XFreeGC() crash bug (thanks to Patrick Welche)
- 1.14: added support for X resources (thanks to Gerhard Niklasch)
- 2.00: dual-licensed (added GNU GPL)
+ - 2.01: fixed improper display of usage screen on PNG error(s)
---------------------------------------------------------------------------
- Copyright (c) 1998-2007 Greg Roelofs. All rights reserved.
+ Copyright (c) 1998-2008 Greg Roelofs. All rights reserved.
This software is provided "as is," without warranty of any kind,
express or implied. In no event shall the author or contributors
@@ -79,7 +80,7 @@
#define PROGNAME "rpng-x"
#define LONGNAME "Simple PNG Viewer for X"
-#define VERSION "2.00 of 2 June 2007"
+#define VERSION "2.01 of 16 March 2008"
#define RESNAME "rpng" /* our X resource application name */
#define RESCLASS "Rpng" /* our X resource class name */
@@ -265,9 +266,33 @@
}
}
- if (!filename) {
+ if (!filename)
++error;
- } else if (!(infile = fopen(filename, "rb"))) {
+
+
+ /* print usage screen if any errors up to this point */
+
+ if (error) {
+ fprintf(stderr, "\n%s %s: %s\n", PROGNAME, VERSION, appname);
+ readpng_version_info();
+ fprintf(stderr, "\n"
+ "Usage: %s [-display xdpy] [-gamma exp] [-bgcolor bg] file.png\n"
+ " xdpy\tname of the target X display (e.g., ``hostname:0'')\n"
+ " exp \ttransfer-function exponent (``gamma'') of the display\n"
+ "\t\t system in floating-point format (e.g., ``%.1f''); equal\n"
+ "\t\t to the product of the lookup-table exponent (varies)\n"
+ "\t\t and the CRT exponent (usually 2.2); must be positive\n"
+ " bg \tdesired background color in 7-character hex RGB format\n"
+ "\t\t (e.g., ``#ff7700'' for orange: same as HTML colors);\n"
+ "\t\t used with transparent images\n"
+ "\nPress Q, Esc or mouse button 1 (within image window, after image\n"
+ "is displayed) to quit.\n"
+ "\n", PROGNAME, default_display_exponent);
+ exit(1);
+ }
+
+
+ if (!(infile = fopen(filename, "rb"))) {
fprintf(stderr, PROGNAME ": can't open PNG file [%s]\n", filename);
++error;
} else {
@@ -280,8 +305,7 @@
break;
case 2:
fprintf(stderr, PROGNAME
- ": [%s] has bad IHDR (libpng longjmp)\n",
- filename);
+ ": [%s] has bad IHDR (libpng longjmp)\n", filename);
break;
case 4:
fprintf(stderr, PROGNAME ": insufficient memory\n");
@@ -306,25 +330,9 @@
}
- /* usage screen */
-
if (error) {
- fprintf(stderr, "\n%s %s: %s\n", PROGNAME, VERSION, appname);
- readpng_version_info();
- fprintf(stderr, "\n"
- "Usage: %s [-display xdpy] [-gamma exp] [-bgcolor bg] file.png\n"
- " xdpy\tname of the target X display (e.g., ``hostname:0'')\n"
- " exp \ttransfer-function exponent (``gamma'') of the display\n"
- "\t\t system in floating-point format (e.g., ``%.1f''); equal\n"
- "\t\t to the product of the lookup-table exponent (varies)\n"
- "\t\t and the CRT exponent (usually 2.2); must be positive\n"
- " bg \tdesired background color in 7-character hex RGB format\n"
- "\t\t (e.g., ``#ff7700'' for orange: same as HTML colors);\n"
- "\t\t used with transparent images\n"
- "\nPress Q, Esc or mouse button 1 (within image window, after image\n"
- "is displayed) to quit.\n"
- "\n", PROGNAME, default_display_exponent);
- exit(1);
+ fprintf(stderr, PROGNAME ": aborting.\n");
+ exit(2);
}
diff --git a/contrib/gregbook/rpng2-win.c b/contrib/gregbook/rpng2-win.c
index dfbd6b1..9f7ad78 100644
--- a/contrib/gregbook/rpng2-win.c
+++ b/contrib/gregbook/rpng2-win.c
@@ -10,7 +10,7 @@
tweaking (or maybe not). Thanks to Adam Costello and Pieter S. van der
Meulen for the "diamond" and "radial waves" patterns, respectively.
- to do:
+ to do (someday, maybe):
- handle quoted command-line args (especially filenames with spaces)
- finish resizable checkerboard-gradient (sizes 4-128?)
- use %.1023s to simplify truncation of title-bar string?
@@ -29,10 +29,13 @@
- 1.21: made minor tweak to usage screen to fit within 25-line console
- 1.22: added AMD64/EM64T support (__x86_64__)
- 2.00: dual-licensed (added GNU GPL)
+ - 2.01: fixed 64-bit typo in readpng2.c
+ - 2.02: fixed improper display of usage screen on PNG error(s); fixed
+ unexpected-EOF and file-read-error cases
---------------------------------------------------------------------------
- Copyright (c) 1998-2007 Greg Roelofs. All rights reserved.
+ Copyright (c) 1998-2008 Greg Roelofs. All rights reserved.
This software is provided "as is," without warranty of any kind,
express or implied. In no event shall the author or contributors
@@ -83,7 +86,7 @@
#define PROGNAME "rpng2-win"
#define LONGNAME "Progressive PNG Viewer for Windows"
-#define VERSION "2.00 of 2 June 2007"
+#define VERSION "2.02 of 16 March 2008"
#include <stdio.h>
#include <stdlib.h>
@@ -414,41 +417,11 @@
}
}
- if (!filename) {
+ if (!filename)
++error;
- } else if (!(infile = fopen(filename, "rb"))) {
- fprintf(stderr, PROGNAME ": can't open PNG file [%s]\n", filename);
- ++error;
- } else {
- incount = fread(inbuf, 1, INBUFSIZE, infile);
- if (incount < 8 || !readpng2_check_sig(inbuf, 8)) {
- fprintf(stderr, PROGNAME
- ": [%s] is not a PNG file: incorrect signature\n",
- filename);
- ++error;
- } else if ((rc = readpng2_init(&rpng2_info)) != 0) {
- switch (rc) {
- case 2:
- fprintf(stderr, PROGNAME
- ": [%s] has bad IHDR (libpng longjmp)\n",
- filename);
- break;
- case 4:
- fprintf(stderr, PROGNAME ": insufficient memory\n");
- break;
- default:
- fprintf(stderr, PROGNAME
- ": unknown readpng2_init() error\n");
- break;
- }
- ++error;
- }
- if (error)
- fclose(infile);
- }
- /* usage screen */
+ /* print usage screen if any errors up to this point */
if (error) {
int ch;
@@ -488,6 +461,48 @@
ch = _getch();
while (ch != 'q' && ch != 'Q' && ch != 0x1B);
exit(1);
+ }
+
+
+ if (!(infile = fopen(filename, "rb"))) {
+ fprintf(stderr, PROGNAME ": can't open PNG file [%s]\n", filename);
+ ++error;
+ } else {
+ incount = fread(inbuf, 1, INBUFSIZE, infile);
+ if (incount < 8 || !readpng2_check_sig(inbuf, 8)) {
+ fprintf(stderr, PROGNAME
+ ": [%s] is not a PNG file: incorrect signature\n",
+ filename);
+ ++error;
+ } else if ((rc = readpng2_init(&rpng2_info)) != 0) {
+ switch (rc) {
+ case 2:
+ fprintf(stderr, PROGNAME
+ ": [%s] has bad IHDR (libpng longjmp)\n", filename);
+ break;
+ case 4:
+ fprintf(stderr, PROGNAME ": insufficient memory\n");
+ break;
+ default:
+ fprintf(stderr, PROGNAME
+ ": unknown readpng2_init() error\n");
+ break;
+ }
+ ++error;
+ }
+ if (error)
+ fclose(infile);
+ }
+
+
+ if (error) {
+ int ch;
+
+ fprintf(stderr, PROGNAME ": aborting.\n");
+ do
+ ch = _getch();
+ while (ch != 'q' && ch != 'Q' && ch != 0x1B);
+ exit(2);
} else {
fprintf(stderr, "\n%s %s: %s\n", PROGNAME, VERSION, appname);
fprintf(stderr,
@@ -519,7 +534,7 @@
} else
rpng2_info.need_bgcolor = TRUE;
- rpng2_info.done = FALSE;
+ rpng2_info.state = kPreInit;
rpng2_info.mainprog_init = rpng2_win_init;
rpng2_info.mainprog_display_row = rpng2_win_display_row;
rpng2_info.mainprog_finish_display = rpng2_win_finish_display;
@@ -539,10 +554,27 @@
if (readpng2_decode_data(&rpng2_info, inbuf, incount))
++error;
Trace((stderr, "done with readpng2_decode_data()\n"))
- if (error || feof(infile) || rpng2_info.done)
+
+ if (error || incount != INBUFSIZE || rpng2_info.state == kDone) {
+ if (rpng2_info.state == kDone) {
+ Trace((stderr, "done decoding PNG image\n"))
+ } else if (ferror(infile)) {
+ fprintf(stderr, PROGNAME
+ ": error while reading PNG image file\n");
+ exit(3);
+ } else if (feof(infile)) {
+ fprintf(stderr, PROGNAME ": end of file reached "
+ "(unexpectedly) while reading PNG image file\n");
+ exit(3);
+ } else /* if (error) */ {
+ // will print error message below
+ }
break;
+ }
+
if (timing)
Sleep(1000L);
+
incount = fread(inbuf, 1, INBUFSIZE, infile);
}
@@ -589,7 +621,7 @@
ulg rowbytes = rpng2_info.rowbytes;
Trace((stderr, "beginning rpng2_win_init()\n"))
- Trace((stderr, " rowbytes = %ld\n", rpng2_info.rowbytes))
+ Trace((stderr, " rowbytes = %d\n", rpng2_info.rowbytes))
Trace((stderr, " width = %ld\n", rpng2_info.width))
Trace((stderr, " height = %ld\n", rpng2_info.height))
@@ -619,6 +651,8 @@
readpng2_cleanup(&rpng2_info);
return;
}
+
+ rpng2_info.state = kWindowInit;
}
@@ -1114,7 +1148,7 @@
* we have nothing to do here except set a flag and let the user know
* that the image is done */
- rpng2_info.done = TRUE;
+ rpng2_info.state = kDone;
printf(
"Done. Press Q, Esc or mouse button 1 (within image window) to quit.\n");
fflush(stdout);
diff --git a/contrib/gregbook/rpng2-x.c b/contrib/gregbook/rpng2-x.c
index 6bba649..873af23 100644
--- a/contrib/gregbook/rpng2-x.c
+++ b/contrib/gregbook/rpng2-x.c
@@ -12,7 +12,7 @@
Thanks to Adam Costello and Pieter S. van der Meulen for the "diamond"
and "radial waves" patterns, respectively.
- to do:
+ to do (someday, maybe):
- fix expose/redraw code: don't draw entire row if only part exposed
- 8-bit (colormapped) X support
- finish resizable checkerboard-gradient (sizes 4-128?)
@@ -36,10 +36,14 @@
- 1.32: added AMD64/EM64T support (__x86_64__); added basic expose/redraw
handling
- 2.00: dual-licensed (added GNU GPL)
+ - 2.01: fixed 64-bit typo in readpng2.c; fixed -pause usage description
+ - 2.02: fixed improper display of usage screen on PNG error(s); fixed
+ unexpected-EOF and file-read-error cases; fixed Trace() cut-and-
+ paste bugs
---------------------------------------------------------------------------
- Copyright (c) 1998-2007 Greg Roelofs. All rights reserved.
+ Copyright (c) 1998-2008 Greg Roelofs. All rights reserved.
This software is provided "as is," without warranty of any kind,
express or implied. In no event shall the author or contributors
@@ -90,7 +94,7 @@
#define PROGNAME "rpng2-x"
#define LONGNAME "Progressive PNG Viewer for X"
-#define VERSION "2.00 of 2 June 2007"
+#define VERSION "2.02 of 16 March 2008"
#define RESNAME "rpng2" /* our X resource application name */
#define RESCLASS "Rpng" /* our X resource class name */
@@ -453,49 +457,11 @@
}
}
- if (!filename) {
+ if (!filename)
++error;
- } else if (!(infile = fopen(filename, "rb"))) {
- fprintf(stderr, PROGNAME ": can't open PNG file [%s]\n", filename);
- ++error;
- } else {
- incount = fread(inbuf, 1, INBUFSIZE, infile);
- if (incount < 8 || !readpng2_check_sig(inbuf, 8)) {
- fprintf(stderr, PROGNAME
- ": [%s] is not a PNG file: incorrect signature\n",
- filename);
- ++error;
- } else if ((rc = readpng2_init(&rpng2_info)) != 0) {
- switch (rc) {
- case 2:
- fprintf(stderr, PROGNAME
- ": [%s] has bad IHDR (libpng longjmp)\n",
- filename);
- break;
- case 4:
- fprintf(stderr, PROGNAME ": insufficient memory\n");
- break;
- default:
- fprintf(stderr, PROGNAME
- ": unknown readpng2_init() error\n");
- break;
- }
- ++error;
- } else {
- display = XOpenDisplay(displayname);
- if (!display) {
- readpng2_cleanup(&rpng2_info);
- fprintf(stderr, PROGNAME ": can't open X display [%s]\n",
- displayname? displayname : "default");
- ++error;
- }
- }
- if (error)
- fclose(infile);
- }
- /* usage screen */
+ /* print usage screen if any errors up to this point */
if (error) {
fprintf(stderr, "\n%s %s: %s\n\n", PROGNAME, VERSION, appname);
@@ -533,7 +499,7 @@
"\t\t row (for demo purposes)\n"
" -timing\tenables delay for every block read, to simulate modem\n"
"\t\t download of image (~36 Kbps)\n"
- " -pause\tpauses after displaying each pass until key pressed\n"
+ " -pause\tpauses after displaying each pass until mouse clicked\n"
"\nPress Q, Esc or mouse button 1 (within image window, after image\n"
"is displayed) to quit.\n"
"\n", PROGNAME,
@@ -545,6 +511,52 @@
}
+ if (!(infile = fopen(filename, "rb"))) {
+ fprintf(stderr, PROGNAME ": can't open PNG file [%s]\n", filename);
+ ++error;
+ } else {
+ incount = fread(inbuf, 1, INBUFSIZE, infile);
+ if (incount < 8 || !readpng2_check_sig(inbuf, 8)) {
+ fprintf(stderr, PROGNAME
+ ": [%s] is not a PNG file: incorrect signature\n",
+ filename);
+ ++error;
+ } else if ((rc = readpng2_init(&rpng2_info)) != 0) {
+ switch (rc) {
+ case 2:
+ fprintf(stderr, PROGNAME
+ ": [%s] has bad IHDR (libpng longjmp)\n", filename);
+ break;
+ case 4:
+ fprintf(stderr, PROGNAME ": insufficient memory\n");
+ break;
+ default:
+ fprintf(stderr, PROGNAME
+ ": unknown readpng2_init() error\n");
+ break;
+ }
+ ++error;
+ } else {
+ Trace((stderr, "about to call XOpenDisplay()\n"))
+ display = XOpenDisplay(displayname);
+ if (!display) {
+ readpng2_cleanup(&rpng2_info);
+ fprintf(stderr, PROGNAME ": can't open X display [%s]\n",
+ displayname? displayname : "default");
+ ++error;
+ }
+ }
+ if (error)
+ fclose(infile);
+ }
+
+
+ if (error) {
+ fprintf(stderr, PROGNAME ": aborting.\n");
+ exit(2);
+ }
+
+
/* set the title-bar string, but make sure buffer doesn't overflow */
alen = strlen(appname);
@@ -567,7 +579,7 @@
} else
rpng2_info.need_bgcolor = TRUE;
- rpng2_info.done = FALSE;
+ rpng2_info.state = kPreInit;
rpng2_info.mainprog_init = rpng2_x_init;
rpng2_info.mainprog_display_row = rpng2_x_display_row;
rpng2_info.mainprog_finish_display = rpng2_x_finish_display;
@@ -587,10 +599,27 @@
if (readpng2_decode_data(&rpng2_info, inbuf, incount))
++error;
Trace((stderr, "done with readpng2_decode_data()\n"))
- if (error || feof(infile) || rpng2_info.done)
+
+ if (error || incount != INBUFSIZE || rpng2_info.state == kDone) {
+ if (rpng2_info.state == kDone) {
+ Trace((stderr, "done decoding PNG image\n"))
+ } else if (ferror(infile)) {
+ fprintf(stderr, PROGNAME
+ ": error while reading PNG image file\n");
+ exit(3);
+ } else if (feof(infile)) {
+ fprintf(stderr, PROGNAME ": end of file reached "
+ "(unexpectedly) while reading PNG image file\n");
+ exit(3);
+ } else /* if (error) */ {
+ // will print error message below
+ }
break;
+ }
+
if (timing)
sleep(1);
+
incount = fread(inbuf, 1, INBUFSIZE, infile);
}
@@ -610,6 +639,7 @@
#ifdef FEATURE_LOOP
if (loop && bg_image) {
+ Trace((stderr, "entering -loop loop (FEATURE_LOOP)\n"))
for (;;) {
int i, use_sleep;
struct timeval now, then;
@@ -705,13 +735,20 @@
/* wait for the user to tell us when to quit */
- do {
- XNextEvent(display, &e);
- if (e.type == Expose) {
- XExposeEvent *ex = (XExposeEvent *)&e;
- rpng2_x_redisplay_image (ex->x, ex->y, ex->width, ex->height);
- }
- } while (!QUIT(e,k));
+ if (rpng2_info.state >= kWindowInit) {
+ Trace((stderr, "entering final wait-for-quit-event loop\n"))
+ do {
+ XNextEvent(display, &e);
+ if (e.type == Expose) {
+ XExposeEvent *ex = (XExposeEvent *)&e;
+ rpng2_x_redisplay_image (ex->x, ex->y, ex->width, ex->height);
+ }
+ } while (!QUIT(e,k));
+ } else {
+ fprintf(stderr, PROGNAME ": init callback never called: probable "
+ "libpng error while decoding PNG metadata\n");
+ exit(4);
+ }
/* we're done: clean up all image and X resources and go away */
@@ -736,7 +773,7 @@
ulg rowbytes = rpng2_info.rowbytes;
Trace((stderr, "beginning rpng2_x_init()\n"))
- Trace((stderr, " rowbytes = %ld\n", rpng2_info.rowbytes))
+ Trace((stderr, " rowbytes = %d\n", rpng2_info.rowbytes))
Trace((stderr, " width = %ld\n", rpng2_info.width))
Trace((stderr, " height = %ld\n", rpng2_info.height))
@@ -773,6 +810,8 @@
rpng2_x_cleanup();
exit(2);
}
+
+ rpng2_info.state = kWindowInit;
}
@@ -1556,7 +1595,7 @@
* have nothing to do here except set a flag and let the user know that
* the image is done */
- rpng2_info.done = TRUE;
+ rpng2_info.state = kDone;
printf(
"Done. Press Q, Esc or mouse button 1 (within image window) to quit.\n");
fflush(stdout);
@@ -1581,9 +1620,9 @@
Trace((stderr, "beginning display loop (image_channels == %d)\n",
- image_channels))
- Trace((stderr, " (width = %ld, rowbytes = %ld, ximage_rowbytes = %d)\n",
- rpng2_info.width, image_rowbytes, ximage_rowbytes))
+ rpng2_info.channels))
+ Trace((stderr, " (width = %ld, rowbytes = %d, ximage_rowbytes = %d)\n",
+ rpng2_info.width, rpng2_info.rowbytes, ximage_rowbytes))
Trace((stderr, " (bpp = %d)\n", ximage->bits_per_pixel))
Trace((stderr, " (byte_order = %s)\n", ximage->byte_order == MSBFirst?
"MSBFirst" : (ximage->byte_order == LSBFirst? "LSBFirst" : "unknown")))
diff --git a/libpng-1.0.31.txt b/libpng-1.0.32.txt
similarity index 99%
rename from libpng-1.0.31.txt
rename to libpng-1.0.32.txt
index 94ffedf..880d60f 100644
--- a/libpng-1.0.31.txt
+++ b/libpng-1.0.32.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.0.31 - February 18, 2008
+ libpng version 1.0.32 - April 2, 2008
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2008 Glenn Randers-Pehrson
@@ -2760,13 +2760,13 @@
VIII. Y2K Compliance in libpng
-February 18, 2008
+April 2, 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.31 are Y2K compliant. It is my belief that earlier
+upward through 1.0.32 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 8f016a7..34698c9 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "February 18, 2008"
+.TH LIBPNG 3 "April 2, 2008"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.31
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.32
.SH SYNOPSIS
\fB
#include <png.h>\fP
@@ -410,7 +410,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.0.31 - February 18, 2008
+ libpng version 1.0.32 - April 2, 2008
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2008 Glenn Randers-Pehrson
@@ -3170,13 +3170,13 @@
.SH VIII. Y2K Compliance in libpng
-February 18, 2008
+April 2, 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.31 are Y2K compliant. It is my belief that earlier
+upward through 1.0.32 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
@@ -3392,6 +3392,10 @@
1.2.24 13 10224 12.so.0.24[.0]
1.2.25beta01-06 13 10225 12.so.0.25[.0]
1.2.25rc01-02 13 10225 12.so.0.25[.0]
+ 1.0.31 10 10031 10.so.0.31[.0]
+ 1.2.25 13 10225 12.so.0.25[.0]
+ 1.2.26beta01-06 13 10226 12.so.0.26[.0]
+ 1.2.26rc01 13 10226 12.so.0.26[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3447,7 +3451,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.0.31 - February 18, 2008:
+Libpng version 1.0.32 - April 2, 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).
@@ -3468,7 +3472,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.31, February 18, 2008, are
+libpng versions 1.2.6, August 15, 2004, through 1.0.32, April 2, 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
@@ -3567,7 +3571,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-February 18, 2008
+April 2, 2008
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index cf48d34..cb0aaca 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "February 18, 2008"
+.TH LIBPNGPF 3 "April 2, 2008"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.31
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.32
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 6b5aa3a..b1d697c 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "February 18, 2008"
+.TH PNG 5 "April 2, 2008"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index cc90309..27585ee 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_31 Your_png_h_is_not_version_1_0_31;
+typedef version_1_0_32 Your_png_h_is_not_version_1_0_32;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@@ -693,7 +693,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.31 - February 18, 2008\n\
+ return ((png_charp) "\n libpng version 1.0.32 - April 2, 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 5033707..41b4fd9 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.0.31 - February 18, 2008
+ * libpng version 1.0.32 - April 2, 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.0.31 - February 18, 2008: Glenn
+ * libpng versions 0.97, January 1998, through 1.0.32 - April 2, 2008: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -177,6 +177,10 @@
* 1.2.24 13 10224 12.so.0.24[.0]
* 1.2.25beta01-06 13 10225 12.so.0.25[.0]
* 1.2.25rc01-02 13 10225 12.so.0.25[.0]
+ * 1.0.31 10 10031 10.so.0.31[.0]
+ * 1.2.25 13 10225 12.so.0.25[.0]
+ * 1.2.26beta01-06 13 10226 12.so.0.26[.0]
+ * 1.2.26rc01 13 10226 12.so.0.26[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -206,7 +210,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.31, February 18, 2008, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.0.32, April 2, 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:
@@ -318,13 +322,13 @@
* Y2K compliance in libpng:
* =========================
*
- * February 18, 2008
+ * April 2, 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.31 are Y2K compliant. It is my belief that earlier
+ * upward through 1.0.32 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
@@ -380,9 +384,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.0.31"
+#define PNG_LIBPNG_VER_STRING "1.0.32"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.0.31 - February 18, 2008\n"
+ " libpng version 1.0.32 - April 2, 2008\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 10
@@ -390,7 +394,7 @@
/* 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 31
+#define PNG_LIBPNG_VER_RELEASE 32
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero: */
@@ -418,7 +422,7 @@
* 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 10031 /* 1.0.31 */
+#define PNG_LIBPNG_VER 10032 /* 1.0.32 */
#ifndef PNG_VERSION_INFO_ONLY
/* include the compression library's header */
@@ -1426,13 +1430,16 @@
/* storage for unknown chunk that the library doesn't recognize. */
png_unknown_chunk unknown_chunk;
#endif
+
+/* New members added in libpng-1.2.26 */
+ png_uint_32 old_big_row_buf_size, old_prev_row_size;
};
/* 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_31;
+typedef png_structp version_1_0_32;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index ccf8fb0..032ac4b 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.0.31 - February 18, 2008
+ * libpng version 1.0.32 - April 2, 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 248060f..c376e4b 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,9 +1,9 @@
/* pngmem.c - stub functions for memory allocation
*
- * Last changed in libpng 1.2.13 November 13, 2006
+ * Last changed in libpng 1.2.26 [April 2, 2008]
* For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2006 Glenn Randers-Pehrson
+ * 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.)
*
@@ -456,7 +456,7 @@
if (size > (png_uint_32)65536L)
{
#ifndef PNG_USER_MEM_SUPPORTED
- if(png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+ if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
png_error(png_ptr, "Cannot Allocate > 64K");
else
#endif
diff --git a/pngpread.c b/pngpread.c
index a02cdfc..9d78deb 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.2.25 [February 18, 2008]
+ * Last changed in libpng 1.2.26 [April 2, 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)
@@ -224,6 +224,8 @@
{
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
+ if (png_ptr->push_length != 13)
+ png_error(png_ptr, "Invalid IHDR length");
png_push_save_buffer(png_ptr);
return;
}
diff --git a/pngrutil.c b/pngrutil.c
index 990e698..bd96a0b 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.25 [February 18, 2008]
+ * Last changed in libpng 1.2.26 [April 2, 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)
@@ -2851,6 +2851,7 @@
png_read_finish_row(png_structp png_ptr)
{
#ifdef PNG_USE_LOCAL_ARRAYS
+#ifdef PNG_READ_INTERLACING_SUPPORTED
/* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
/* start of interlace block */
@@ -2864,6 +2865,7 @@
/* offset to next interlace block in the y direction */
PNG_CONST int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif /* PNG_READ_INTERLACING_SUPPORTED */
#endif
png_debug(1, "in png_read_finish_row\n");
@@ -2871,6 +2873,7 @@
if (png_ptr->row_number < png_ptr->num_rows)
return;
+#ifdef PNG_READ_INTERLACING_SUPPORTED
if (png_ptr->interlaced)
{
png_ptr->row_number = 0;
@@ -2905,6 +2908,7 @@
if (png_ptr->pass < 7)
return;
}
+#endif /* PNG_READ_INTERLACING_SUPPORTED */
if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
{
@@ -2979,6 +2983,7 @@
png_read_start_row(png_structp png_ptr)
{
#ifdef PNG_USE_LOCAL_ARRAYS
+#ifdef PNG_READ_INTERLACING_SUPPORTED
/* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
/* start of interlace block */
@@ -2993,6 +2998,7 @@
/* offset to next interlace block in the y direction */
PNG_CONST int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
#endif
+#endif
int max_pixel_depth;
png_uint_32 row_bytes;
@@ -3000,6 +3006,7 @@
png_debug(1, "in png_read_start_row\n");
png_ptr->zstream.avail_in = 0;
png_init_read_transformations(png_ptr);
+#ifdef PNG_READ_INTERLACING_SUPPORTED
if (png_ptr->interlaced)
{
if (!(png_ptr->transformations & PNG_INTERLACE))
@@ -3020,6 +3027,7 @@
png_error(png_ptr, "Rowbytes overflow in png_read_start_row");
}
else
+#endif /* PNG_READ_INTERLACING_SUPPORTED */
{
png_ptr->num_rows = png_ptr->height;
png_ptr->iwidth = png_ptr->width;
@@ -3138,8 +3146,15 @@
if (row_bytes > (png_uint_32)65536L)
png_error(png_ptr, "This image requires a row greater than 64KB");
#endif
- png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes+64);
- png_ptr->row_buf = png_ptr->big_row_buf+32;
+
+ if(row_bytes + 64 > png_ptr->old_big_row_buf_size)
+ {
+ if (png_ptr->big_row_buf)
+ png_free(png_ptr,png_ptr->big_row_buf);
+ png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes+64);
+ png_ptr->row_buf = png_ptr->big_row_buf+32;
+ png_ptr->old_big_row_buf_size = row_bytes+64;
+ }
#ifdef PNG_MAX_MALLOC_64K
if ((png_uint_32)png_ptr->rowbytes + 1 > (png_uint_32)65536L)
@@ -3147,8 +3162,15 @@
#endif
if ((png_uint_32)png_ptr->rowbytes > (png_uint_32)(PNG_SIZE_MAX - 1))
png_error(png_ptr, "Row has too many bytes to allocate in memory.");
- png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, (png_uint_32)(
- png_ptr->rowbytes + 1));
+
+ if(png_ptr->rowbytes+1 > png_ptr->old_prev_row_size)
+ {
+ if (png_ptr->prev_row)
+ png_free(png_ptr,png_ptr->prev_row);
+ png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, (png_uint_32)(
+ png_ptr->rowbytes + 1));
+ png_ptr->old_prev_row_size = png_ptr->rowbytes+1;
+ }
png_memset_check(png_ptr, png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
diff --git a/pngtest.c b/pngtest.c
index 45157b3..4f9c363 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1553,4 +1553,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_0_31 your_png_h_is_not_version_1_0_31;
+typedef version_1_0_32 your_png_h_is_not_version_1_0_32;
diff --git a/pngwutil.c b/pngwutil.c
index fef38ae..1f978ec 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,9 +1,9 @@
/* pngwutil.c - utilities to write a PNG file
*
- * Last changed in libpng 1.2.20 Septhember 3, 2007
+ * Last changed in libpng 1.2.26 [April 2, 2008]
* For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * 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.)
*/
@@ -380,6 +380,8 @@
#ifdef PNG_USE_LOCAL_ARRAYS
PNG_IHDR;
#endif
+ int ret;
+
png_byte buf[13]; /* buffer to store the IHDR info */
png_debug(1, "in png_write_IHDR\n");
@@ -523,10 +525,19 @@
png_ptr->zlib_window_bits = 15;
if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_METHOD))
png_ptr->zlib_method = 8;
- if (deflateInit2(&png_ptr->zstream, png_ptr->zlib_level,
- png_ptr->zlib_method, png_ptr->zlib_window_bits,
- png_ptr->zlib_mem_level, png_ptr->zlib_strategy) != Z_OK)
- png_error(png_ptr, "zlib failed to initialize compressor");
+ ret = deflateInit2(&png_ptr->zstream, png_ptr->zlib_level,
+ png_ptr->zlib_method, png_ptr->zlib_window_bits,
+ png_ptr->zlib_mem_level, png_ptr->zlib_strategy);
+ if (ret != Z_OK)
+ {
+ if (ret == Z_VERSION_ERROR) png_error(png_ptr,
+ "zlib failed to initialize compressor -- version error");
+ if (ret == Z_STREAM_ERROR) png_error(png_ptr,
+ "zlib failed to initialize compressor -- stream error");
+ if (ret == Z_MEM_ERROR) png_error(png_ptr,
+ "zlib failed to initialize compressor -- mem error");
+ png_error(png_ptr, "zlib failed to initialize compressor");
+ }
png_ptr->zstream.next_out = png_ptr->zbuf;
png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
/* libpng is not interested in zstream.data_type */
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 35d580f..7a22a6a 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -6,7 +6,7 @@
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 0)
-set(PNGLIB_RELEASE 31)
+set(PNGLIB_RELEASE 32)
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.31
+# VERSION 0.${PNGLIB_RELEASE}.1.0.32
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 4b5ff00..eea38cf 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.0.31
+version=1.0.32
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in
index ad480b5..a9b846f 100644
--- a/scripts/libpng.pc-configure.in
+++ b/scripts/libpng.pc-configure.in
@@ -5,6 +5,6 @@
Name: libpng
Description: Loads and saves PNG files
-Version: 1.0.31
+Version: 1.0.32
Libs: -L${libdir} -lpng10
Cflags: -I${includedir} @LIBPNG_NO_MMX@
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 4fbf918..d2d44c5 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.31
+Version: 1.0.32
Libs: -L${libdir} -lpng10
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 0c85b8e..6f601a9 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index c8fcbd2..82548c4 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 7b36acf..327a150 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index ec88023..2dac3ca 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 2fbb508..1c9f687 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -74,7 +74,7 @@
LIBNAME = libpng10
PNGMAJ = 0
CYGDLL = 10
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 8d08a27..871d577 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 0355ee7..544f5e6 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng10
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index 0b7e30b..3314841 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index ca3b979..d75edd6 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -14,7 +14,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 31387d5..a9054e6 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index a24079e..92b5d49 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 53c75c7..7f02af2 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index ee31bb6..5fa72aa 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index 46a6f47..72b0e78 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -74,7 +74,7 @@
LIBNAME = libpng10
PNGMAJ = 0
MINGDLL = 10
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 89b0b9c..0a7db8f 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -14,7 +14,7 @@
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.0.31
+SHLIB_MINOR= 1.0.32
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 ad0409f..ac316ee 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -14,7 +14,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.0.31
+SHLIB_MINOR= 1.0.32
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 144eacb..dff9e7b 100644
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -7,7 +7,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index 42caf0a..04d093c 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -8,7 +8,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.0.31
+SHLIB_MINOR= 1.0.32
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 29893cd..898e3a8 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 83527da..7f3aefa 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 5a1f202..846f641 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 8606985..aba8ebf 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng10
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index e48f6b6..1c29998 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index 2315e44..0432ede 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.31
+PNGMIN = 1.0.32
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 9cf0690..bbce60e 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.0.31
+; Version 1.0.32
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index eb18aa2..bd99d09 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.0.31
+;Version 1.0.32
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
