summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2006-11-17 09:39:07 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-04-06 16:11:57 -0500
commit11a89964b93d271a89b7b6a31a37fff653c15ffc (patch)
treea026188d15f1420ff3f54ac49e866508088cb4af
parentb5bfcbae5934b8d39dd3ab7a713bee185628f196 (diff)
downloadlibpng-11a89964b93d271a89b7b6a31a37fff653c15ffc.tar.gz
Imported from libpng-1.2.14beta2.tarv1.2.14beta2
-rw-r--r--ANNOUNCE29
-rw-r--r--CHANGES2
-rw-r--r--INSTALL16
-rw-r--r--KNOWNBUG2
-rw-r--r--LICENSE2
-rw-r--r--README14
-rw-r--r--Y2KINFO2
-rwxr-xr-xconfigure22
-rw-r--r--configure.ac4
-rw-r--r--libpng.312
-rw-r--r--libpng.txt4
-rw-r--r--libpngpf.32
-rw-r--r--png.c8
-rw-r--r--png.h18
-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
42 files changed, 99 insertions, 94 deletions
diff --git a/ANNOUNCE b/ANNOUNCE
index d6552dc74..8340a6ba8 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.2.14beta1 - November 17, 2006
+Libpng 1.2.14beta2 - November 17, 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 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- libpng-1.2.14beta1.tar.gz
- libpng-1.2.14beta1.tar.bz2
+ libpng-1.2.14beta2.tar.gz
+ libpng-1.2.14beta2.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- libpng-1.2.14beta1-no-config.tar.gz
- libpng-1.2.14beta1-no-config.tar.bz2
+ libpng-1.2.14beta2-no-config.tar.gz
+ libpng-1.2.14beta2-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp1214b01.zip
- lp1214b01.tar.bz2
+ lp1214b02.zip
+ lp1214b02.tar.bz2
Project files
- libpng-1.2.14beta1-project-netware.zip
- libpng-1.2.14beta1-project-wince.zip
+ libpng-1.2.14beta2-project-netware.zip
+ libpng-1.2.14beta2-project-wince.zip
Other information:
- libpng-1.2.14beta1-README.txt
- libpng-1.2.14beta1-KNOWNBUGS.txt
- libpng-1.2.14beta1-LICENSE.txt
- libpng-1.2.14beta1-Y2K-compliance.txt
+ libpng-1.2.14beta2-README.txt
+ libpng-1.2.14beta2-KNOWNBUGS.txt
+ libpng-1.2.14beta2-LICENSE.txt
+ libpng-1.2.14beta2-Y2K-compliance.txt
Changes since the last public release (1.2.12):
@@ -60,6 +60,9 @@ version 1.2.14beta1 [November 17, 2006]
Built Makefile.in with automake-1.9.6 instead of 1.9.2.
Build configure with autoconf-2.60 instead of 2.59
+version 1.2.14beta2 [November 17, 2006]
+ Added some typecasts in png_zalloc().
+
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 1d5ce2753..b5099546d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1631,6 +1631,8 @@ version 1.2.14beta1 [November 17, 2006]
Built Makefile.in with automake-1.9.6 instead of 1.9.2.
Build configure with autoconf-2.60 instead of 2.59
+version 1.2.14beta2 [November 17, 2006]
+ Added some typecasts in png_zalloc().
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/INSTALL b/INSTALL
index d2b180e1b..e2a1509ba 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.14beta1 - November 17, 2006
+Installing libpng version 1.2.14beta2 - November 17, 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.2.14beta1" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.14beta2" 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 libpng12.so.0.1.2.14beta1)
+ gcc, creates libpng12.so.0.1.2.14beta2)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.14beta1)
+ (gcc, creates libpng12.so.0.1.2.14beta2)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.14beta1,
+ (gcc, creates libpng12.so.0.1.2.14beta2,
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 libpng12.so.0.1.2.14beta1)
+ creates libpng12.so.0.1.2.14beta2)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng12.so.0.1.2.14beta1)
+ creates libpng12.so.0.1.2.14beta2)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng12.so.0.1.2.14beta1)
+ creates libpng12.so.0.1.2.14beta2)
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 177bf9116..8a6dc355f 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.2.14beta1
+Known bugs in libpng version 1.2.14beta2
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 9fa3b338e..cabd3cbc3 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.2.14beta1, November 17, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.14beta2, November 17, 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
diff --git a/README b/README
index d7609c1dc..1f7adb6db 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.2.14beta1 - November 17, 2006 (shared library 12.0)
+README for libpng version 1.2.14beta2 - November 17, 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 @@ 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.14beta1)
+ gcc, creates libpng12.so.0.1.2.14beta2)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.14beta1)
+ (gcc, creates libpng12.so.0.1.2.14beta2)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.14beta1,
+ (gcc, creates libpng12.so.0.1.2.14beta2,
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 libpng12.so.0.1.2.14beta1)
+ (gcc, creates libpng12.so.0.1.2.14beta2)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng12.so.0.1.2.14beta1)
+ (gcc, creates libpng12.so.0.1.2.14beta2)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng12.so.0.1.2.14beta1)
+ (gcc, creates libpng12.so.0.1.2.14beta2)
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 89928599e..51a734d9c 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -7,7 +7,7 @@
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
- upward through 1.2.14beta1 are Y2K compliant. It is my belief that earlier
+ upward through 1.2.14beta2 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 fe2f36032..88dca4b2e 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.60 for libpng 1.2.14beta1.
+# Generated by GNU Autoconf 2.60 for libpng 1.2.14beta2.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.2.14beta1'
-PACKAGE_STRING='libpng 1.2.14beta1'
+PACKAGE_VERSION='1.2.14beta2'
+PACKAGE_STRING='libpng 1.2.14beta2'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
@@ -1387,7 +1387,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.14beta1 to adapt to many kinds of systems.
+\`configure' configures libpng 1.2.14beta2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1457,7 +1457,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.2.14beta1:";;
+ short | recursive ) echo "Configuration of libpng 1.2.14beta2:";;
esac
cat <<\_ACEOF
@@ -1566,7 +1566,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.2.14beta1
+libpng configure 1.2.14beta2
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1580,7 +1580,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.14beta1, which was
+It was created by libpng $as_me 1.2.14beta2, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2250,7 +2250,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.2.14beta1'
+ VERSION='1.2.14beta2'
cat >>confdefs.h <<_ACEOF
@@ -2421,7 +2421,7 @@ fi
-PNGLIB_VERSION=1.2.14beta1
+PNGLIB_VERSION=1.2.14beta2
PNGLIB_MAJOR=12
PNGLIB_MINOR=14
@@ -21842,7 +21842,7 @@ exec 6>&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.14beta1, which was
+This file was extended by libpng $as_me 1.2.14beta2, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21895,7 +21895,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libpng config.status 1.2.14beta1
+libpng config.status 1.2.14beta2
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 473716361..0e1047bf5 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.14beta1], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.14beta2], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.2.14beta1
+PNGLIB_VERSION=1.2.14beta2
PNGLIB_MAJOR=12
PNGLIB_MINOR=14
diff --git a/libpng.3 b/libpng.3
index 1a924216c..b74498a5a 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
.TH LIBPNG 3 "November 17, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.14beta1
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.14beta2
.SH SYNOPSIS
\fB
#include <png.h>\fP
@@ -410,7 +410,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.14beta1 - November 17, 2006
+ libpng version 1.2.14beta2 - November 17, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -3333,7 +3333,7 @@ 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.14beta1 are Y2K compliant. It is my belief that earlier
+upward through 1.2.14beta2 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
@@ -3503,7 +3503,7 @@ the first widely used release:
1.2.13beta1 13 10213 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]
- 1.2.14beta1 13 10214 12.so.0.14[.0]
+ 1.2.14beta1-2 13 10214 12.so.0.14[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3559,7 +3559,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.14beta1 - November 17, 2006:
+Libpng version 1.2.14beta2 - November 17, 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).
@@ -3580,7 +3580,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.2.14beta1, November 17, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.14beta2, November 17, 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
diff --git a/libpng.txt b/libpng.txt
index e09be201a..160780780 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.14beta1 - November 17, 2006
+ libpng version 1.2.14beta2 - November 17, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -2923,7 +2923,7 @@ 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.14beta1 are Y2K compliant. It is my belief that earlier
+upward through 1.2.14beta2 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 5a2293568..4f846dcf6 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "November 17, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.14beta1
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.14beta2
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.c b/png.c
index e5286be96..bd86ea116 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_14beta1 Your_png_h_is_not_version_1_2_14beta1;
+typedef version_1_2_14beta2 Your_png_h_is_not_version_1_2_14beta2;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@@ -154,14 +154,14 @@ voidpf /* private */
png_zalloc(voidpf png_ptr, uInt items, uInt size)
{
png_voidp ptr;
- png_structp p=png_ptr;
+ png_structp p=(png_structp)png_ptr;
png_uint_32 save_flags=p->flags;
png_uint_32 num_bytes;
if(png_ptr == NULL) return (NULL);
if (items > PNG_UINT_32_MAX/size)
{
- png_warning (png_ptr, "Potential overflow in png_zalloc()");
+ png_warning (p, "Potential overflow in png_zalloc()");
return (NULL);
}
num_bytes = (png_uint_32)items * size;
@@ -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.2.14beta1 - November 17, 2006\n\
+ return ((png_charp) "\n libpng version 1.2.14beta2 - November 17, 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 a2e7eabea..e22ff9eae 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.14beta1 - November 17, 2006
+ * libpng version 1.2.14beta2 - November 17, 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.14beta1 - November 17, 2006: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.14beta2 - November 17, 2006: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -129,7 +129,7 @@
* 1.2.13beta1 13 10213 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]
- * 1.2.14beta1 13 10214 12.so.0.11[.0]
+ * 1.2.14beta1-2 13 10214 12.so.0.11[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -159,7 +159,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.14beta1, November 17, 2006, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.14beta2, November 17, 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:
@@ -277,7 +277,7 @@
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
- * upward through 1.2.14beta1 are Y2K compliant. It is my belief that earlier
+ * upward through 1.2.14beta2 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
@@ -333,9 +333,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.14beta1"
+#define PNG_LIBPNG_VER_STRING "1.2.14beta2"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.14beta1 - November 17, 2006 (header)\n"
+ " libpng version 1.2.14beta2 - November 17, 2006 (header)\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@@ -347,7 +347,7 @@
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero: */
-#define PNG_LIBPNG_VER_BUILD 1
+#define PNG_LIBPNG_VER_BUILD 2
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -1377,7 +1377,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_14beta1;
+typedef png_structp version_1_2_14beta2;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index 9013ca091..aefdaf68e 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.2.14beta1 - November 17, 2006
+ * libpng version 1.2.14beta2 - November 17, 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 12e963ec4..06809a039 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_2_14beta1 your_png_h_is_not_version_1_2_14beta1;
+typedef version_1_2_14beta2 your_png_h_is_not_version_1_2_14beta2;
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index b6513d42d..4c93934e8 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.2.14beta1
+version=1.2.14beta2
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 96d61b044..28bf0ff02 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.14beta1
+Version: 1.2.14beta2
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 7abd4d9ff..27fa31a3d 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index a7cdfe928..412c6150d 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index fc4f89a3e..5c1a7a915 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@ LN_SF = ln -f -s
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 4e2259ea5..8f57f6f30 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index cc4e7e793..07d115cc7 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -80,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index d4b4ac825..31953bea2 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index e519e545a..cf35a9d00 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index e5072a1a7..472e8fb9a 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index a09d7762c..f830fe8fa 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 29f5f4f2c..1dec085c7 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index 522961459..13a33c1c3 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index f9112cfb4..7a1b6c731 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 8e6ca2fac..6db57ba27 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index 146a65023..1a61e23f2 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -76,7 +76,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
MINGDLL = 12
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 3c2e4184f..9f7dd1b15 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.14beta1
+SHLIB_MINOR= 1.2.14beta2
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 6529fd181..24fd03820 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.2.14beta1
+SHLIB_MINOR= 1.2.14beta2
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 8a036c0e1..c5d1be2a7 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.2.14beta1
+SHLIB_MINOR= 1.2.14beta2
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 f10125c05..758620c4a 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index e873fb73f..9c85c4e6b 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index bee0f6519..d2055f515 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index f3dc480f5..22badcc60 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index edcfbc51c..178080535 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.14beta1
+PNGMIN = 1.2.14beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 4fcb08d3e..e900674d0 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.2.14beta1
+; Version 1.2.14beta2
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index bf718f372..263801fc8 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.2.14beta1
+;Version 1.2.14beta2
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3