Imported from libpng-1.2.11rc2.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 48863d7..f5ee358 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.2.11rc1 - June 13, 2006
+Libpng 1.2.11rc2 - June 14, 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,32 +9,32 @@
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- libpng-1.2.11rc1.tar.gz
- libpng-1.2.11rc1.tar.bz2
+ libpng-1.2.11rc2.tar.gz
+ libpng-1.2.11rc2.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- libpng-1.2.11rc1-no-config.tar.gz
- libpng-1.2.11rc1-no-config.tar.bz2
+ libpng-1.2.11rc2-no-config.tar.gz
+ libpng-1.2.11rc2-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp1211r01.zip
- lp1211r01.tar.bz2
+ lp1211r02.zip
+ lp1211r02.tar.bz2
Project files
- libpng-1.2.11rc1-project-netware.zip
- libpng-1.2.11rc1-project-wince.zip
+ libpng-1.2.11rc2-project-netware.zip
+ libpng-1.2.11rc2-project-wince.zip
Other information:
- libpng-1.2.11rc1-README.txt
- libpng-1.2.11rc1-KNOWNBUGS.txt
- libpng-1.2.11rc1-LICENSE.txt
- libpng-1.2.11rc1-Y2K-compliance.txt
+ libpng-1.2.11rc2-README.txt
+ libpng-1.2.11rc2-KNOWNBUGS.txt
+ libpng-1.2.11rc2-LICENSE.txt
+ libpng-1.2.11rc2-Y2K-compliance.txt
Changes since the last public release (1.2.10):
@@ -61,9 +61,15 @@
Allow zero-length IDAT chunks after the entire zlib datastream, but not
after another intervening chunk type.
-version 1.2.11rc1 [June 13, 2006]
+version 1.2.11rc1 [June 14, 2006]
Deleted extraneous square brackets from [config.h] in configure.ac
+version 1.2.11rc2 [June 14, 2006]
+ Added prototypes for PNG_INCH_CONVERSIONS functions to png.h
+ Revised INSTALL and autogen.sh
+ Fixed typo in several makefiles (-W1 should be -Wl)
+ Added typedef for png_int_32 and png_uint_32 on 64-bit systems.
+
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/CHANGES b/CHANGES
index 4705d55..c5dfe1d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1591,6 +1591,12 @@
version 1.2.11rc1 [June 13, 2006]
Deleted extraneous square brackets from [config.h] in configure.ac
+version 1.2.11rc2 [June 14, 2006]
+ Added prototypes for PNG_INCH_CONVERSIONS functions to png.h
+ Revised INSTALL and autogen.sh
+ Fixed typo in several makefiles (-W1 should be -Wl)
+ Added typedef for png_int_32 and png_uint_32 on 64-bit systems.
+
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 7f8658a..09213c6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,16 +1,24 @@
-Installing libpng version 1.2.11rc1 - June 13, 2006
+Installing libpng version 1.2.11rc2 - June 14, 2006
On Unix/Linux and similar systems, you can simply type
- ./autogen.sh
./configure [--prefix=$HOME]
make check
make install
and ignore the rest of this document.
-Or you can use one of the custom-built makefiles in the
+If configure does not work on your system and you have a reasonably
+up-to-date set of tools, running ./autogen.sh before running ./configure
+may fix the problem. You can also run the individual commands in
+autogen.sh with the --force option, if supported by your version of
+the tools. If you run 'libtoolize --force', though, this will replace
+the distributed, patched, version of ltmain.sh with an unpatched version
+and your shared library builds may fail to produce libraries with the
+correct version numbers.
+
+Instead, you can use one of the custom-built makefiles in the
"scripts" directory
cp scripts/makefile.system makefile
@@ -29,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.2.11rc1" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.11rc2" 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:
@@ -85,11 +93,11 @@
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng12.so.0.1.2.11rc1)
+ gcc, creates libpng12.so.0.1.2.11rc2)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.11rc1)
+ (gcc, creates libpng12.so.0.1.2.11rc2)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.11rc1,
+ (gcc, creates libpng12.so.0.1.2.11rc2,
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
@@ -112,12 +120,12 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.sggcc => Silicon Graphics (gcc,
- creates libpng12.so.0.1.2.11rc1)
+ creates libpng12.so.0.1.2.11rc2)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng12.so.0.1.2.11rc1)
+ creates libpng12.so.0.1.2.11rc2)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng12.so.0.1.2.11rc1)
+ creates libpng12.so.0.1.2.11rc2)
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 7eaa1e1..0fe288b 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.2.11rc1
+Known bugs in libpng version 1.2.11rc2
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 0076914..5eadd20 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.2.11rc1, June 13, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.11rc2, June 14, 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
-June 13, 2006
+June 14, 2006
diff --git a/Makefile.am b/Makefile.am
index f9d18d2..dd94484 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,7 +85,8 @@
$(TESTS) \
example.c libpng.txt pngvcrd.c
-CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers libpng.sym
+CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \
+libpng.sym
$(PNGLIB_BASENAME).pc: libpng.pc
cp libpng.pc $@
@@ -95,7 +96,7 @@
libpng.sym: png.h pngconf.h
rm -f $@ $@.new
- $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \
+ $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS png.h | \
$(SED) -n -e 's|^.*PNG_FUNCTION_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \
-e 's|^.*PNG_DATA_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \
>$@.new
diff --git a/README b/README
index 41b3849..f9dddad 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.2.11rc1 - June 13, 2006 (shared library 12.0)
+README for libpng version 1.2.11rc2 - June 14, 2006 (shared library 12.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@@ -190,11 +190,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 libpng12.so.0.1.2.11rc1)
+ gcc, creates libpng12.so.0.1.2.11rc2)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.11rc1)
+ (gcc, creates libpng12.so.0.1.2.11rc2)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.11rc1,
+ (gcc, creates libpng12.so.0.1.2.11rc2,
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
@@ -216,12 +216,12 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
- (gcc, creates libpng12.so.0.1.2.11rc1)
+ (gcc, creates libpng12.so.0.1.2.11rc2)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng12.so.0.1.2.11rc1)
+ (gcc, creates libpng12.so.0.1.2.11rc2)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng12.so.0.1.2.11rc1)
+ (gcc, creates libpng12.so.0.1.2.11rc2)
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 dd16e4c..7e6ea37 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- June 13, 2006
+ June 14, 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.2.11rc1 are Y2K compliant. It is my belief that earlier
+ upward through 1.2.11rc2 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/autogen.sh b/autogen.sh
index 98b966a..c9e67cc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,6 +4,7 @@
#
# WARNING: if you run this you will change the versions
# of the tools which are used and, maybe, required!
+ touch Makefile.am configure.ac
{
echo "running libtoolize" >&2
libtoolize --copy --automake
diff --git a/configure b/configure
index fefec12..0786c5b 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.2.11rc1.
+# Generated by GNU Autoconf 2.59 for libpng 1.2.11rc2.
#
# 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.2.11rc1'
-PACKAGE_STRING='libpng 1.2.11rc1'
+PACKAGE_VERSION='1.2.11rc2'
+PACKAGE_STRING='libpng 1.2.11rc2'
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.2.11rc1 to adapt to many kinds of systems.
+\`configure' configures libpng 1.2.11rc2 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.2.11rc1:";;
+ short | recursive ) echo "Configuration of libpng 1.2.11rc2:";;
esac
cat <<\_ACEOF
@@ -1167,7 +1167,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.2.11rc1
+libpng configure 1.2.11rc2
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.2.11rc1, which was
+It was created by libpng $as_me 1.2.11rc2, 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.2.11rc1'
+ VERSION='1.2.11rc2'
cat >>confdefs.h <<_ACEOF
@@ -1979,7 +1979,7 @@
-PNGLIB_VERSION=1.2.11rc1
+PNGLIB_VERSION=1.2.11rc2
PNGLIB_MAJOR=12
PNGLIB_MINOR=11
@@ -20681,7 +20681,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by libpng $as_me 1.2.11rc1, which was
+This file was extended by libpng $as_me 1.2.11rc2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20744,7 +20744,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libpng config.status 1.2.11rc1
+libpng config.status 1.2.11rc2
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 d037a5f..7f6afe9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@
dnl Version number stuff here:
-AC_INIT([libpng], [1.2.11rc1], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.11rc2], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.2.11rc1
+PNGLIB_VERSION=1.2.11rc2
PNGLIB_MAJOR=12
PNGLIB_MINOR=11
diff --git a/libpng.3 b/libpng.3
index fd2d6e3..8e7d997 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "June 13, 2006"
+.TH LIBPNG 3 "June 14, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11rc1
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11rc2
.SH SYNOPSIS
\fI\fB
@@ -821,7 +821,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.11rc1 - June 13, 2006
+ libpng version 1.2.11rc2 - June 14, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -3738,13 +3738,13 @@
.SH IX. Y2K Compliance in libpng
-June 13, 2006
+June 14, 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.2.11rc1 are Y2K compliant. It is my belief that earlier
+upward through 1.2.11rc2 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
@@ -3905,8 +3905,8 @@
1.2.10rc1-3 13 10210 12.so.0.10[.0]
1.2.10 13 10210 12.so.0.10[.0]
1.2.11beta1-4 13 10211 12.so.0.11[.0]
- 1.0.19rc1 10 10019 10.so.0.19[.0]
- 1.2.11rc1 13 10211 12.so.0.11[.0]
+ 1.0.19rc1-2 10 10019 10.so.0.19[.0]
+ 1.2.11rc1-2 13 10211 12.so.0.11[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3962,7 +3962,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.11rc1 - June 13, 2006:
+Libpng version 1.2.11rc2 - June 14, 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).
@@ -3983,7 +3983,7 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.2.11rc1, June 13, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.11rc2, June 14, 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
@@ -4082,7 +4082,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-June 13, 2006
+June 14, 2006
.\" end of man page
diff --git a/libpng.txt b/libpng.txt
index 4af01f1..2675403 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.2.11rc1 - June 13, 2006
+ libpng version 1.2.11rc2 - June 14, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -2917,13 +2917,13 @@
IX. Y2K Compliance in libpng
-June 13, 2006
+June 14, 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.2.11rc1 are Y2K compliant. It is my belief that earlier
+upward through 1.2.11rc2 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 2b92e48..2720e6f 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "June 13, 2006"
+.TH LIBPNGPF 3 "June 14, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11rc1
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11rc2
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 5ff0b32..bf6052d 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "June 13, 2006"
+.TH PNG 5 "June 14, 2006"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 383ee2c..2c07662 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_2_11rc1 Your_png_h_is_not_version_1_2_11rc1;
+typedef version_1_2_11rc2 Your_png_h_is_not_version_1_2_11rc2;
/* 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)
{
if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */
- return ((png_charp) "\n libpng version 1.2.11rc1 - June 13, 2006\n\
+ return ((png_charp) "\n libpng version 1.2.11rc2 - June 14, 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 cff3048..879036e 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.11rc1 - June 13, 2006
+ * libpng version 1.2.11rc2 - June 14, 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.2.11rc1 - June 13, 2006: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.11rc2 - June 14, 2006: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -120,8 +120,8 @@
* 1.2.10rc1-3 13 10210 12.so.0.10[.0]
* 1.2.10 13 10210 12.so.0.10[.0]
* 1.2.11beta1-4 13 10211 12.so.0.11[.0]
- * 1.0.19rc1 10 10019 10.so.0.19[.0]
- * 1.2.11rc1 13 10211 12.so.0.11[.0]
+ * 1.0.19rc1-2 10 10019 10.so.0.19[.0]
+ * 1.2.11rc1-2 13 10211 12.so.0.11[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -151,7 +151,7 @@
* If you modify libpng you may insert additional notices immediately following
* this sentence.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.2.11rc1, June 13, 2006, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.11rc2, June 14, 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:
@@ -263,13 +263,13 @@
* Y2K compliance in libpng:
* =========================
*
- * June 13, 2006
+ * June 14, 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.2.11rc1 are Y2K compliant. It is my belief that earlier
+ * upward through 1.2.11rc2 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
@@ -325,9 +325,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.11rc1"
+#define PNG_LIBPNG_VER_STRING "1.2.11rc2"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.11rc1 - June 13, 2006 (header)\n"
+ " libpng version 1.2.11rc2 - June 14, 2006 (header)\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@@ -339,7 +339,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 1
+#define PNG_LIBPNG_VER_BUILD 2
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -1369,7 +1369,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_2_11rc1;
+typedef png_structp version_1_2_11rc2;
typedef png_struct FAR * FAR * png_structpp;
@@ -3441,6 +3441,29 @@
/* png.c */ /* PRIVATE */
PNG_EXTERN void png_init_mmx_flags PNGARG((png_structp png_ptr));
#endif
+
+#if defined(PNG_INCH_CONVERSIONS) && defined(PNG_FLOATING_POINT_SUPPORTED)
+PNG_EXTERN png_uint_32 png_get_pixels_per_inch PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+PNG_EXTERN png_uint_32 png_get_x_pixels_per_inch PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+PNG_EXTERN png_uint_32 png_get_y_pixels_per_inch PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+PNG_EXTERN float png_get_x_offset_inches PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+PNG_EXTERN float png_get_y_offset_inches PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#if defined(PNG_pHYs_SUPPORTED)
+PNG_EXTERN png_uint_32 png_get_pHYs_dpi PNGARG((png_structp png_ptr,
+png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
+#endif /* PNG_pHYs_SUPPORTED */
+#endif /* PNG_INCH_CONVERSIONS && PNG_FLOATING_POINT_SUPPORTED */
+
/* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */
#endif /* PNG_INTERNAL */
diff --git a/pngconf.h b/pngconf.h
index 619cb6a..306f7ff 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.2.11rc1 - June 13, 2006
+ * libpng version 1.2.11rc2 - June 14, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2005 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1082,8 +1082,13 @@
* want to have unsigned int for png_uint_32 instead of unsigned long.
*/
+#if (__WORDSIZE == 64) || defined(_LP64) || (_MIPS_SZLONG == 64)
+typedef unsigned int png_uint_32;
+typedef int png_int_32;
+#else
typedef unsigned long png_uint_32;
typedef long png_int_32;
+#endif
typedef unsigned short png_uint_16;
typedef short png_int_16;
typedef unsigned char png_byte;
diff --git a/pngtest.c b/pngtest.c
index dabaaf0..3f02f1c 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1549,4 +1549,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_11rc1 your_png_h_is_not_version_1_2_11rc1;
+typedef version_1_2_11rc2 your_png_h_is_not_version_1_2_11rc2;
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index 0d6772c..7f6119e 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.2.11rc1
+version=1.2.11rc2
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index d7cd19a..0ad376a 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.2.11rc1
+Version: 1.2.11rc2
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index a114dec..da64fad 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 37fd787..a1e21f6 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 8137c85..742f28d 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index a6ab5dc..e5f2f31 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@@ -185,7 +185,7 @@
echo Testing installed dynamic shared library in $(DL).
$(CC) -I$(DI) $(CFLAGS) \
`$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(DL) -L$(ZLIBLIB) -W1,-rpath $(ZLIBLIB):$(DL) \
+ -L$(DL) -L$(ZLIBLIB) -Wl,-rpath $(ZLIBLIB):$(DL) \
-o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
./pngtestd pngtest.png
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index e3d34af..c398481 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -80,7 +80,7 @@
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 5da44a8..456c7b5 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 1c89883..31512f8 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index 44c5a64..fa83425 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@@ -229,7 +229,7 @@
echo Testing installed dynamic shared library in $(DL).
$(CC) -I$(DI) -I$(ZLIBINC) \
`$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(DL) -L$(ZLIBLIB) -W1, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
+ -L$(DL) -L$(ZLIBLIB) -Wl, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
-o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
./pngtestd pngtest.png
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 4eb8bdd..da8f592 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@@ -235,7 +235,7 @@
echo Testing installed dynamic shared library in $(DL).
$(CC) -I$(DI) -I$(ZLIBINC) \
`$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(DL) -L$(ZLIBLIB) -W1, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
+ -L$(DL) -L$(ZLIBLIB) -Wl, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
-o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
./pngtestd pngtest.png
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 9016e7b..3661724 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index ffcd06b..178c4a2 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@@ -197,7 +197,7 @@
echo Testing installed dynamic shared library in $(DL).
$(CC) -I$(DI) -I$(ZLIBINC) \
`$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(DL) -L$(ZLIBLIB) -W1,-rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
+ -L$(DL) -L$(ZLIBLIB) -Wl,-rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
-o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
./pngtestd pngtest.png
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 1f075cf..ed5296b 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index be60372..5c4a20f 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@@ -203,7 +203,7 @@
echo Testing installed dynamic shared library in $(DL).
$(CC) -I$(DI) -I$(ZLIBINC) \
`$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(DL) -L$(ZLIBLIB) -W1, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
+ -L$(DL) -L$(ZLIBLIB) -Wl, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
-o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
./pngtestd pngtest.png
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index 07d5a51..fd936e5 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -76,7 +76,7 @@
LIBNAME = libpng12
PNGMAJ = 0
MINGDLL = 12
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 0e9400c..fafb38f 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.11rc1
+SHLIB_MINOR= 1.2.11rc2
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 0941345..fb4c1d6 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.2.11rc1
+SHLIB_MINOR= 1.2.11rc2
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 1ed804d..2cf3d39 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -7,7 +7,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.11rc1
+SHLIB_MINOR= 1.2.11rc2
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 0c5f0ce..7407b83 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index b4701eb..e035aa0 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 0758c58..0a2c83d 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 874002c..5e68211 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 298e6d6..bd64cde 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.11rc1
+PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index f0521ae..b8c69bc 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.2.11rc1
+; Version 1.2.11rc2
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index 8209da8..0a437e9 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.2.11rc1
+;Version 1.2.11rc2
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
