summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-09-30 13:31:45 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-09-30 13:40:53 -0500
commitcaaf68858268fe93cd93d3062eee59668a6d6eee (patch)
tree5ca86527767da4e8b621a5692c4be4e9d150f4f0
parent3dfd0cd62a5cdfafb1e499f62d507911e3b4b3a7 (diff)
downloadlibpng-caaf68858268fe93cd93d3062eee59668a6d6eee.tar.gz
[master] Imported from libpng-1.2.41beta02.tarv1.2.41beta02
-rw-r--r--ANNOUNCE36
-rw-r--r--CHANGES4
-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-1.2.41beta02.txt (renamed from libpng-1.2.41beta01.txt)8
-rw-r--r--libpng.331
-rw-r--r--libpngpf.34
-rw-r--r--png.52
-rw-r--r--png.c6
-rw-r--r--png.h18
-rw-r--r--pngset.c2
-rw-r--r--pngtest.c2
-rw-r--r--pngwutil.c2
-rw-r--r--scripts/CMakeLists.txt2
-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.nommx2
-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/makefile.solaris-x862
-rw-r--r--scripts/pngos2.def2
-rw-r--r--scripts/pngw32.def2
49 files changed, 122 insertions, 121 deletions
diff --git a/ANNOUNCE b/ANNOUNCE
index 6c93a1250..6f3452f8b 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.2.41beta01 - September 25, 2009
+Libpng 1.2.41beta02 - September 30, 2009
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,40 +9,40 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- libpng-1.2.41beta01.tar.xz (LZMA-compressed, recommended)
- libpng-1.2.41beta01.tar.gz
- libpng-1.2.41beta01.tar.bz2
+ libpng-1.2.41beta02.tar.xz (LZMA-compressed, recommended)
+ libpng-1.2.41beta02.tar.gz
+ libpng-1.2.41beta02.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- libpng-1.2.41beta01-no-config.tar.xz (LZMA-compressed, recommended)
- libpng-1.2.41beta01-no-config.tar.gz
- libpng-1.2.41beta01-no-config.tar.bz2
+ libpng-1.2.41beta02-no-config.tar.xz (LZMA-compressed, recommended)
+ libpng-1.2.41beta02-no-config.tar.gz
+ libpng-1.2.41beta02-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp1241b01.zip
- lp1241b01.7z
- lp1241b01.tar.bz2
+ lp1241b02.zip
+ lp1241b02.7z
+ lp1241b02.tar.bz2
Project files
- libpng-1.2.41beta01-project-netware.zip
- libpng-1.2.41beta01-project-wince.zip
+ libpng-1.2.41beta02-project-netware.zip
+ libpng-1.2.41beta02-project-wince.zip
Other information:
- libpng-1.2.41beta01-README.txt
- libpng-1.2.41beta01-KNOWNBUGS.txt
- libpng-1.2.41beta01-LICENSE.txt
- libpng-1.2.41beta01-Y2K-compliance.txt
- libpng-1.2.41beta01-[previous version]-diff.txt
+ libpng-1.2.41beta02-README.txt
+ libpng-1.2.41beta02-KNOWNBUGS.txt
+ libpng-1.2.41beta02-LICENSE.txt
+ libpng-1.2.41beta02-Y2K-compliance.txt
+ libpng-1.2.41beta02-[previous version]-diff.txt
Changes since the last public release (1.2.40):
-version 1.2.41beta01 [September 25, 2009]
+version 1.2.41beta01 [September 30, 2009]
Moved redundant IHDR checking into new png_check_IHDR() in png.c
and report all errors found in the IHDR data.
Eliminated useless call to png_check_cHRM() from pngset.c
diff --git a/CHANGES b/CHANGES
index 5e7a97ec8..589407a68 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2466,13 +2466,13 @@ version 1.2.40beta01 [August 20, 2009]
version 1.2.40rc01 [September 2, 2009]
Various bugfixes and improvements to CMakeLists.txt (Philip Lowman)
-version 1.2.40 and 1.0.49 [September 25, 2009]
+version 1.2.40 and 1.0.49 [September 30, 2009]
No changes.
version 1.0.50 [September 10, 2009]
Removed some editing cruft from pngset.c and pngwutil.c.
-version 1.2.41beta01 [September 25, 2009]
+version 1.2.41beta01 [September 30, 2009]
Moved redundant IHDR checking into new png_check_IHDR() in png.c
and report all errors found in the IHDR data.
Eliminated useless call to png_check_cHRM() from pngset.c
diff --git a/INSTALL b/INSTALL
index 04faed7f7..fb6d915ac 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.41beta01 - September 25, 2009
+Installing libpng version 1.2.41beta02 - September 30, 2009
On Unix/Linux and similar systems, you can simply type
@@ -44,7 +44,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.2.41beta01" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.41beta02" 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:
@@ -101,9 +101,9 @@ include
CMakeLists.txt => "cmake" script
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng12.so.0.1.2.41beta01)
+ gcc, creates libpng12.so.0.1.2.41beta02)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.41beta01)
+ (gcc, creates libpng12.so.0.1.2.41beta02)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@@ -125,14 +125,14 @@ include
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.41beta01)
+ creates libpng12.so.0.1.2.41beta02)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng12.so.0.1.2.41beta01)
+ creates libpng12.so.0.1.2.41beta02)
makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc,
- creates libpng12.so.0.1.2.41beta01)
+ creates libpng12.so.0.1.2.41beta02)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng12.so.0.1.2.41beta01)
+ creates libpng12.so.0.1.2.41beta02)
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 616eb8c7e..8f470b9ad 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.2.41beta01
+Known bugs in libpng version 1.2.41beta02
1. February 23, 2006: The custom makefiles don't build libpng with -lz.
diff --git a/LICENSE b/LICENSE
index 4228f837b..73c999b60 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.2.41beta01, September 25, 2009, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.41beta02, September 30, 2009, are
Copyright (c) 2004, 2006-2009 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
@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-September 25, 2009
+September 30, 2009
diff --git a/Makefile.am b/Makefile.am
index 0f071234c..46194d8c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,7 +86,7 @@ EXTRA_DIST= \
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.2.41beta01.txt pngvcrd.c
+ example.c libpng-1.2.41beta02.txt pngvcrd.c
CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \
libpng.sym
diff --git a/Makefile.in b/Makefile.in
index f4741c3fb..ff101f46f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -352,7 +352,7 @@ EXTRA_DIST = \
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.2.41beta01.txt pngvcrd.c
+ example.c libpng-1.2.41beta02.txt pngvcrd.c
CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers \
libpng.sym
diff --git a/README b/README
index f42fa4b02..d14134abe 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.2.41beta01 - September 25, 2009 (shared library 12.0)
+README for libpng version 1.2.41beta02 - September 30, 2009 (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.
@@ -194,11 +194,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 libpng12.so.0.1.2.41beta01)
+ gcc, creates libpng12.so.0.1.2.41beta02)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.41beta01)
+ (gcc, creates libpng12.so.0.1.2.41beta02)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.41beta01,
+ (gcc, creates libpng12.so.0.1.2.41beta02,
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
@@ -220,12 +220,12 @@ Files in this distribution:
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
- (gcc, creates libpng12.so.0.1.2.41beta01)
+ (gcc, creates libpng12.so.0.1.2.41beta02)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng12.so.0.1.2.41beta01)
+ (gcc, creates libpng12.so.0.1.2.41beta02)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng12.so.0.1.2.41beta01)
+ (gcc, creates libpng12.so.0.1.2.41beta02)
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 266994e9c..504900f56 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- September 25, 2009
+ September 30, 2009
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.41beta01 are Y2K compliant. It is my belief that earlier
+ upward through 1.2.41beta02 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 535defbe4..0aaaba3be 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.64 for libpng 1.2.41beta01.
+# Generated by GNU Autoconf 2.64 for libpng 1.2.41beta02.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -698,8 +698,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.2.41beta01'
-PACKAGE_STRING='libpng 1.2.41beta01'
+PACKAGE_VERSION='1.2.41beta02'
+PACKAGE_STRING='libpng 1.2.41beta02'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''
@@ -1432,7 +1432,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.2.41beta01 to adapt to many kinds of systems.
+\`configure' configures libpng 1.2.41beta02 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1502,7 +1502,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.2.41beta01:";;
+ short | recursive ) echo "Configuration of libpng 1.2.41beta02:";;
esac
cat <<\_ACEOF
@@ -1609,7 +1609,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.2.41beta01
+libpng configure 1.2.41beta02
generated by GNU Autoconf 2.64
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2034,7 +2034,7 @@ cat >config.log <<_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.2.41beta01, which was
+It was created by libpng $as_me 1.2.41beta02, which was
generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
@@ -2842,7 +2842,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.2.41beta01'
+ VERSION='1.2.41beta02'
cat >>confdefs.h <<_ACEOF
@@ -2906,7 +2906,7 @@ fi
-PNGLIB_VERSION=1.2.41beta01
+PNGLIB_VERSION=1.2.41beta02
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=41
@@ -12047,7 +12047,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libpng $as_me 1.2.41beta01, which was
+This file was extended by libpng $as_me 1.2.41beta02, which was
generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12111,7 +12111,7 @@ Report bugs to <png-mng-implement@lists.sourceforge.net>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-libpng config.status 1.2.41beta01
+libpng config.status 1.2.41beta02
configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 12212f1a4..8a2979d83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
-AC_INIT([libpng], [1.2.41beta01], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.41beta02], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.2.41beta01
+PNGLIB_VERSION=1.2.41beta02
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=41
diff --git a/libpng-1.2.41beta01.txt b/libpng-1.2.41beta02.txt
index 4e25ed805..c4a94fd0e 100644
--- a/libpng-1.2.41beta01.txt
+++ b/libpng-1.2.41beta02.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.41beta01 - September 25, 2009
+ libpng version 1.2.41beta02 - September 30, 2009
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.2.41beta01 - September 25, 2009
+ libpng versions 0.97, January 1998, through 1.2.41beta02 - September 30, 2009
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -3058,13 +3058,13 @@ source.
XIII. Y2K Compliance in libpng
-September 25, 2009
+September 30, 2009
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.41beta01 are Y2K compliant. It is my belief that earlier
+upward through 1.2.41beta02 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
Libpng only has three year fields. One is a 2-byte unsigned integer that
diff --git a/libpng.3 b/libpng.3
index 58b0799af..950f99330 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "September 25, 2009"
+.TH LIBPNG 3 "September 30, 2009"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.41beta01
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.41beta02
.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.2.41beta01 - September 25, 2009
+ libpng version 1.2.41beta02 - September 30, 2009
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -832,7 +832,7 @@ libpng.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.2.41beta01 - September 25, 2009
+ libpng versions 0.97, January 1998, through 1.2.41beta02 - September 30, 2009
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -1451,8 +1451,8 @@ into the info_ptr is returned for any complex types.
png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans,
&trans_values);
- trans - array of transparent entries for
- palette (PNG_INFO_tRNS)
+ trans - array of transparent
+ entries for palette (PNG_INFO_tRNS)
trans_values - graylevel or color sample values of
the single transparent color for
non-paletted images (PNG_INFO_tRNS)
@@ -2681,8 +2681,8 @@ width, height, bit_depth, and color_type must be the same in each call.
png_set_tRNS(png_ptr, info_ptr, trans, num_trans,
trans_values);
- trans - array of transparent entries for
- palette (PNG_INFO_tRNS)
+ trans - array of transparent
+ entries for palette (PNG_INFO_tRNS)
trans_values - graylevel or color sample values
(in order red, green, blue) of the
single transparent color for
@@ -3751,7 +3751,6 @@ We replaced all of these functions with simple stubs in libpng-1.2.20,
when the Intel assembler code was removed due to a licensing issue.
.SH IX. (Omitted)
-
.SH X. Detecting libpng
The png_get_io_ptr() function has been present since libpng-0.88, has never
@@ -3868,23 +3867,25 @@ cast, nor do we put one between a function name and the
left parenthesis that follows it:
for (i = 2; i > 0; --i)
- x[i] = a(x) + (int)b;
+ y[i] = a(x) + (int)b;
We prefer #ifdef and #ifndef to #if defined() and if !defined()
when there is only one macro being tested.
+We do not use the TAB character for indentation in the C sources.
+
Other rules can be inferred by inspecting the libpng
source.
.SH XIII. Y2K Compliance in libpng
-September 25, 2009
+September 30, 2009
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.41beta01 are Y2K compliant. It is my belief that earlier
+upward through 1.2.41beta02 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
@@ -4224,7 +4225,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.41beta01 - September 25, 2009:
+Libpng version 1.2.41beta02 - September 30, 2009:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -4247,7 +4248,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.2.41beta01, September 25, 2009, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.41beta02, September 30, 2009, are
Copyright (c) 2004,2006-2008 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
@@ -4346,7 +4347,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-September 25, 2009
+September 30, 2009
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index a168ca411..592518e37 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "September 25, 2009"
+.TH LIBPNGPF 3 "September 30, 2009"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.41beta01
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.41beta02
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 23e60b7a3..0577d65e5 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "September 25, 2009"
+.TH PNG 5 "September 30, 2009"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 4fcb163ee..466ad4b33 100644
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
- * Last changed in libpng 1.2.41 [September 25, 2009]
+ * Last changed in libpng 1.2.41 [September 30, 2009]
* Copyright (c) 1998-2009 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.)
@@ -16,7 +16,7 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_41beta01 Your_png_h_is_not_version_1_2_41beta01;
+typedef version_1_2_41beta02 Your_png_h_is_not_version_1_2_41beta02;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@@ -705,7 +705,7 @@ png_charp PNGAPI
png_get_copyright(png_structp png_ptr)
{
png_ptr = png_ptr; /* Silence compiler warning about unused png_ptr */
- return ((png_charp) "\n libpng version 1.2.41beta01 - September 25, 2009\n\
+ return ((png_charp) "\n libpng version 1.2.41beta02 - September 30, 2009\n\
Copyright (c) 1998-2009 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 6cb865461..c50d585f3 100644
--- a/png.h
+++ b/png.h
@@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.41beta01 - September 25, 2009
+ * libpng version 1.2.41beta02 - September 30, 2009
* Copyright (c) 1998-2009 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.)
@@ -10,7 +10,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.41beta01 - September 25, 2009: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.41beta02 - September 30, 2009: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -277,7 +277,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.2.41beta01, September 25, 2009, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.41beta02, September 30, 2009, are
* Copyright (c) 2004, 2006-2009 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:
@@ -389,13 +389,13 @@
* Y2K compliance in libpng:
* =========================
*
- * September 25, 2009
+ * September 30, 2009
*
* 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.41beta01 are Y2K compliant. It is my belief that earlier
+ * upward through 1.2.41beta02 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
@@ -451,9 +451,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.41beta01"
+#define PNG_LIBPNG_VER_STRING "1.2.41beta02"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.41beta01 - September 25, 2009\n"
+ " libpng version 1.2.41beta02 - September 30, 2009\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@@ -466,7 +466,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
-#define PNG_LIBPNG_VER_BUILD 01
+#define PNG_LIBPNG_VER_BUILD 02
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -1518,7 +1518,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_2_41beta01;
+typedef png_structp version_1_2_41beta02;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngset.c b/pngset.c
index 1177ee728..e29c944d4 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
- * Last changed in libpng 1.2.41 [September 25, 2009]
+ * Last changed in libpng 1.2.41 [September 30, 2009]
* Copyright (c) 1998-2009 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.)
diff --git a/pngtest.c b/pngtest.c
index a592e7489..f3c697c6e 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1689,4 +1689,4 @@ main(int argc, char *argv[])
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_41beta01 your_png_h_is_not_version_1_2_41beta01;
+typedef version_1_2_41beta02 your_png_h_is_not_version_1_2_41beta02;
diff --git a/pngwutil.c b/pngwutil.c
index 66c5c4b2a..ddbfa6654 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@
/* pngwutil.c - utilities to write a PNG file
*
- * Last changed in libpng 1.2.40 [September 25, 2009]
+ * Last changed in libpng 1.2.40 [September 30, 2009]
* Copyright (c) 1998-2009 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.)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 5cfc5d4bb..ee8ce064f 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -195,7 +195,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 0.${PNGLIB_RELEASE}.1.2.41beta01
+# VERSION 0.${PNGLIB_RELEASE}.1.2.41beta02
VERSION 0.${PNGLIB_RELEASE}.0
SOVERSION 0
CLEAN_DIRECT_OUTPUT 1)
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index a9d709124..368356886 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
-version=1.2.41beta01
+version=1.2.41beta02
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index c4daf705e..2464b9bda 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng12
Name: libpng
Description: Loads and saves PNG files
-Version: 1.2.41beta01
+Version: 1.2.41beta02
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index ab412387c..31ec9a988 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 023b8b93d..893643d75 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index d5b919d88..b08baa316 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -23,7 +23,7 @@ LN_SF = ln -f -s
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 59333f5bf..efa27a925 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 910a9cd4a..60f65437b 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index ff8a03adc..c1ca4809a 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -22,7 +22,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME = libpng12
PNGMAJ = 12
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 86cdefd54..84abc6855 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index ca7a5286b..60f29e71b 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index f3875882f..829a2dd36 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -17,7 +17,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 30ba574b8..bc8adb99e 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index 26ef7305f..7e44f9240 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index d5972b00d..07a022ccf 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 102bc4ea5..9c7c5dd87 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index 5fbc3948f..753b8eb49 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
MINGDLL = 12
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 07ea558be..38cbdfcf0 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.41beta01
+SHLIB_MINOR= 1.2.41beta02
SRCS= 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 21df97227..0216cf463 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.2.41beta01
+SHLIB_MINOR= 1.2.41beta02
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx
index 5da232905..199ca2ac9 100644
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index 6c5fa6fce..7e9b88c21 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.41beta01
+SHLIB_MINOR= 1.2.41beta02
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 8f1655495..89f0b2c7b 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 2ed244ede..469e66758 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -9,7 +9,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 81ec28c90..a2814a457 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -9,7 +9,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 37eaae156..15d2182bf 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -11,7 +11,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 320e3cd87..98397d9ee 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index d352b872b..a6eb76d94 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.41beta01
+PNGMIN = 1.2.41beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 1ba5b8fbc..c52d23f78 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.2.41beta01
+; Version 1.2.41beta02
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index 57a2112e5..e2817311e 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.2.41beta01
+;Version 1.2.41beta02
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3