summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2006-11-15 06:50:12 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2011-09-03 12:23:41 -0500
commit64b481e7140c547c675165401e976c25182fd071 (patch)
tree2641966f66b9b3b50202b79ffd96ecc4ef12142c
parent0f5e1e5a39387bb091708edec0f5153711f7dab9 (diff)
downloadlibpng-64b481e7140c547c675165401e976c25182fd071.tar.gz
[libpng10] Imported from libpng-1.0.21.tarv1.0.21
-rw-r--r--ANNOUNCE41
-rw-r--r--CHANGES6
-rw-r--r--INSTALL16
-rw-r--r--KNOWNBUG2
-rw-r--r--LICENSE4
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in2
-rw-r--r--README14
-rw-r--r--Y2KINFO4
-rwxr-xr-xconfigure22
-rw-r--r--configure.ac4
-rw-r--r--libpng.321
-rw-r--r--libpng.txt6
-rw-r--r--libpngpf.34
-rw-r--r--png.52
-rw-r--r--png.c4
-rw-r--r--png.h25
-rw-r--r--pngconf.h2
-rw-r--r--pngtest.c2
-rwxr-xr-xscripts/libpng-config-head.in2
-rw-r--r--scripts/libpng.pc.in2
-rw-r--r--scripts/makefile.32sunu2
-rw-r--r--scripts/makefile.64sunu2
-rw-r--r--scripts/makefile.aix2
-rw-r--r--scripts/makefile.beos2
-rw-r--r--scripts/makefile.cygwin2
-rw-r--r--scripts/makefile.darwin2
-rw-r--r--scripts/makefile.dec2
-rw-r--r--scripts/makefile.elf2
-rw-r--r--scripts/makefile.gcmmx2
-rw-r--r--scripts/makefile.hp642
-rw-r--r--scripts/makefile.hpgcc2
-rw-r--r--scripts/makefile.hpux2
-rw-r--r--scripts/makefile.linux2
-rw-r--r--scripts/makefile.mingw2
-rw-r--r--scripts/makefile.ne12bsd2
-rw-r--r--scripts/makefile.netbsd2
-rw-r--r--scripts/makefile.openbsd2
-rw-r--r--scripts/makefile.sco2
-rw-r--r--scripts/makefile.sggcc2
-rw-r--r--scripts/makefile.sgi2
-rw-r--r--scripts/makefile.so92
-rw-r--r--scripts/makefile.solaris2
-rw-r--r--scripts/pngos2.def2
-rw-r--r--scripts/pngw32.def2
45 files changed, 116 insertions, 119 deletions
diff --git a/ANNOUNCE b/ANNOUNCE
index 89003925f..17fa62c6a 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,54 +1,51 @@
-Libpng 1.0.21rc2 - November 13, 2006
+Libpng 1.0.21 - November 15, 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.
+This is a public release of libpng, intended for use in production codes.
Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- libpng-1.0.21rc2.tar.gz
- libpng-1.0.21rc2.tar.bz2
+ libpng-1.0.21.tar.gz
+ libpng-1.0.21.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- libpng-1.0.21rc2-no-config.tar.gz
- libpng-1.0.21rc2-no-config.tar.bz2
+ libpng-1.0.21-no-config.tar.gz
+ libpng-1.0.21-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp1021r02.zip
- lp1021r02.tar.bz2
+ lpng1021.zip
+ lpng1021.tar.bz2
Project files
- libpng-1.0.21rc2-project-netware.zip
- libpng-1.0.21rc2-project-wince.zip
+ libpng-1.0.21-project-netware.zip
+ libpng-1.0.21-project-wince.zip
Other information:
- libpng-1.0.21rc2-README.txt
- libpng-1.0.21rc2-KNOWNBUGS.txt
- libpng-1.0.21rc2-LICENSE.txt
- libpng-1.0.21rc2-Y2K-compliance.txt
+ libpng-1.0.21-README.txt
+ libpng-1.0.21-KNOWNBUGS.txt
+ libpng-1.0.21-LICENSE.txt
+ libpng-1.0.21-Y2K-compliance.txt
Changes since the last public release (1.0.20):
-version 1.2.13beta1 [October 2, 2006]
+version 1.0.21 [November 15, 2006]
+
+version 1.0.21 and 1.2.13 [November 15, 2006]
Removed AC_FUNC_MALLOC from configure.ac
Work around Intel-Mac compiler bug by setting PNG_NO_MMX_CODE in pngconf.h
Change "logical" to "bitwise" throughout documentation.
-
-version 1.0.21rc1.2.13rc1 [November 10, 2006]
- Fix potential buffer overflow in sPLT chunk handler.
Fix Makefile.am to not try to link to noexistent files.
- Fix pngerror.c to not use NULL png_ptr.
-
-version 1.0.21rc2, 1.2.13rc2 [November 13, 2006]
+ Detect and fix attempt to write wrong iCCP profile length.
+ Fix potential buffer overflow in sPLT chunk handler.
Check all exported functions for NULL png_ptr.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
diff --git a/CHANGES b/CHANGES
index b238d85b5..5a1b6740e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1608,13 +1608,11 @@ version 1.2.13beta1 [October 2, 2006]
Removed AC_FUNC_MALLOC from configure.ac
Work around Intel-Mac compiler bug by setting PNG_NO_MMX_CODE in pngconf.h
Change "logical" to "bitwise" throughout documentation.
+ Detect and fix attempt to write wrong iCCP profile length.
-version 1.0.21rc1, 1.2.13rc1 [November 10, 2006]
+version 1.0.21, 1.2.13 [November 15, 2006]
Fix potential buffer overflow in sPLT chunk handler.
Fix Makefile.am to not try to link to noexistent files.
- Fix pngerror.c to not use NULL png_ptr.
-
-version 1.0.21rc2, 1.2.13rc2 [November 13, 2006]
Check all exported functions for NULL png_ptr.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
diff --git a/INSTALL b/INSTALL
index 6959fc6f7..80186bbed 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.0.21rc2 - November 13, 2006
+Installing libpng version 1.0.21 - November 15, 2006
On Unix/Linux and similar systems, you can simply type
@@ -37,7 +37,7 @@ to have access to the zlib.h and zconf.h include files that
correspond to the version of zlib that's installed.
You can rename the directories that you downloaded (they
-might be called "libpng-1.0.21rc2" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.0.21" 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:
@@ -93,11 +93,11 @@ include
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng10.so.0.1.0.21rc2)
+ gcc, creates libpng10.so.0.1.0.21)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng10.so.0.1.0.21rc2)
+ (gcc, creates libpng10.so.0.1.0.21)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng10.so.0.1.0.21rc2,
+ (gcc, creates libpng10.so.0.1.0.21,
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
@@ -120,12 +120,12 @@ include
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.sggcc => Silicon Graphics (gcc,
- creates libpng10.so.0.1.0.21rc2)
+ creates libpng10.so.0.1.0.21)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng10.so.0.1.0.21rc2)
+ creates libpng10.so.0.1.0.21)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng10.so.0.1.0.21rc2)
+ creates libpng10.so.0.1.0.21)
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 f2b15d929..83553f512 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.0.21rc2
+Known bugs in libpng version 1.0.21
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 92d2b340b..38d52d558 100644
--- a/LICENSE
+++ b/LICENSE
@@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.0.21rc2, November 13, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.0.21, November 15, 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 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-November 13, 2006
+November 15, 2006
diff --git a/Makefile.am b/Makefile.am
index 8448ac88b..494e990b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,7 @@ libpng10_la_LDFLAGS = -no-undefined -export-dynamic \
-version-number 0:@PNGLIB_MINOR@:0
# -rpath is needed as automake doesn't know the directory
libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
- -version-number 3:@PNGLIB_MINOR@:0
+ -version-number 2:@PNGLIB_MINOR@:0
if HAVE_LD_VERSION_SCRIPT
# Versioned symbols and restricted exports
diff --git a/Makefile.in b/Makefile.in
index bc8b144e4..4a5e03e29 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -291,7 +291,7 @@ libpng10_la_LDFLAGS = -no-undefined -export-dynamic -version-number \
0:@PNGLIB_MINOR@:0 $(am__append_1) $(am__append_2)
# -rpath is needed as automake doesn't know the directory
libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
- -version-number 3:@PNGLIB_MINOR@:0
+ -version-number 2:@PNGLIB_MINOR@:0
@HAVE_LD_VERSION_SCRIPT_FALSE@libpng10_la_DEPENDENCIES = libpng.sym
@HAVE_LD_VERSION_SCRIPT_TRUE@libpng10_la_DEPENDENCIES = libpng.vers
diff --git a/README b/README
index ebdf28de4..9333a91dc 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.0.21rc2 - November 13, 2006 (shared library 10.0)
+README for libpng version 1.0.21 - November 15, 2006 (shared library 10.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@@ -190,11 +190,11 @@ Files in this distribution:
descrip.mms => VMS makefile for MMS or MMK
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng10.so.0.1.0.21rc2)
+ gcc, creates libpng10.so.0.1.0.21)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng10.so.0.1.0.21rc2)
+ (gcc, creates libpng10.so.0.1.0.21)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng10.so.0.1.0.21rc2,
+ (gcc, creates libpng10.so.0.1.0.21,
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 @@ Files in this distribution:
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
- (gcc, creates libpng10.so.0.1.0.21rc2)
+ (gcc, creates libpng10.so.0.1.0.21)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng10.so.0.1.0.21rc2)
+ (gcc, creates libpng10.so.0.1.0.21)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng10.so.0.1.0.21rc2)
+ (gcc, creates libpng10.so.0.1.0.21)
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 019475ade..8b398732c 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- November 13, 2006
+ November 15, 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.0.21rc2 are Y2K compliant. It is my belief that earlier
+ upward through 1.0.21 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 d54c90c27..d294accb7 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.0.21rc2.
+# Generated by GNU Autoconf 2.59 for libpng 1.0.21.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.0.21rc2'
-PACKAGE_STRING='libpng 1.0.21rc2'
+PACKAGE_VERSION='1.0.21'
+PACKAGE_STRING='libpng 1.0.21'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
@@ -954,7 +954,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libpng 1.0.21rc2 to adapt to many kinds of systems.
+\`configure' configures libpng 1.0.21 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.0.21rc2:";;
+ short | recursive ) echo "Configuration of libpng 1.0.21:";;
esac
cat <<\_ACEOF
@@ -1167,7 +1167,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.0.21rc2
+libpng configure 1.0.21
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1181,7 +1181,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libpng $as_me 1.0.21rc2, which was
+It was created by libpng $as_me 1.0.21, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1824,7 +1824,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.0.21rc2'
+ VERSION='1.0.21'
cat >>confdefs.h <<_ACEOF
@@ -1979,7 +1979,7 @@ fi
-PNGLIB_VERSION=1.0.21rc2
+PNGLIB_VERSION=1.0.21
PNGLIB_MAJOR=10
PNGLIB_MINOR=21
@@ -20601,7 +20601,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by libpng $as_me 1.0.21rc2, which was
+This file was extended by libpng $as_me 1.0.21, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20664,7 +20664,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libpng config.status 1.0.21rc2
+libpng config.status 1.0.21
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 43a501511..0daf08cd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
-AC_INIT([libpng], [1.0.21rc2], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.0.21], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.0.21rc2
+PNGLIB_VERSION=1.0.21
PNGLIB_MAJOR=10
PNGLIB_MINOR=21
diff --git a/libpng.3 b/libpng.3
index 3534ae828..218084a33 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "November 13, 2006"
+.TH LIBPNG 3 "November 15, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.21rc2
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.21
.SH SYNOPSIS
\fI\fB
@@ -821,7 +821,7 @@ Following is a copy of the libpng.txt file that accompanies libpng.
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.0.21rc2 - November 13, 2006
+ libpng version 1.0.21 - November 15, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -3583,13 +3583,13 @@ application:
.SH VIII. Y2K Compliance in libpng
-November 13, 2006
+November 15, 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.0.21rc2 are Y2K compliant. It is my belief that earlier
+upward through 1.0.21 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
@@ -3756,8 +3756,9 @@ the first widely used release:
1.2.11 13 10211 12.so.0.11[.0]
1.0.20 10 10020 10.so.0.20[.0]
1.2.12 13 10212 12.so.0.12[.0]
- 1.0.21rc1-2 10 10021 10.so.0.21[.0]
- 1.2.13rc1-2 13 10213 12.so.0.13[.0]
+ 1.2.13beta1 13 10211 12.so.0.11[.0]
+ 1.0.21 10 10021 10.so.0.21[.0]
+ 1.2.13 13 10213 12.so.0.13[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3813,7 +3814,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.0.21rc2 - November 13, 2006:
+Libpng version 1.0.21 - November 15, 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).
@@ -3834,7 +3835,7 @@ included in the libpng distribution, the latter shall prevail.)
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.0.21rc2, November 13, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.0.21, November 15, 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
@@ -3933,7 +3934,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-November 13, 2006
+November 15, 2006
.\" end of man page
diff --git a/libpng.txt b/libpng.txt
index ea36cd5fb..cbd94b98b 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.0.21rc2 - November 13, 2006
+ libpng version 1.0.21 - November 15, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -2762,13 +2762,13 @@ application:
VIII. Y2K Compliance in libpng
-November 13, 2006
+November 15, 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.0.21rc2 are Y2K compliant. It is my belief that earlier
+upward through 1.0.21 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 828f2a73b..836b0f2cb 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "November 13, 2006"
+.TH LIBPNGPF 3 "November 15, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.21rc2
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.21
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index c4f956d4a..57de3ea24 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "November 13, 2006"
+.TH PNG 5 "November 15, 2006"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index d26faa9c3..db9311f35 100644
--- a/png.c
+++ b/png.c
@@ -13,7 +13,7 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_0_21rc2 Your_png_h_is_not_version_1_0_21rc2;
+typedef version_1_0_21 Your_png_h_is_not_version_1_0_21;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@@ -701,7 +701,7 @@ png_charp PNGAPI
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.0.21rc2 - November 13, 2006\n\
+ return ((png_charp) "\n libpng version 1.0.21 - November 15, 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 16fcae0de..854733aee 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.0.21rc2 - November 13, 2006
+ * libpng version 1.0.21 - November 15, 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.0.21rc2 - November 13, 2006: Glenn
+ * libpng versions 0.97, January 1998, through 1.0.21 - November 15, 2006: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -126,8 +126,9 @@
* 1.2.11 13 10211 12.so.0.11[.0]
* 1.0.20 10 10020 10.so.0.20[.0]
* 1.2.12 13 10212 12.so.0.12[.0]
- * 1.0.21rc1-2 10 10021 10.so.0.21[.0]
- * 1.2.13rc1-2 13 10213 12.so.0.13[.0]
+ * 1.2.13beta1 13 10211 12.so.0.11[.0]
+ * 1.0.21 10 10021 10.so.0.21[.0]
+ * 1.2.13 13 10213 12.so.0.13[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -157,7 +158,7 @@
* If you modify libpng you may insert additional notices immediately following
* this sentence.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.0.21rc2, November 13, 2006, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.0.21, November 15, 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:
@@ -269,13 +270,13 @@
* Y2K compliance in libpng:
* =========================
*
- * November 13, 2006
+ * November 15, 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.0.21rc2 are Y2K compliant. It is my belief that earlier
+ * upward through 1.0.21 are Y2K compliant. It is my belief that earlier
* versions were also Y2K compliant.
*
* Libpng only has three year fields. One is a 2-byte unsigned integer
@@ -331,9 +332,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.0.21rc2"
+#define PNG_LIBPNG_VER_STRING "1.0.21"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.0.21rc2 - November 13, 2006 (header)\n"
+ " libpng version 1.0.21 - November 15, 2006 (header)\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 10
@@ -345,7 +346,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 0
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -362,7 +363,7 @@
#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
PNG_LIBPNG_BUILD_PRIVATE */
-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC
+#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
* We must not include leading zeros.
@@ -1375,7 +1376,7 @@ struct png_struct_def
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
-typedef png_structp version_1_0_21rc2;
+typedef png_structp version_1_0_21;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index e22350adb..8b2108fb2 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.0.21rc2 - November 13, 2006
+ * libpng version 1.0.21 - November 15, 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 274c5a191..1e6935401 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1549,4 +1549,4 @@ main(int argc, char *argv[])
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_0_21rc2 your_png_h_is_not_version_1_0_21rc2;
+typedef version_1_0_21 your_png_h_is_not_version_1_0_21;
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index da4b7b263..88f85ed7b 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.0.21rc2
+version=1.0.21
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 3ac28dda9..db1247637 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng10
Name: libpng
Description: Loads and saves PNG files
-Version: 1.0.21rc2
+Version: 1.0.21
Libs: -L${libdir} -lpng10
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 64cec18e5..f9b60cc93 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 448fdad6f..1706e7d2b 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 12671efc4..f8bfe5951 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@ LN_SF = ln -f -s
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 7eb46e06e..50e224924 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 5c4000ee6..89c50f499 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -80,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng10
PNGMAJ = 0
CYGDLL = 10
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index c2c4d9d8f..4524ad698 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 53435aeb0..8d4539f59 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng10
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index bc980cd9a..11f6a9841 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 5273b30db..18877c634 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 89ebf0e2a..0dbb56bc9 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index d3da714b2..451e7c23a 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 63f186900..9016a7480 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index ffbc7870a..702e209c9 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index f92bc1dc5..6b57d7244 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -76,7 +76,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng10
PNGMAJ = 0
MINGDLL = 10
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 4a995238a..c06db7d21 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng10
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.0.21rc2
+SHLIB_MINOR= 1.0.21
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 f8e8731f5..351cbd0a2 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.0.21rc2
+SHLIB_MINOR= 1.0.21
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 915f32495..f8cf2930c 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -7,7 +7,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.0.21rc2
+SHLIB_MINOR= 1.0.21
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 c69dc6365..ab1f6ce53 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 2f8ddbdfa..1dfd2dd4d 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index c7abd71e9..752e07769 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index b46c4c97c..ed913f597 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng10
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index d8b4e7643..c4a432ef2 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.21rc2
+PNGMIN = 1.0.21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 8a937a7de..e7da4bf47 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.0.21rc2
+; Version 1.0.21
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index 892121376..8aac660ee 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.0.21rc2
+;Version 1.0.21
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3