Imported from libpng-1.4.0beta12.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 53769da..0c8e2d0 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.4.0beta11 - August 19, 2006
+Libpng 1.4.0beta12 - October 19, 2006
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.0beta11.tar.gz
- 1.4.0beta11.tar.bz2
+ 1.4.0beta12.tar.gz
+ 1.4.0beta12.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- 1.4.0beta11-no-config.tar.gz
- 1.4.0beta11-no-config.tar.bz2
+ 1.4.0beta12-no-config.tar.gz
+ 1.4.0beta12-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp140b11.zip
- lp140b11.tar.bz2
+ lp140b12.zip
+ lp140b12.tar.bz2
Other information:
- 1.4.0beta11-README.txt
- 1.4.0beta11-KNOWNBUGS.txt
- 1.4.0beta11-LICENSE.txt
- 1.4.0beta11-Y2K-compliance.txt
+ 1.4.0beta12-README.txt
+ 1.4.0beta12-KNOWNBUGS.txt
+ 1.4.0beta12-LICENSE.txt
+ 1.4.0beta12-Y2K-compliance.txt
Changes since the last public release (1.2.10):
@@ -207,6 +207,11 @@
Added pngdefs.h that is built by makefile or configure, instead of
pngconf.h.in (Glenn).
+version 1.4.0beta12 [October 19, 2006]
+ Changed "logical" to "bitwise" in the documentation.
+ Work around Intel-Mac compiler bug by setting PNG_NO_MMX_CODE in pngconf.h
+ Add a typecast to stifle compiler warning in pngrutil.c
+
version 1.4.0betaN [future]
Build shared libraries with -lz and sometimes -lm.
diff --git a/CHANGES b/CHANGES
index d5d19da..295c830 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1710,6 +1710,11 @@
Added pngdefs.h that is built by makefile or configure, instead of
pngconf.h.in (Glenn).
+version 1.4.0beta12 [October 19, 2006]
+ Changed "logical" to "bitwise" in the documentation.
+ Work around Intel-Mac compiler bug by setting PNG_NO_MMX_CODE in pngconf.h
+ Add a typecast to stifle compiler warning in pngrutil.c
+
version 1.4.0betaN [future]
Build shared libraries with -lz and sometimes -lm.
diff --git a/INSTALL b/INSTALL
index 35f879c..8b4a332 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.4.0beta11 - August 19, 2006
+Installing libpng version 1.4.0beta12 - October 19, 2006
On Unix/Linux and similar systems, you can simply type
@@ -37,7 +37,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.0beta11" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.4.0beta12" 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:
@@ -87,11 +87,11 @@
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng14.so.1.1.4.0beta11)
+ gcc, creates libpng14.so.1.1.4.0beta12)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.1.1.4.0beta11)
+ (gcc, creates libpng14.so.1.1.4.0beta12)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng14.so.1.1.4.0beta11,
+ (gcc, creates libpng14.so.1.1.4.0beta12,
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
@@ -114,12 +114,12 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.sggcc => Silicon Graphics (gcc,
- creates libpng14.so.1.1.4.0beta11)
+ creates libpng14.so.1.1.4.0beta12)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng14.so.1.1.4.0beta11)
+ creates libpng14.so.1.1.4.0beta12)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng14.so.1.1.4.0beta11)
+ creates libpng14.so.1.1.4.0beta12)
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 2563993..2983e26 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.4.0beta11
+Known bugs in libpng version 1.4.0beta12
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 1a8ca07..e516784 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.0beta11, August 19, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0beta12, October 19, 2006, are
Copyright (c) 2004, 2006 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
-August 19, 2006
+October 19, 2006
diff --git a/README b/README
index 5652fa3..58ff329 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.0beta11 - August 19, 2006 (shared library 14.0)
+README for libpng version 1.4.0beta12 - October 19, 2006 (shared library 14.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@@ -184,11 +184,11 @@
descrip.mms => VMS makefile for MMS or MMK
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng14.so.1.1.4.0beta11)
+ gcc, creates libpng14.so.1.1.4.0beta12)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.1.1.4.0beta11)
+ (gcc, creates libpng14.so.1.1.4.0beta12)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng14.so.1.1.4.0beta11,
+ (gcc, creates libpng14.so.1.1.4.0beta12,
uses assembler code tuned for Intel MMX platform)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
@@ -210,12 +210,12 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
- (gcc, creates libpng14.so.1.1.4.0beta11)
+ (gcc, creates libpng14.so.1.1.4.0beta12)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng14.so.1.1.4.0beta11)
+ (gcc, creates libpng14.so.1.1.4.0beta12)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng14.so.1.1.4.0beta11)
+ (gcc, creates libpng14.so.1.1.4.0beta12)
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 7953900..3a63cdb 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.59 for libpng 1.4.0beta11.
+# Generated by GNU Autoconf 2.59 for libpng 1.4.0beta12.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.4.0beta11'
-PACKAGE_STRING='libpng 1.4.0beta11'
+PACKAGE_VERSION='1.4.0beta12'
+PACKAGE_STRING='libpng 1.4.0beta12'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
@@ -954,7 +954,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libpng 1.4.0beta11 to adapt to many kinds of systems.
+\`configure' configures libpng 1.4.0beta12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.4.0beta11:";;
+ short | recursive ) echo "Configuration of libpng 1.4.0beta12:";;
esac
cat <<\_ACEOF
@@ -1167,7 +1167,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.4.0beta11
+libpng configure 1.4.0beta12
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1181,7 +1181,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libpng $as_me 1.4.0beta11, which was
+It was created by libpng $as_me 1.4.0beta12, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1824,7 +1824,7 @@
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.4.0beta11'
+ VERSION='1.4.0beta12'
cat >>confdefs.h <<_ACEOF
@@ -1979,7 +1979,7 @@
-PNGLIB_VERSION=1.4.0beta11
+PNGLIB_VERSION=1.4.0beta12
PNGLIB_MAJOR=14
PNGLIB_MINOR=0
@@ -20603,7 +20603,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by libpng $as_me 1.4.0beta11, which was
+This file was extended by libpng $as_me 1.4.0beta12, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20666,7 +20666,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libpng config.status 1.4.0beta11
+libpng config.status 1.4.0beta12
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index dd6f8a7..0a260ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@
dnl Version number stuff here:
-AC_INIT([libpng], [1.4.0beta11], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.4.0beta12], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.4.0beta11
+PNGLIB_VERSION=1.4.0beta12
PNGLIB_MAJOR=14
PNGLIB_MINOR=0
diff --git a/libpng.3 b/libpng.3
index e424b54..92e3192 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "August 19, 2006"
+.TH LIBPNG 3 "October 19, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta11
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta12
.SH SYNOPSIS
\fI\fB
@@ -797,7 +797,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.0beta11 - August 19, 2006
+ libpng version 1.4.0beta12 - October 19, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -1189,7 +1189,7 @@
png_read_png(png_ptr, info_ptr, png_transforms, NULL)
-where png_transforms is an integer containing the logical OR of
+where png_transforms is an integer containing the bitwise OR of
some set of transformation flags. This call is equivalent to png_read_info(),
followed the set of transformations indicated by the transform mask,
then png_read_image(), and finally png_read_end().
@@ -2067,7 +2067,7 @@
png_free_data(png_ptr, info_ptr, mask, seq)
mask - identifies data to be freed, a mask
- containing the logical OR of one or
+ containing the bitwise OR of one or
more of
PNG_FREE_PLTE, PNG_FREE_TRNS,
PNG_FREE_HIST, PNG_FREE_ICCP,
@@ -2129,7 +2129,7 @@
png_set_invalid(png_ptr, info_ptr, mask);
mask - identifies the chunks to be made invalid,
- containing the logical OR of one or
+ containing the bitwise OR of one or
more of
PNG_INFO_gAMA, PNG_INFO_sBIT,
PNG_INFO_cHRM, PNG_INFO_PLTE,
@@ -2441,7 +2441,7 @@
/* turn on or off filtering, and/or choose
specific filters. You can use either a single
- PNG_FILTER_VALUE_NAME or the logical OR of one
+ PNG_FILTER_VALUE_NAME or the bitwise OR of one
or more PNG_FILTER_NAME masks. */
png_set_filter(png_ptr, 0,
PNG_FILTER_NONE | PNG_FILTER_VALUE_NONE |
@@ -2814,7 +2814,7 @@
png_write_png(png_ptr, info_ptr, png_transforms, NULL)
-where png_transforms is an integer containing the logical OR of some set of
+where png_transforms is an integer containing the bitwise OR of some set of
transformation flags. This call is equivalent to png_write_info(),
followed the set of transformations indicated by the transform mask,
then png_write_image(), and finally png_write_end().
@@ -3074,7 +3074,7 @@
png_free_data(png_ptr, info_ptr, mask, seq)
mask - identifies data to be freed, a mask
- containing the logical OR of one or
+ containing the bitwise OR of one or
more of
PNG_FREE_PLTE, PNG_FREE_TRNS,
PNG_FREE_HIST, PNG_FREE_ICCP,
@@ -3215,6 +3215,9 @@
png_bytep data, png_size_t length);
void user_flush_data(png_structp png_ptr);
+The user_read_data() function is responsible for detecting and
+handling end-of-data errors.
+
Supplying NULL for the read, write, or flush functions sets them back
to using the default C stream functions. It is an error to read from
a write stream, and vice versa.
@@ -3643,12 +3646,12 @@
png_permit_mng_features() function:
feature_set = png_permit_mng_features(png_ptr, mask)
- mask is a png_uint_32 containing the logical OR of the
+ mask is a png_uint_32 containing the bitwise OR of the
features you want to enable. These include
PNG_FLAG_MNG_EMPTY_PLTE
PNG_FLAG_MNG_FILTER_64
PNG_ALL_MNG_FEATURES
- feature_set is a png_uint_32 that is the logical AND of
+ feature_set is a png_uint_32 that is the bitwise AND of
your mask with the set of MNG features that is
supported by the version of libpng that you are using.
@@ -3711,13 +3714,13 @@
.SH IX. Y2K Compliance in libpng
-August 19, 2006
+October 19, 2006
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.0beta11 are Y2K compliant. It is my belief that earlier
+upward through 1.4.0beta12 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
@@ -3882,7 +3885,7 @@
1.4.0beta7-8 14 10400 14.so.0.0[.0]
1.2.11 13 10211 12.so.0.10[.0]
1.2.12 13 10212 12.so.0.10[.0]
- 1.4.0beta9-11 14 10400 14.so.0.0[.0]
+ 1.4.0beta9-12 14 10400 14.so.0.0[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3938,7 +3941,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.4.0beta11 - August 19, 2006:
+Libpng version 1.4.0beta12 - October 19, 2006:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -3959,7 +3962,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.0beta11, August 19, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0beta12, October 19, 2006, are
Copyright (c) 2004-2006 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
@@ -4058,7 +4061,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-August 19, 2006
+October 19, 2006
.\" end of man page
diff --git a/libpng.txt b/libpng.txt
index 484659b..ac2c7d6 100644
--- a/libpng.txt
+++ b/libpng.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.0beta11 - August 19, 2006
+ libpng version 1.4.0beta12 - October 19, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -392,7 +392,7 @@
png_read_png(png_ptr, info_ptr, png_transforms, NULL)
-where png_transforms is an integer containing the logical OR of
+where png_transforms is an integer containing the bitwise OR of
some set of transformation flags. This call is equivalent to png_read_info(),
followed the set of transformations indicated by the transform mask,
then png_read_image(), and finally png_read_end().
@@ -1270,7 +1270,7 @@
png_free_data(png_ptr, info_ptr, mask, seq)
mask - identifies data to be freed, a mask
- containing the logical OR of one or
+ containing the bitwise OR of one or
more of
PNG_FREE_PLTE, PNG_FREE_TRNS,
PNG_FREE_HIST, PNG_FREE_ICCP,
@@ -1332,7 +1332,7 @@
png_set_invalid(png_ptr, info_ptr, mask);
mask - identifies the chunks to be made invalid,
- containing the logical OR of one or
+ containing the bitwise OR of one or
more of
PNG_INFO_gAMA, PNG_INFO_sBIT,
PNG_INFO_cHRM, PNG_INFO_PLTE,
@@ -1644,7 +1644,7 @@
/* turn on or off filtering, and/or choose
specific filters. You can use either a single
- PNG_FILTER_VALUE_NAME or the logical OR of one
+ PNG_FILTER_VALUE_NAME or the bitwise OR of one
or more PNG_FILTER_NAME masks. */
png_set_filter(png_ptr, 0,
PNG_FILTER_NONE | PNG_FILTER_VALUE_NONE |
@@ -2017,7 +2017,7 @@
png_write_png(png_ptr, info_ptr, png_transforms, NULL)
-where png_transforms is an integer containing the logical OR of some set of
+where png_transforms is an integer containing the bitwise OR of some set of
transformation flags. This call is equivalent to png_write_info(),
followed the set of transformations indicated by the transform mask,
then png_write_image(), and finally png_write_end().
@@ -2277,7 +2277,7 @@
png_free_data(png_ptr, info_ptr, mask, seq)
mask - identifies data to be freed, a mask
- containing the logical OR of one or
+ containing the bitwise OR of one or
more of
PNG_FREE_PLTE, PNG_FREE_TRNS,
PNG_FREE_HIST, PNG_FREE_ICCP,
@@ -2418,6 +2418,9 @@
png_bytep data, png_size_t length);
void user_flush_data(png_structp png_ptr);
+The user_read_data() function is responsible for detecting and
+handling end-of-data errors.
+
Supplying NULL for the read, write, or flush functions sets them back
to using the default C stream functions. It is an error to read from
a write stream, and vice versa.
@@ -2846,12 +2849,12 @@
png_permit_mng_features() function:
feature_set = png_permit_mng_features(png_ptr, mask)
- mask is a png_uint_32 containing the logical OR of the
+ mask is a png_uint_32 containing the bitwise OR of the
features you want to enable. These include
PNG_FLAG_MNG_EMPTY_PLTE
PNG_FLAG_MNG_FILTER_64
PNG_ALL_MNG_FEATURES
- feature_set is a png_uint_32 that is the logical AND of
+ feature_set is a png_uint_32 that is the bitwise AND of
your mask with the set of MNG features that is
supported by the version of libpng that you are using.
@@ -2914,13 +2917,13 @@
IX. Y2K Compliance in libpng
-August 19, 2006
+October 19, 2006
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.0beta11 are Y2K compliant. It is my belief that earlier
+upward through 1.4.0beta12 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/libpngpf.3 b/libpngpf.3
index 93a571d..978b19a 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "August 19, 2006"
+.TH LIBPNGPF 3 "October 19, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta11
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta12
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 8c6f2f9..074670e 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "August 19, 2006"
+.TH PNG 5 "October 19, 2006"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index b48e377..a594761 100644
--- a/png.c
+++ b/png.c
@@ -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_0beta11 Your_png_h_is_not_version_1_4_0beta11;
+typedef version_1_4_0beta12 Your_png_h_is_not_version_1_4_0beta12;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@@ -635,7 +635,7 @@
png_get_copyright(png_structp png_ptr)
{
if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */
- return ((png_charp) "\n libpng version 1.4.0beta11 - August 19, 2006\n\
+ return ((png_charp) "\n libpng version 1.4.0beta12 - October 19, 2006\n\
Copyright (c) 1998-2006 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 3ebf3f2..e34cc1f 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.4.0beta11 - August 19, 2006
+ * libpng version 1.4.0beta12 - October 19, 2006
* Copyright (c) 1998-2006 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.0beta11 - August 19, 2006: Glenn
+ * libpng versions 0.97, January 1998, through 1.4.0beta12 - October 19, 2006: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -124,7 +124,7 @@
* 1.4.0beta7-8 14 10400 14.so.0.0[.0]
* 1.2.11 13 10211 12.so.0.10[.0]
* 1.2.12 13 10212 12.so.0.10[.0]
- * 1.4.0beta9-11 14 10400 14.so.0.0[.0]
+ * 1.4.0beta9-12 14 10400 14.so.0.0[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -154,7 +154,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.0beta11, August 19, 2006, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta12, October 19, 2006, are
* Copyright (c) 2004, 2006 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:
@@ -266,13 +266,13 @@
* Y2K compliance in libpng:
* =========================
*
- * August 19, 2006
+ * October 19, 2006
*
* 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.0beta11 are Y2K compliant. It is my belief that earlier
+ * upward through 1.4.0beta12 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
@@ -328,9 +328,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.4.0beta11"
+#define PNG_LIBPNG_VER_STRING "1.4.0beta12"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.4.0beta11 - August 19, 2006 (header)\n"
+ " libpng version 1.4.0beta12 - October 19, 2006 (header)\n"
#define PNG_LIBPNG_VER_SONUM 1
#define PNG_LIBPNG_VER_DLLNUM 14
@@ -342,7 +342,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 11
+#define PNG_LIBPNG_VER_BUILD 12
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -1337,7 +1337,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_0beta11;
+typedef png_structp version_1_4_0beta12;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index 27dd060..9480942 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.4.0beta11 - August 19, 2006
+ * libpng version 1.4.0beta12 - October 19, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -637,6 +637,10 @@
# ifndef PNG_ASSEMBLER_CODE_SUPPORTED
# define PNG_ASSEMBLER_CODE_SUPPORTED
# endif
+# if defined(XP_MACOSX) && !defined(PNG_NO_MMX_CODE)
+ /* work around Intel-Mac compiler bug */
+# define PNG_NO_MMX_CODE
+# endif
# if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE) && \
defined(__MMX__)
# define PNG_MMX_CODE_SUPPORTED
diff --git a/pngpriv.h b/pngpriv.h
index 2525d0f..a2e6029 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
- * libpng version 1.4.0beta11 - August 19, 2006
+ * libpng version 1.4.0beta12 - October 19, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrutil.c b/pngrutil.c
index b107895..5315381 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -3111,7 +3111,7 @@
if ((png_uint_32)png_ptr->rowbytes + 1 > (png_uint_32)65536L)
png_error(png_ptr, "This image requires a row greater than 64KB");
#endif
- if ((png_uint_32)png_ptr->rowbytes > PNG_SIZE_MAX - 1)
+ 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_ptr->rowbytes + 1);
diff --git a/pngset.c b/pngset.c
index ecef521..58c83a9 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1214,7 +1214,7 @@
#endif
/* we're replacing the settable bits with those passed in by the user,
- * so first zero them out of the master copy, then logical-OR in the
+ * so first zero them out of the master copy, then bitwise-OR in the
* allowed subset that was requested */
png_ptr->asm_flags &= ~settable_asm_flags; /* zero them */
diff --git a/pngtest.c b/pngtest.c
index cb41479..175c0b3 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1598,4 +1598,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_0beta11 your_png_h_is_not_version_1_4_0beta11;
+typedef version_1_4_0beta12 your_png_h_is_not_version_1_4_0beta12;
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index c47c295..3fabc05 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.4.0beta11
+version=1.4.0beta12
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index c3f5d20..3f02f5f 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.0beta11
+Version: 1.4.0beta12
Libs: -L${libdir} -lpng14
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 94356a1..41224db 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index ab68f2e..c90e723 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 33410ed..a7cc155 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@
LIBNAME=libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 27228f8..b8c808c 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index f6a91f3..f235e6d 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -65,7 +65,7 @@
LIBNAME = libpng14
PNGMAJ = 1
CYGDLL = 14
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index cae0d8a..5604376 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index db43350..169ff33 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index 25c40dc..6852872 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index e24195b..be27bcf 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 36a14cd..2007f79 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index 9ce5507..c3630cf 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 7e8e2e9..7d8707e 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index f459ef1..1fd0bce 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index a8dade3..10aa30c 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -66,7 +66,7 @@
LIBNAME = libpng14
PNGMAJ = 1
MINGDLL = 14
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index e7e9e17..273de14 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -14,7 +14,7 @@
LIB= png14
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.0beta11
+SHLIB_MINOR= 1.4.0beta12
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 9cec5b7..e00ce18 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.4.0beta11
+SHLIB_MINOR= 1.4.0beta12
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.openbsd b/scripts/makefile.openbsd
index 05b0e4a..09c9ad1 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -8,7 +8,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.0beta11
+SHLIB_MINOR= 1.4.0beta12
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 da22c1e..f92252a 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 49646d6..f54ca0e 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 3700d4c..d886b89 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 2b617ec..0791474 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 8630362..1b4be7a 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
-PNGMIN = 1.4.0beta11
+PNGMIN = 1.4.0beta12
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 9580082..fa86557 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.4.0beta11
+; Version 1.4.0beta12
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngwin.def b/scripts/pngwin.def
index 9b5d3c7..a39f164 100644
--- a/scripts/pngwin.def
+++ b/scripts/pngwin.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.4.0beta11
+;Version 1.4.0beta12
png_build_grayscale_palette
png_chunk_error
png_chunk_warning
