Imported from libpng-1.4.0beta45.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 827d574..bb5706b 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.4.0beta44 - December 6, 2008
+Libpng 1.4.0beta45 - December 9, 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.0beta44.tar.gz
- 1.4.0beta44.tar.bz2
+ 1.4.0beta45.tar.gz
+ 1.4.0beta45.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- 1.4.0beta44-no-config.tar.gz
- 1.4.0beta44-no-config.tar.bz2
+ 1.4.0beta45-no-config.tar.gz
+ 1.4.0beta45-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp140b44.zip
- lp140b44.tar.bz2
+ lp140b45.zip
+ lp140b45.tar.bz2
Other information:
- 1.4.0beta44-README.txt
- 1.4.0beta44-KNOWNBUGS.txt
- 1.4.0beta44-LICENSE.txt
- 1.4.0beta44-Y2K-compliance.txt
+ 1.4.0beta45-README.txt
+ 1.4.0beta45-KNOWNBUGS.txt
+ 1.4.0beta45-LICENSE.txt
+ 1.4.0beta45-Y2K-compliance.txt
Changes since the last public release (1.2.10):
@@ -343,7 +343,7 @@
Added check for zero-area RGB cHRM triange in png_check_cHRM() and
png_check_cHRM_fixed().
-version 1.4.0beta39 [December 6, 2008]
+version 1.4.0beta39 [December 9, 2008]
Revised png_warning() to write its message on standard output by default
when warning_fn is NULL.
@@ -365,6 +365,11 @@
Removed redundant check for key==NULL before calling png_check_keyword()
to ensure that new_key gets initialized and removed extra warning
(Merge with version 1.2.34beta05 -- Arvan Pritchard).
+
+version 1.4.0beta45 [December 9, 2008]
+ In png_write_png(), respect the placement of the filler bytes in an earlier
+ call to png_set_filler() (Jim Barry).
+
version 1.4.0betaN [future]
Build shared libraries with -lz and sometimes -lm.
diff --git a/CHANGES b/CHANGES
index ac6f545..9473f2b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2041,6 +2041,10 @@
to ensure that new_key gets initialized and removed extra warning
(Merge with version 1.2.34beta05 -- Arvan Pritchard).
+version 1.4.0beta45 [December 9, 2008]
+ In png_write_png(), respect the placement of the filler bytes in an earlier
+ call to png_set_filler() (Jim Barry).
+
version 1.4.0betaN [future]
Build shared libraries with -lz and sometimes -lm.
diff --git a/INSTALL b/INSTALL
index 4dd3581..f8a388f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.4.0beta44 - December 6, 2008
+Installing libpng version 1.4.0beta45 - December 9, 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.0beta44" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.4.0beta45" 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.14.1.4.0beta44)
+ gcc, creates libpng14.so.14.1.4.0beta45)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.14.1.4.0beta44)
+ (gcc, creates libpng14.so.14.1.4.0beta45)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng14.so.14.1.4.0beta44,
+ (gcc, creates libpng14.so.14.1.4.0beta45,
uses assembler code tuned for Intel MMX platform)
makefile.nommx => Linux/ELF makefile
- (gcc, creates libpng14.so.14.1.4.0beta44
+ (gcc, creates libpng14.so.14.1.4.0beta45
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.14.1.4.0beta44)
+ creates libpng14.so.14.1.4.0beta45)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng14.so.14.1.4.0beta44)
+ creates libpng14.so.14.1.4.0beta45)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng14.so.14.1.4.0beta44)
+ creates libpng14.so.14.1.4.0beta45)
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 b5aa0b0..b5a7dc3 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.4.0beta44
+Known bugs in libpng version 1.4.0beta45
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 492cfa4..e918276 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.0beta44, December 6, 2008, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0beta45, December 9, 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
-December 6, 2008
+December 9, 2008
diff --git a/Makefile.am b/Makefile.am
index 7a9b975..a5c8999 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,7 +86,7 @@
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.4.0beta44.txt pngvcrd.c
+ example.c libpng-1.4.0beta45.txt pngvcrd.c
CLEANFILES= pngout.png libpng14.pc libpng14-config libpng.vers \
libpng.sym
diff --git a/Makefile.in b/Makefile.in
index d1d8728..8c9d50c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -331,7 +331,7 @@
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.4.0beta44.txt pngvcrd.c
+ example.c libpng-1.4.0beta45.txt pngvcrd.c
CLEANFILES = pngout.png libpng14.pc libpng14-config libpng.vers \
libpng.sym
diff --git a/README b/README
index 423464c..b00bf25 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.0beta44 - December 6, 2008 (shared library 14.0)
+README for libpng version 1.4.0beta45 - December 9, 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.14.1.4.0beta44)
+ gcc, creates libpng14.so.14.1.4.0beta45)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.14.1.4.0beta44)
+ (gcc, creates libpng14.so.14.1.4.0beta45)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng14.so.14.1.4.0beta44,
+ (gcc, creates libpng14.so.14.1.4.0beta45,
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.14.1.4.0beta44)
+ (gcc, creates libpng14.so.14.1.4.0beta45)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng14.so.14.1.4.0beta44)
+ (gcc, creates libpng14.so.14.1.4.0beta45)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng14.so.14.1.4.0beta44)
+ (gcc, creates libpng14.so.14.1.4.0beta45)
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 0bcf07e..290bb61 100755
--- a/configure
+++ b/configure
Binary files differ
diff --git a/configure.ac b/configure.ac
index 08cdca8..ff04b41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@
dnl Version number stuff here:
-AC_INIT([libpng], [1.4.0beta44], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.4.0beta45], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.4.0beta44
+PNGLIB_VERSION=1.4.0beta45
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
PNGLIB_RELEASE=0
diff --git a/example.c b/example.c
index 92b73e9..16e48a7 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 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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.0beta44.txt b/libpng-1.4.0beta45.txt
similarity index 99%
rename from libpng-1.4.0beta44.txt
rename to libpng-1.4.0beta45.txt
index fcc1e4c..bce7ee5 100644
--- a/libpng-1.4.0beta44.txt
+++ b/libpng-1.4.0beta45.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.0beta44 - December 6, 2008
+ libpng version 1.4.0beta45 - December 9, 2008
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -2816,13 +2816,13 @@
IX. Y2K Compliance in libpng
-December 6, 2008
+December 9, 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.0beta44 are Y2K compliant. It is my belief that earlier
+upward through 1.4.0beta45 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 82e0a78..c5f1b25 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "December 6, 2008"
+.TH LIBPNG 3 "December 9, 2008"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta44
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta45
.SH SYNOPSIS
\fI\fB
@@ -809,7 +809,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.0beta44 - December 6, 2008
+ libpng version 1.4.0beta45 - December 9, 2008
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -3625,13 +3625,13 @@
.SH IX. Y2K Compliance in libpng
-December 6, 2008
+December 9, 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.0beta44 are Y2K compliant. It is my belief that earlier
+upward through 1.4.0beta45 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
@@ -3799,7 +3799,7 @@
1.4.0beta9-14 14 10400 14.so.0.0[.0]
1.2.13 13 10213 12.so.0.13[.0]
1.4.0beta15-36 14 10400 14.so.0.0[.0]
- 1.4.0beta37-44 14 10400 14.so.14.0[.0]
+ 1.4.0beta37-45 14 10400 14.so.14.0[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3855,7 +3855,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.4.0beta44 - December 6, 2008:
+Libpng version 1.4.0beta45 - December 9, 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).
@@ -3876,7 +3876,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.0beta44, December 6, 2008, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0beta45, December 9, 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
@@ -3975,7 +3975,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-December 6, 2008
+December 9, 2008
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 2af3216..d1ed548 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "December 6, 2008"
+.TH LIBPNGPF 3 "December 9, 2008"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta44
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta45
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 5e8fd86..d13a73c 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "December 6, 2008"
+.TH PNG 5 "December 9, 2008"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index dc5db23..c420550 100644
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
- * Last changed in libpng 1.4.0 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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_0beta44 Your_png_h_is_not_version_1_4_0beta44;
+typedef version_1_4_0beta45 Your_png_h_is_not_version_1_4_0beta45;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@@ -641,13 +641,13 @@
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
- "libpng version x 1.4.0beta44 - December 6, 2008" PNG_STRING_NEWLINE \
+ "libpng version x 1.4.0beta45 - December 9, 2008" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2008 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE);
#else
- return ((png_charp) "libpng version 1.4.0beta44 - December 6, 2008\
+ return ((png_charp) "libpng version 1.4.0beta45 - December 9, 2008\
Copyright (c) 1998-2008 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");
diff --git a/png.h b/png.h
index a5af6e8..543eb11 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.4.0beta44 - December 6, 2008
+ * libpng version 1.4.0beta45 - December 9, 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.0beta44 - December 6, 2008: Glenn
+ * libpng versions 0.97, January 1998, through 1.4.0beta45 - December 9, 2008: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -127,7 +127,7 @@
* 1.4.0beta9-14 14 10400 14.so.0.0[.0]
* 1.2.13 13 10213 12.so.0.10[.0]
* 1.4.0beta15-36 14 10400 14.so.0.0[.0]
- * 1.4.0beta37-44 14 10400 14.so.14.0[.0]
+ * 1.4.0beta37-45 14 10400 14.so.14.0[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -157,7 +157,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.0beta44, December 6, 2008, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta45, December 9, 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:
@@ -275,7 +275,7 @@
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
- * upward through 1.4.0beta44 are Y2K compliant. It is my belief that earlier
+ * upward through 1.4.0beta45 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
@@ -331,9 +331,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.4.0beta44"
+#define PNG_LIBPNG_VER_STRING "1.4.0beta45"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.4.0beta44 - December 6, 2008\n"
+ " libpng version 1.4.0beta45 - December 9, 2008\n"
#define PNG_LIBPNG_VER_SONUM 14
#define PNG_LIBPNG_VER_DLLNUM 14
@@ -345,7 +345,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 44
+#define PNG_LIBPNG_VER_BUILD 45
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -1353,7 +1353,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_0beta44;
+typedef png_structp version_1_4_0beta45;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index 4ce5858..4ae1eaf 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.4.0beta44 - December 6, 2008
+ * libpng version 1.4.0beta45 - December 9, 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/pngerror.c b/pngerror.c
index f52d40f..8b834d8 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 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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 b9d6f23..8ec9cf1 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
/* pngget.c - retrieval of values from info struct
*
- * Last changed in libpng 1.4.0 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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 7596eb9..7c10f40 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 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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 e33bdd3..eb2026f 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 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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 73fe0cd..6dd2db9 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
- * libpng version 1.4.0beta44 - December 6, 2008
+ * libpng version 1.4.0beta45 - December 9, 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 733f424..6f7f797 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
- * Last changed in libpng 1.4.0 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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 2c76a46..5bd2d5f 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,7 +1,7 @@
/* pngrio.c - functions for data input
*
- * Last changed in libpng 1.4.0 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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 4eab00a..58d6e17 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 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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 dbe9a1f..2467eed 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 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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/pngset.c b/pngset.c
index 90d1a3c..34afe09 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 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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 e3f2c5d..0767e57 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 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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)
@@ -1613,4 +1613,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_0beta44 your_png_h_is_not_version_1_4_0beta44;
+typedef version_1_4_0beta45 your_png_h_is_not_version_1_4_0beta45;
diff --git a/pngtrans.c b/pngtrans.c
index 844ca64..746b680 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 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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 6c780f4..4e9f444 100644
--- a/pngwio.c
+++ b/pngwio.c
@@ -1,7 +1,7 @@
/* pngwio.c - functions for data output
*
- * Last changed in libpng 1.4.0 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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 b7ee685..77a54a3 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 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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)
@@ -1437,11 +1437,11 @@
#endif
#if defined(PNG_WRITE_FILLER_SUPPORTED)
- /* Get rid of filler (OR ALPHA) bytes, pack XRGB/RGBX/ARGB/RGBA into
- * RGB (4 channels -> 3 channels). The second parameter is not used.
+ /* Pack XRGB/RGBX/ARGB/RGBA into * RGB (4 channels -> 3 channels).
*/
if (transforms & PNG_TRANSFORM_STRIP_FILLER)
- png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
+ if (!(png_ptr->transformations & PNG_TRANSFORM_STRIP_FILLER))
+ png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
#endif
#if defined(PNG_WRITE_BGR_SUPPORTED)
diff --git a/pngwtran.c b/pngwtran.c
index b39281a..94a108a 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 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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 7860885..cd71ac8 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 [December 6, 2008]
+ * Last changed in libpng 1.4.0 [December 9, 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 c57d4b0..46cdf08 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.0beta44
+# VERSION 0.${PNGLIB_RELEASE}.1.4.0beta45
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 121169d..3172064 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.4.0beta44
+version=1.4.0beta45
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 0534ac9..1952428 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.0beta44
+Version: 1.4.0beta45
Libs: -L${libdir} -lpng14
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index a0082b2..da397fe 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index cb07a22..b37e776 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 8b30bd8..b7bfd62 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@
LIBNAME=libpng14
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 7a93d3f..67db1d0 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 0865483..8ee11d5 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -65,7 +65,7 @@
LIBNAME = libpng14
PNGMAJ = 14
CYGDLL = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 49c89e6..5f7ac5e 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 12
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 9b0e2a6..e621dd4 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index a745c1e..6267bad 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index a8abf8b..ca25d9d 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 401a163..023f019 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index dd0764e..8bea0d3 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 88c89bc..7dee488 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 01671f3..7de894a 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index 64db13d..5001579 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -81,7 +81,7 @@
LIBNAME = libpng14
PNGMAJ = 14
MINGDLL = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index e369a43..4aeee6c 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -14,7 +14,7 @@
LIB= png14
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.0beta44
+SHLIB_MINOR= 1.4.0beta45
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 66f5449..f89a2d6 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.4.0beta44
+SHLIB_MINOR= 1.4.0beta45
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 d8bbc38..b695a71 100644
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index 7ec487c..5802330 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -8,7 +8,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.0beta44
+SHLIB_MINOR= 1.4.0beta45
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 012dcab..66974b5 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index c07d730..275a623 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index a2700c3..7803805 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 1576e80..8eae0c4 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 6591c98..3a2db02 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 14
-PNGMIN = 1.4.0beta44
+PNGMIN = 1.4.0beta45
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index e7c6a28..59fea7c 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.4.0beta44
+; Version 1.4.0beta45
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngwin.def b/scripts/pngwin.def
index 1e101a2..cbe06fc 100644
--- a/scripts/pngwin.def
+++ b/scripts/pngwin.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.4.0beta44
+;Version 1.4.0beta45
png_build_grayscale_palette
png_chunk_error
png_chunk_warning