Imported from libpng-1.2.10rc3.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index ba0c436..a3365d5 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.2.10rc2 - April 19, 2006
+Libpng 1.2.10rc3 - April 21, 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
- 1.2.10rc2.tar.gz
- 1.2.10rc2.tar.bz2
+ 1.2.10rc3.tar.gz
+ 1.2.10rc3.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- 1.2.10rc2-no-config.tar.gz
- 1.2.10rc2-no-config.tar.bz2
+ 1.2.10rc3-no-config.tar.gz
+ 1.2.10rc3-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp1210r02.zip
- lp1210r02.tar.bz2
+ lp1210r03.zip
+ lp1210r03.tar.bz2
Project files
- 1.2.10rc2-project-netware.zip
- 1.2.10rc2-project-wince.zip
+ 1.2.10rc3-project-netware.zip
+ 1.2.10rc3-project-wince.zip
Other information:
- 1.2.10rc2-README.txt
- 1.2.10rc2-KNOWNBUGS.txt
- 1.2.10rc2-LICENSE.txt
- 1.2.10rc2-Y2K-compliance.txt
+ 1.2.10rc3-README.txt
+ 1.2.10rc3-KNOWNBUGS.txt
+ 1.2.10rc3-LICENSE.txt
+ 1.2.10rc3-Y2K-compliance.txt
Changes since the last public release (1.2.9):
@@ -68,11 +68,16 @@
Ensure pngconf.h doesn't define both PNG_USE_PNGGCCRD and PNG_USE_PNGVCRD
Fixed "LN_FS" typo in makefile.sco and makefile.solaris.
-version 1.2.10rc2 [April 19, 2006]
+version 1.2.10rc2 [April 20, 2006]
Added a backslash between -DPNG_CONFIGURE_LIBPNG and -DPNG_NO_ASSEMBLER_CODE
in configure.ac
Made the configure warning about versioned symbols less arrogant.
+version 1.2.10rc3 [April 21, 2006]
+ Added a note in libpng.txt that png_set_sig_bytes(8) can be used when
+ writing an embedded PNG without the 8-byte signature.
+ Revised makefiles and configure to avoid making links to libpng.so.*
+
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 bf5adc1..03218e7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1552,11 +1552,16 @@
Ensure pngconf.h doesn't define both PNG_USE_PNGGCCRD and PNG_USE_PNGVCRD
Fixed "LN_FS" typo in makefile.sco and makefile.solaris.
-version 1.2.10rc2 [April 19, 2006]
+version 1.2.10rc2 [April 20, 2006]
Added a backslash between -DPNG_CONFIGURE_LIBPNG and -DPNG_NO_ASSEMBLER_CODE
in configure.ac and configure
Made the configure warning about versioned symbols less arrogant.
+version 1.2.10rc2 [April 21, 2006]
+ Added a note in libpng.txt that png_set_sig_bytes(8) can be used when
+ writing an embedded PNG without the 8-byte signature.
+ Revised makefiles and configure to avoid making links to libpng.so.*
+
version 1.4.0beta1 [future]
Enabled iTXt support (changes png_struct, thus requires so-number change).
Removed deprecated functions png_read_init, png_write_init, png_info_init,
diff --git a/INSTALL b/INSTALL
index 0dbd37d..a95822e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.10rc2 - April 19, 2006
+Installing libpng version 1.2.10rc3 - April 21, 2006
On Unix/Linux and similar systems, you can simply type
@@ -29,7 +29,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.10rc2" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.10rc3" 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 +85,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.10rc2)
+ gcc, creates libpng12.so.0.1.2.10rc3)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.10rc2)
+ (gcc, creates libpng12.so.0.1.2.10rc3)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.10rc2,
+ (gcc, creates libpng12.so.0.1.2.10rc3,
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 +112,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.10rc2)
+ creates libpng12.so.0.1.2.10rc3)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng12.so.0.1.2.10rc2)
+ creates libpng12.so.0.1.2.10rc3)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng12.so.0.1.2.10rc2)
+ creates libpng12.so.0.1.2.10rc3)
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 66e0dfa..4640c97 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.2.10rc2
+Known bugs in libpng version 1.2.10rc3
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 fb2263d..7e2d4a9 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.10rc2, April 19, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.10rc3, April 21, 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
-April 19, 2006
+April 21, 2006
diff --git a/Makefile.am b/Makefile.am
index 00010fa..f9d18d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,19 +116,16 @@
cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
-# do evil things to libpng to cause libpng12 to be used, if
-# the compat library is not being built do nothing.
+# do evil things to libpng to cause libpng12 to be used
install-exec-hook:
cd $(DESTDIR)$(bindir); rm -f libpng-config
cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
- @if test -n "@compatlib@"; then\
- set -x;\
- cd $(DESTDIR)$(libdir);\
- for ext in a la so; do\
- rm -f libpng.$$ext;\
- $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
- done;\
- fi
+ @set -x;\
+ cd $(DESTDIR)$(libdir);\
+ for ext in a la so; do\
+ rm -f libpng.$$ext;\
+ $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
+ done
uninstall-hook:
cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
diff --git a/Makefile.in b/Makefile.in
index 405aa62..a18ad91 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1258,19 +1258,16 @@
cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
-# do evil things to libpng to cause libpng12 to be used, if
-# the compat library is not being built do nothing.
+# do evil things to libpng to cause libpng12 to be used
install-exec-hook:
cd $(DESTDIR)$(bindir); rm -f libpng-config
cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
- @if test -n "@compatlib@"; then\
- set -x;\
- cd $(DESTDIR)$(libdir);\
- for ext in a la so; do\
- rm -f libpng.$$ext;\
- $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
- done;\
- fi
+ @set -x;\
+ cd $(DESTDIR)$(libdir);\
+ for ext in a la so; do\
+ rm -f libpng.$$ext;\
+ $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
+ done
uninstall-hook:
cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
diff --git a/README b/README
index d5d35bf..3f18144 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.2.10rc2 - April 19, 2006 (shared library 12.0)
+README for libpng version 1.2.10rc3 - April 21, 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.10rc2)
+ gcc, creates libpng12.so.0.1.2.10rc3)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.10rc2)
+ (gcc, creates libpng12.so.0.1.2.10rc3)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.10rc2,
+ (gcc, creates libpng12.so.0.1.2.10rc3,
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.10rc2)
+ (gcc, creates libpng12.so.0.1.2.10rc3)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng12.so.0.1.2.10rc2)
+ (gcc, creates libpng12.so.0.1.2.10rc3)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng12.so.0.1.2.10rc2)
+ (gcc, creates libpng12.so.0.1.2.10rc3)
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 6f1f9f3..783e526 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- April 19, 2006
+ April 21, 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.10rc2 are Y2K compliant. It is my belief that earlier
+ upward through 1.2.10rc3 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
Libpng only has three year fields. One is a 2-byte unsigned integer
diff --git a/configure b/configure
index f4cd2c4..b3baf63 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.10rc2.
+# Generated by GNU Autoconf 2.59 for libpng 1.2.10rc3.
#
# 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.10rc2'
-PACKAGE_STRING='libpng 1.2.10rc2'
+PACKAGE_VERSION='1.2.10rc3'
+PACKAGE_STRING='libpng 1.2.10rc3'
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.10rc2 to adapt to many kinds of systems.
+\`configure' configures libpng 1.2.10rc3 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.10rc2:";;
+ short | recursive ) echo "Configuration of libpng 1.2.10rc3:";;
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.10rc2
+libpng configure 1.2.10rc3
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.10rc2, which was
+It was created by libpng $as_me 1.2.10rc3, 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.10rc2'
+ VERSION='1.2.10rc3'
cat >>confdefs.h <<_ACEOF
@@ -1979,7 +1979,7 @@
-PNGLIB_VERSION=1.2.10rc2
+PNGLIB_VERSION=1.2.10rc3
PNGLIB_MAJOR=12
PNGLIB_MINOR=10
@@ -20268,13 +20268,13 @@
withval="$with_libpng_compat"
if test "${withval}" = no; then
compatlib=
- { echo "$as_me:$LINENO: libpng.so will not be built" >&5
-echo "$as_me: libpng.so will not be built" >&6;}
else
compatlib=libpng.la
+ { echo "$as_me:$LINENO: libpng.so will be built" >&5
+echo "$as_me: libpng.so will be built" >&6;}
fi
else
- compatlib=libpng.la
+ compatlib=
fi;
@@ -20681,7 +20681,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by libpng $as_me 1.2.10rc2, which was
+This file was extended by libpng $as_me 1.2.10rc3, 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.10rc2
+libpng config.status 1.2.10rc3
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 caddff9..54ca1a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@
dnl Version number stuff here:
-AC_INIT([libpng], [1.2.10rc2], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.10rc3], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.2.10rc2
+PNGLIB_VERSION=1.2.10rc3
PNGLIB_MAJOR=12
PNGLIB_MINOR=10
@@ -121,11 +121,11 @@
[Generate the obsolete libpng.so library @<:@default=yes@:>@]),
[if test "${withval}" = no; then
compatlib=
- AC_MSG_NOTICE([libpng.so will not be built])
else
compatlib=libpng.la
+ AC_MSG_NOTICE([libpng.so will be built])
fi],
- [compatlib=libpng.la])
+ [compatlib=])
AC_SUBST([compatlib])
# Config files, substituting as above
diff --git a/libpng.3 b/libpng.3
index 903f62d..9f1c4b1 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "April 19, 2006"
+.TH LIBPNG 3 "April 21, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10rc2
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10rc3
.SH SYNOPSIS
\fB
#include <png.h>\fP
@@ -410,7 +410,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.10rc2 - April 19, 2006
+ libpng version 1.2.10rc3 - April 21, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -2011,6 +2011,14 @@
png_init_io(png_ptr, fp);
+If you are embedding your PNG into a datastream such as MNG, and don't
+want libpng to write the 8-byte signature, or if you have already
+written the signature in your application, use
+
+ png_set_sig_bytes(png_ptr, 8);
+
+to inform libpng that it should not write a signature.
+
.SS Write callbacks
At this point, you can set up a callback function that will be
@@ -3319,13 +3327,13 @@
.SH IX. Y2K Compliance in libpng
-April 19, 2006
+April 21, 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.10rc2 are Y2K compliant. It is my belief that earlier
+upward through 1.2.10rc3 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
@@ -3539,7 +3547,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.10rc2 - April 19, 2006:
+Libpng version 1.2.10rc3 - April 21, 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).
@@ -3560,7 +3568,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.10rc2, April 19, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.10rc3, April 21, 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
@@ -3659,7 +3667,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-April 19, 2006
+April 21, 2006
.\" end of man page
diff --git a/libpng.txt b/libpng.txt
index ac4df9b..672b7d1 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.10rc2 - April 19, 2006
+ libpng version 1.2.10rc3 - April 21, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -1601,6 +1601,14 @@
png_init_io(png_ptr, fp);
+If you are embedding your PNG into a datastream such as MNG, and don't
+want libpng to write the 8-byte signature, or if you have already
+written the signature in your application, use
+
+ png_set_sig_bytes(png_ptr, 8);
+
+to inform libpng that it should not write a signature.
+
Write callbacks
At this point, you can set up a callback function that will be
@@ -2909,13 +2917,13 @@
IX. Y2K Compliance in libpng
-April 19, 2006
+April 21, 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.10rc2 are Y2K compliant. It is my belief that earlier
+upward through 1.2.10rc3 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 bc25ba8..4c2f5a5 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "April 19, 2006"
+.TH LIBPNGPF 3 "April 21, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10rc2
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10rc3
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 956836a..1110fe4 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "April 19, 2006"
+.TH PNG 5 "April 21, 2006"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index c72cc93..ef73998 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_10rc2 Your_png_h_is_not_version_1_2_10rc2;
+typedef version_1_2_10rc3 Your_png_h_is_not_version_1_2_10rc3;
/* 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.10rc2 - April 19, 2006\n\
+ return ((png_charp) "\n libpng version 1.2.10rc3 - April 21, 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 2703718..fe9ec3c 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.10rc2 - April 19, 2006
+ * libpng version 1.2.10rc3 - April 21, 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.10rc2 - April 19, 2006: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.10rc3 - April 21, 2006: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -147,7 +147,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.10rc2, April 19, 2006, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.10rc3, April 21, 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:
@@ -259,13 +259,13 @@
* Y2K compliance in libpng:
* =========================
*
- * April 19, 2006
+ * April 21, 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.10rc2 are Y2K compliant. It is my belief that earlier
+ * upward through 1.2.10rc3 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
@@ -321,9 +321,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.10rc2"
+#define PNG_LIBPNG_VER_STRING "1.2.10rc3"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.10rc2 - April 19, 2006 (header)\n"
+ " libpng version 1.2.10rc3 - April 21, 2006 (header)\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@@ -335,7 +335,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 2
+#define PNG_LIBPNG_VER_BUILD 3
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -462,7 +462,7 @@
PNG_EXPORT_VAR (const int FARDATA) png_pass_yinc[7];
PNG_EXPORT_VAR (const int FARDATA) png_pass_mask[7];
PNG_EXPORT_VAR (const int FARDATA) png_pass_dsp_mask[7];
-#ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW
+#ifdef PNG_USE_PNGGCCRD
PNG_EXPORT_VAR (const int FARDATA) png_pass_width[7];
#endif
/* This isn't currently used. If you need it, see png.c for more details.
@@ -1365,7 +1365,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_10rc2;
+typedef png_structp version_1_2_10rc3;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index 71d721d..590777e 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.2.10rc2 - April 19, 2006
+ * libpng version 1.2.10rc3 - April 21, 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)
diff --git a/pngtest.c b/pngtest.c
index e92b5a0..14dce4a 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_10rc2 your_png_h_is_not_version_1_2_10rc2;
+typedef version_1_2_10rc3 your_png_h_is_not_version_1_2_10rc3;
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index c2c8dd4..8feec73 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.2.10rc2
+version=1.2.10rc3
prefix=""
libdir=""
libs=""
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index b42eec1..64e10cc 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index fb7b62a..591caa7 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 9de7410..79f4e9a 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index e1726e0..81e9951 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index e36ba86..03b3724 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -80,7 +80,7 @@
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 64adcfa..df333c3 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 515afad..c89729e 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index 80e6e47..f605f38 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index dd05c65..ded090a 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 5912766..fe52b10 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index 2416e64..a79ecfc 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 52de550..8a3a3a9 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index d73f90c..31458bd 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index fbf2beb..0b1c060 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -76,7 +76,7 @@
LIBNAME = libpng12
PNGMAJ = 0
MINGDLL = 12
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 0b59d26..985ce33 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.10rc2
+SHLIB_MINOR= 1.2.10rc3
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 c1e95ff..5d7efec 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.2.10rc2
+SHLIB_MINOR= 1.2.10rc3
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 9f0754e..a0b8717 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -7,7 +7,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.10rc2
+SHLIB_MINOR= 1.2.10rc3
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 ff2e23c..23f49a7 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index a618a81..595b162 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 5256533..0f7c900 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index aa5429c..8823d6f 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 0c3c6b7..89531e7 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.10rc2
+PNGMIN = 1.2.10rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index f210f51..b3a2f67 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.2.10rc2
+; Version 1.2.10rc3
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
@@ -88,7 +88,7 @@
png_read_end
png_read_image
png_read_info
- png_read_init ; deprecated
+; png_read_init ; deprecated
png_read_png
png_read_row
png_read_rows
@@ -118,7 +118,7 @@
png_set_gAMA
png_set_gAMA_fixed
png_set_gamma
- png_set_gray_1_2_4_to_8 ; deprecated as of libpng-1.2.9
+; png_set_gray_1_2_4_to_8 ; deprecated as of libpng-1.2.9
png_set_gray_to_rgb
png_set_hIST
png_set_iCCP
@@ -173,7 +173,7 @@
png_write_image
png_write_info
png_write_info_before_PLTE
- png_write_init ; deprecated
+; png_write_init ; deprecated
png_write_png
png_write_row
png_write_rows
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index fa68a69..74d1e85 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.2.10rc2
+;Version 1.2.10rc3
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
@@ -114,7 +114,8 @@
png_set_gAMA @104
png_set_gAMA_fixed @105
png_set_gamma @106
- png_set_gray_1_2_4_to_8 @107 ; deprecated
+; png_set_gray_1_2_4_to_8 is deprecated
+ png_set_gray_1_2_4_to_8 @107
png_set_gray_to_rgb @108
png_set_hIST @109
png_set_iCCP @110
@@ -178,14 +179,14 @@
png_read_init_2 @166
png_write_init_2 @167
png_access_version_number @168
-; png_sig_bytes @169
-; png_libpng_ver @170
+ png_sig_bytes @169
+ png_libpng_ver @170
png_init_io @171
png_convert_to_rfc1123 @172
png_set_invalid @173
; Added at version 1.0.12
; For compatibility with 1.0.7-1.0.11
- png_info_init @174
+; png_info_init @174
png_read_init_3 @175
png_write_init_3 @176
png_info_init_3 @177
@@ -201,13 +202,13 @@
png_permit_mng_features @184
; MMX support
png_mmx_support @185
- png_get_mmx_flagmask @186
+; png_get_mmx_flagmask @186
png_get_asm_flagmask @187
png_get_asm_flags @188
- png_get_mmx_bitdepth_threshold @189
- png_get_mmx_rowbytes_threshold @190
+; png_get_mmx_bitdepth_threshold @189
+; png_get_mmx_rowbytes_threshold @190
png_set_asm_flags @191
- png_init_mmx_flags @192
+; png_init_mmx_flags @192
; Strip error numbers
png_set_strip_error_numbers @193
; Added at version 1.2.2
