Imported from libpng-1.2.21beta1.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 6b47f69..70fcb64 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,53 +1,90 @@
-Libpng 1.2.20 - September 8, 2007
+Libpng 1.2.21beta1 - September 14, 2007
-This is a public release of libpng, intended for use in production codes.
+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.
Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- libpng-1.2.20.tar.gz
- libpng-1.2.20.tar.bz2
+ libpng-1.2.21beta1.tar.gz
+ libpng-1.2.21beta1.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- libpng-1.2.20-no-config.tar.gz
- libpng-1.2.20-no-config.tar.bz2
+ libpng-1.2.21beta1-no-config.tar.gz
+ libpng-1.2.21beta1-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lpng1220.zip
- lpng1220.tar.bz2
+ lp1221b01.zip
+ lp1221b01.tar.bz2
Project files
- libpng-1.2.20-project-netware.zip
- libpng-1.2.20-project-wince.zip
+ libpng-1.2.21beta1-project-netware.zip
+ libpng-1.2.21beta1-project-wince.zip
Other information:
- libpng-1.2.20-README.txt
- libpng-1.2.20-KNOWNBUGS.txt
- libpng-1.2.20-LICENSE.txt
- libpng-1.2.20-Y2K-compliance.txt
+ libpng-1.2.21beta1-README.txt
+ libpng-1.2.21beta1-KNOWNBUGS.txt
+ libpng-1.2.21beta1-LICENSE.txt
+ libpng-1.2.21beta1-Y2K-compliance.txt
Changes since the last public release (1.2.19):
-version 1.2.20 [September 8, 2007]
-
+version 1.2.20beta01 [August 19, 2007]
+ Fixed problem with compiling pnggccrd.c on Intel-Apple platforms.
Added PNG_NO_ERROR_TEXT feature, with demo in contrib/pngminim
Removed define PNG_WARN_UNINITIALIZED_ROW 1 /* 0: warning; 1: error */
because it caused some trouble.
+
+version 1.2.20beta02 [August 20, 2007]
+ Avoid compiling pnggccrd.c on Intel-Apple platforms.
+
+version 1.2.20beta03 [August 20, 2007]
+ Added "/D PNG_NO_MMX_CODE" to the non-mmx builds of projects/visualc6
+ and visualc71.
+
+version 1.2.20beta04 [August 21, 2007]
+ Revised pngvcrd.c for improved efficiency (Steve Snyder).
+
+version 1.2.20rc1 [August 23, 2007]
+ Revised pngconf.h to set PNG_NO_MMX_CODE for gcc-3.x compilers.
+
+version 1.2.20rc2 [August 27, 2007]
Revised scripts/CMakeLists.txt
+ Revised #ifdefs to ensure one and only one of pnggccrd.c, pngvcrd.c,
+ or part of pngrutil.c is selected.
+
+version 1.2.20rc3 [September 14, 2007]
Remove a little more code in pngwutil.c when PNG_NO_WRITE_FILTER is selected.
Added /D _CRT_SECURE_NO_WARNINGS to visual6c and visualc71 projects.
+ Compile png_mmx_support() in png.c even when PNG_NO_MMX_CODE is defined.
+ Restored a "superfluous" #ifdef that was removed from 1.2.20rc2 pnggccrd.c,
+ breaking the png_mmx_support() function.
+
+version 1.2.20rc4 [September 1, 2007]
Removed Intel contributions (MMX, Optimized C).
+version 1.2.20rc5 [September 2, 2007]
+ Restored configure and Makefile.in to rc3 and put a snippet of code in
+ pnggccrd.c, to ensure configure makes the same PNG_NO_MMX_CODE selection
+
+version 1.2.20rc6 [September 2, 2007]
+ Fixed bugs in scripts/CMakeLists.txt
+ Removed pngvcrd.c references from msvc projects.
+
+version 1.0.28 and 1.2.20 [September 14, 2007]
+ Removed "(NO READ SUPPORT)" from png_get_header_version() string.
+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
+
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
to subscribe) or to glennrp at users.sourceforge.net
diff --git a/CHANGES b/CHANGES
index c240f2d..18f9c84 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1480,7 +1480,7 @@
Restored scripts/makefile.elf which was inadvertently deleted.
version 1.2.9beta6 [March 6, 2006]
- Fixed typo (20) in configuration files.
+ Fixed typo (21) in configuration files.
version 1.2.9beta7 [March 7, 2006]
Removed libpng.vers and libpng.sym from libpng12_la_SOURCES in Makefile.am
@@ -1677,7 +1677,7 @@
version 1.2.15rc5 [December 31, 2006]
Revised handling of rgb_to_gray.
-version 1.2.15 [January 5, 2007]
+version 1.0.23, 1.2.15 [January 5, 2007]
Added some (unsigned long) typecasts in pngtest.c to avoid printing errors.
version 1.2.16beta1 [January 6, 2007]
@@ -1686,7 +1686,7 @@
version 1.2.16beta2 [January 16, 2007]
Revised scripts/CMakeLists.txt
-version 1.2.16 [January 31, 2007]
+version 1.0.24, 1.2.16 [January 31, 2007]
No changes.
version 1.2.17beta1 [March 6, 2007]
@@ -1937,9 +1937,16 @@
Fixed bugs in scripts/CMakeLists.txt
Removed pngvcrd.c references from msvc projects.
-version 1.0.28 and 1.2.20 [September 8, 2007]
+version 1.0.28 and 1.2.20 [September 14, 2007]
Removed "(NO READ SUPPORT)" from png_get_header_version() string.
+version 1.2.21beta1 [September 14, 2007]
+ Fixed various mistakes reported by George Cook and Jeff Phillips:
+ logical vs bitwise NOT in pngrtran.c, bug introduced in 1.2.19rc2
+ 16-bit cheap transparency expansion, bug introduced in 1.2.19beta2
+ errors with sizeof(unknown_chunk.name), bugs introduced in 1.2.19beta11
+ <= compare with unsigned var in pngset.c, should be ==.
+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/INSTALL b/INSTALL
index 206c10d..4dc180b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.20 - September 8, 2007
+Installing libpng version 1.2.21beta1 - September 14, 2007
On Unix/Linux and similar systems, you can simply type
@@ -44,7 +44,7 @@
correspond to the version of zlib that's installed.
You can rename the directories that you downloaded (they
-might be called "libpng-1.2.20" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.21beta1" 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 @@
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.20)
+ gcc, creates libpng12.so.0.1.2.21beta1)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.20)
+ (gcc, creates libpng12.so.0.1.2.21beta1)
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 @@
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.20)
+ creates libpng12.so.0.1.2.21beta1)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng12.so.0.1.2.20)
+ creates libpng12.so.0.1.2.21beta1)
makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc,
- creates libpng12.so.0.1.2.20)
+ creates libpng12.so.0.1.2.21beta1)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng12.so.0.1.2.20)
+ creates libpng12.so.0.1.2.21beta1)
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 c5d0c29..23f30c4 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.2.20
+Known bugs in libpng version 1.2.21beta1
1. February 23, 2006: The custom makefiles don't build libpng with -lz.
diff --git a/LICENSE b/LICENSE
index a93dc98..c8f9bad 100644
--- a/LICENSE
+++ b/LICENSE
@@ -8,7 +8,7 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.2.20, September 8, 2007, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.21beta1, September 14, 2007, are
Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
@@ -106,4 +106,4 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-September 8, 2007
+September 14, 2007
diff --git a/README b/README
index cdaf621..191aa38 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.2.20 - September 8, 2007 (shared library 12.0)
+README for libpng version 1.2.21beta1 - September 14, 2007 (shared library 12.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@@ -190,11 +190,11 @@
descrip.mms => VMS makefile for MMS or MMK
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng12.so.0.1.2.20)
+ gcc, creates libpng12.so.0.1.2.21beta1)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.20)
+ (gcc, creates libpng12.so.0.1.2.21beta1)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.20,
+ (gcc, creates libpng12.so.0.1.2.21beta1,
uses assembler code tuned for Intel MMX platform)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
@@ -216,12 +216,12 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
- (gcc, creates libpng12.so.0.1.2.20)
+ (gcc, creates libpng12.so.0.1.2.21beta1)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng12.so.0.1.2.20)
+ (gcc, creates libpng12.so.0.1.2.21beta1)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng12.so.0.1.2.20)
+ (gcc, creates libpng12.so.0.1.2.21beta1)
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 67ee7ba..e230c57 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- September 8, 2007
+ September 14, 2007
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.20 are Y2K compliant. It is my belief that earlier
+ upward through 1.2.21beta1 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 906694f..3f153ef 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.61 for libpng 1.2.20.
+# Generated by GNU Autoconf 2.61 for libpng 1.2.21beta1.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.2.20'
-PACKAGE_STRING='libpng 1.2.20'
+PACKAGE_VERSION='1.2.21beta1'
+PACKAGE_STRING='libpng 1.2.21beta1'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
@@ -1405,7 +1405,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libpng 1.2.20 to adapt to many kinds of systems.
+\`configure' configures libpng 1.2.21beta1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1475,7 +1475,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.2.20:";;
+ short | recursive ) echo "Configuration of libpng 1.2.21beta1:";;
esac
cat <<\_ACEOF
@@ -1585,7 +1585,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.2.20
+libpng configure 1.2.21beta1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1599,7 +1599,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libpng $as_me 1.2.20, which was
+It was created by libpng $as_me 1.2.21beta1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2269,7 +2269,7 @@
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.2.20'
+ VERSION='1.2.21beta1'
cat >>confdefs.h <<_ACEOF
@@ -2440,10 +2440,10 @@
-PNGLIB_VERSION=1.2.20
+PNGLIB_VERSION=1.2.21beta1
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
-PNGLIB_RELEASE=20
+PNGLIB_RELEASE=21
@@ -21282,7 +21282,7 @@
# 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.20, which was
+This file was extended by libpng $as_me 1.2.21beta1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21335,7 +21335,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libpng config.status 1.2.20
+libpng config.status 1.2.21beta1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index e8393b7..3c5ac34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,15 +18,15 @@
dnl Version number stuff here:
-AC_INIT([libpng], [1.2.20], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.21beta1], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.2.20
+PNGLIB_VERSION=1.2.21beta1
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
-PNGLIB_RELEASE=20
+PNGLIB_RELEASE=21
dnl End of version number stuff
diff --git a/libpng-1.2.20.txt b/libpng-1.2.21beta1.txt
similarity index 99%
rename from libpng-1.2.20.txt
rename to libpng-1.2.21beta1.txt
index dba113f..a42d686 100644
--- a/libpng-1.2.20.txt
+++ b/libpng-1.2.21beta1.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.20 - September 8, 2007
+ libpng version 1.2.21beta1 - September 14, 2007
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2007 Glenn Randers-Pehrson
@@ -2796,13 +2796,13 @@
IX. Y2K Compliance in libpng
-September 8, 2007
+September 14, 2007
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.20 are Y2K compliant. It is my belief that earlier
+upward through 1.2.21beta1 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 62501a0..9f0dc1f 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "September 8, 2007"
+.TH LIBPNG 3 "September 14, 2007"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.20
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.21beta1
.SH SYNOPSIS
\fB
#include <png.h>\fP
@@ -410,7 +410,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.20 - September 8, 2007
+ libpng version 1.2.21beta1 - September 14, 2007
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2007 Glenn Randers-Pehrson
@@ -3206,13 +3206,13 @@
.SH IX. Y2K Compliance in libpng
-September 8, 2007
+September 14, 2007
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.20 are Y2K compliant. It is my belief that earlier
+upward through 1.2.21beta1 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
@@ -3466,7 +3466,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.20 - September 8, 2007:
+Libpng version 1.2.21beta1 - September 14, 2007:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -3487,7 +3487,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.20, September 8, 2007, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.21beta1, September 14, 2007, are
Copyright (c) 2004,2006-2007 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
@@ -3586,7 +3586,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-September 8, 2007
+September 14, 2007
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 0a3ed69..abc2f4e 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "September 8, 2007"
+.TH LIBPNGPF 3 "September 14, 2007"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.20
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.21beta1
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 9cd336a..fc88507 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "September 8, 2007"
+.TH PNG 5 "September 14, 2007"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 2bbc22d..57ade19 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.19 August 19, 2007
+ * Last changed in libpng 1.2.21 [September 14, 2007]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -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_20 Your_png_h_is_not_version_1_2_20;
+typedef version_1_2_21beta1 Your_png_h_is_not_version_1_2_21beta1;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@@ -693,7 +693,7 @@
png_get_copyright(png_structp png_ptr)
{
png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */
- return ((png_charp) "\n libpng version 1.2.20 - September 8, 2007\n\
+ return ((png_charp) "\n libpng version 1.2.21beta1 - September 14, 2007\n\
Copyright (c) 1998-2007 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 b51fc91..6ec5e2a 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.20 - September 8, 2007
+ * libpng version 1.2.21beta1 - September 14, 2007
* Copyright (c) 1998-2007 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.20 - September 8, 2007: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.21beta1 - September 14, 2007: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -189,7 +189,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.20, September 8, 2007, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.21beta1, September 14, 2007, are
* Copyright (c) 2004, 2006-2007 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:
@@ -301,13 +301,13 @@
* Y2K compliance in libpng:
* =========================
*
- * September 8, 2007
+ * September 14, 2007
*
* 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.20 are Y2K compliant. It is my belief that earlier
+ * upward through 1.2.21beta1 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
@@ -363,9 +363,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.20"
+#define PNG_LIBPNG_VER_STRING "1.2.21beta1"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.20 - September 8, 2007\n"
+ " libpng version 1.2.21beta1 - September 14, 2007\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@@ -373,11 +373,11 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 2
-#define PNG_LIBPNG_VER_RELEASE 20
+#define PNG_LIBPNG_VER_RELEASE 21
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero: */
-#define PNG_LIBPNG_VER_BUILD 0
+#define PNG_LIBPNG_VER_BUILD 1
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -394,14 +394,14 @@
#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
PNG_LIBPNG_BUILD_PRIVATE */
-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
+#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA
/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
* We must not include leading zeros.
* Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
* version 1.0.0 was mis-numbered 100 instead of 10000). From
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */
-#define PNG_LIBPNG_VER 10220 /* 1.2.20 */
+#define PNG_LIBPNG_VER 10221 /* 1.2.21 */
#ifndef PNG_VERSION_INFO_ONLY
/* include the compression library's header */
@@ -1412,7 +1412,7 @@
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
-typedef png_structp version_1_2_20;
+typedef png_structp version_1_2_21beta1;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index 5b36cf6..d919a94 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.2.20 - September 8, 2007
+ * libpng version 1.2.21beta1 - September 14, 2007
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -76,9 +76,9 @@
/* End of material added to libpng-1.2.8 */
/* Added at libpng-1.2.19, removed at libpng-1.2.20 because it caused trouble
+ Restored at libpng-1.2.21 */
# define PNG_WARN_UNINITIALIZED_ROW 1
-*/
-/* End of material added at libpng-1.2.19 */
+/* End of material added at libpng-1.2.19/1.2.21 */
/* This is the size of the compression buffer, and thus the size of
* an IDAT chunk. Make this whatever size you feel is best for your
diff --git a/pngerror.c b/pngerror.c
index 159c5d4..448657c 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,7 +1,7 @@
/* pngerror.c - stub functions for i/o and memory allocation
*
- * Last changed in libpng 1.2.20 September 8, 2007
+ * Last changed in libpng 1.2.20 September 14, 2007
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngpread.c b/pngpread.c
index 66b31bc..d72ad23 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode
*
- * Last changed in libpng 1.2.20 September 8, 2007
+ * Last changed in libpng 1.2.21 September 14, 2007
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1487,8 +1487,7 @@
}
#endif
png_strncpy((png_charp)png_ptr->unknown_chunk.name,
- (png_charp)png_ptr->chunk_name,
- png_sizeof((png_charp)png_ptr->chunk_name));
+ (png_charp)png_ptr->chunk_name, 5);
png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
png_ptr->unknown_chunk.size = (png_size_t)length;
png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
diff --git a/pngread.c b/pngread.c
index c914030..56d815a 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
- * Last changed in libpng 1.2.19 August 19, 2007
+ * Last changed in libpng 1.2.20 September 7, 2007
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrtran.c b/pngrtran.c
index 97f12e6..480db13 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,7 +1,7 @@
/* pngrtran.c - transforms the data in a row for PNG readers
*
- * Last changed in libpng 1.2.19 August 19, 2007
+ * Last changed in libpng 1.2.21 [September 14, 2007]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -549,7 +549,7 @@
if(png_ptr == NULL) return;
png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
#ifdef PNG_WARN_UNINITIALIZED_ROW
- png_ptr->flags &= !(PNG_FLAG_ROW_INIT);
+ png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
#endif
}
@@ -579,6 +579,7 @@
png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
#ifdef PNG_WARN_UNINITIALIZED_ROW
png_ptr->flags &= !(PNG_FLAG_ROW_INIT);
+ png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
#endif
}
@@ -591,7 +592,7 @@
if(png_ptr == NULL) return;
png_ptr->transformations |= PNG_EXPAND;
#ifdef PNG_WARN_UNINITIALIZED_ROW
- png_ptr->flags &= !(PNG_FLAG_ROW_INIT);
+ png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
#endif
}
#endif
@@ -616,7 +617,7 @@
png_debug(1, "in png_set_tRNS_to_alpha\n");
png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
#ifdef PNG_WARN_UNINITIALIZED_ROW
- png_ptr->flags &= !(PNG_FLAG_ROW_INIT);
+ png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
#endif
}
#endif /* defined(PNG_READ_EXPAND_SUPPORTED) */
@@ -628,7 +629,7 @@
png_debug(1, "in png_set_gray_to_rgb\n");
png_ptr->transformations |= PNG_GRAY_TO_RGB;
#ifdef PNG_WARN_UNINITIALIZED_ROW
- png_ptr->flags &= !(PNG_FLAG_ROW_INIT);
+ png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
#endif
}
#endif
@@ -3867,9 +3868,9 @@
}
else if (row_info->bit_depth == 16)
{
- png_byte red_high = (trans_value->red > 8) & 0xff;
- png_byte green_high = (trans_value->green > 8) & 0xff;
- png_byte blue_high = (trans_value->blue > 8) & 0xff;
+ png_byte red_high = (trans_value->red >> 8) & 0xff;
+ png_byte green_high = (trans_value->green >> 8) & 0xff;
+ png_byte blue_high = (trans_value->blue >> 8) & 0xff;
png_byte red_low = trans_value->red & 0xff;
png_byte green_low = trans_value->green & 0xff;
png_byte blue_low = trans_value->blue & 0xff;
diff --git a/pngrutil.c b/pngrutil.c
index 99bca19..5f66745 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
- * Last changed in libpng 1.2.19 August 19, 2007
+ * Last changed in libpng 1.2.21 [September 14, 2007]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -2206,8 +2206,7 @@
}
#endif
png_strncpy((png_charp)png_ptr->unknown_chunk.name,
- (png_charp)png_ptr->chunk_name,
- png_sizeof((png_charp)png_ptr->chunk_name));
+ (png_charp)png_ptr->chunk_name, 5);
png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
png_ptr->unknown_chunk.size = (png_size_t)length;
png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
diff --git a/pngset.c b/pngset.c
index 2871140..164a9e2 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.17 May 15, 2007
+ * Last changed in libpng 1.2.21 [September 14, 2007]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -222,7 +222,7 @@
png_debug1(1, "in %s storage function\n", "hIST");
if (png_ptr == NULL || info_ptr == NULL)
return;
- if (info_ptr->num_palette <= 0 || info_ptr->num_palette
+ if (info_ptr->num_palette == 0 || info_ptr->num_palette
> PNG_MAX_PALETTE_LENGTH)
{
png_warning(png_ptr,
@@ -690,7 +690,7 @@
png_warning(png_ptr, "Insufficient memory to process iCCP chunk.");
return;
}
- png_strncpy(new_iccp_name, name, png_sizeof(new_iccp_name));
+ png_strncpy(new_iccp_name, name, png_strlen(new_iccp_name)+1);
new_iccp_profile = (png_charp)png_malloc_warn(png_ptr, proflen);
if (new_iccp_profile == NULL)
{
@@ -980,7 +980,7 @@
"Out of memory while processing sPLT chunk");
}
/* TODO: use png_malloc_warn */
- png_strncpy(to->name, from->name, png_strlen(from->name));
+ png_strncpy(to->name, from->name, png_strlen(from->name)+1);
to->entries = (png_sPLT_entryp)png_malloc_warn(png_ptr,
from->nentries * png_sizeof(png_sPLT_entry));
/* TODO: use png_malloc_warn */
diff --git a/pngtest.c b/pngtest.c
index 3981a49..a613398 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1548,4 +1548,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_20 your_png_h_is_not_version_1_2_20;
+typedef version_1_2_21beta1 your_png_h_is_not_version_1_2_21beta1;
diff --git a/pngwutil.c b/pngwutil.c
index c79b1fe..6b1372f 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.19 August 19, 2007
+ * Last changed in libpng 1.2.20 Septhember 3, 2007
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 4166765..5d2476e 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -6,7 +6,7 @@
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 2)
-set(PNGLIB_RELEASE 20)
+set(PNGLIB_RELEASE 21)
set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
@@ -169,7 +169,7 @@
# SET UP LINKS
set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 0.${PNGLIB_RELEASE}.1.2.20
+# VERSION 0.${PNGLIB_RELEASE}.1.2.21beta1
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 60bfcd9..42cf695 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.2.20
+version=1.2.21beta1
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in
index 1b87da1..6b5d64a 100644
--- a/scripts/libpng.pc-configure.in
+++ b/scripts/libpng.pc-configure.in
@@ -5,6 +5,6 @@
Name: libpng
Description: Loads and saves PNG files
-Version: 1.2.20
+Version: 1.2.21beta1
Libs: -L${libdir} -lpng12
Cflags: -I${includedir} @LIBPNG_NO_MMX@
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 17f9bc2..9a53650 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@
Name: libpng
Description: Loads and saves PNG files
-Version: 1.2.20
+Version: 1.2.21beta1
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 0b5e4da..a78b1d2 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 747fb39..e56383a 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 0646eb8..9c8d496 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 525534c..7078ac3 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 3e5996d..195690f 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -74,7 +74,7 @@
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 5ca1382..32219d5 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 9c7791c..f4b776f 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index aa42c1a..797c297 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index a570b58..ca052ea 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -14,7 +14,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 2a7450e..cc30692 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index 1e2869b..cb58fb8 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 5fed4d2..9bfd44e 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 31f70f6..c0f140d 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index 1d1dfee..7ceea69 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -74,7 +74,7 @@
LIBNAME = libpng12
PNGMAJ = 0
MINGDLL = 12
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index fbdb5e3..b75026a 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -14,7 +14,7 @@
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.20
+SHLIB_MINOR= 1.2.21beta1
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 d010c90..743df51 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -14,7 +14,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.2.20
+SHLIB_MINOR= 1.2.21beta1
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 bbb7ed6..277f226 100644
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -7,7 +7,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index 187f6fc..9f1f72d 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -8,7 +8,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.20
+SHLIB_MINOR= 1.2.21beta1
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 5df2523..41b8fc0 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 9f0dfbb..725eb7f 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 4eb1816..e2e40dc 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 8f16337..7263a72 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 3398d95..0fd3873 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index ec4d49d..8688433 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.21beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 6cc2fc2..3339e0d 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.2.20
+; Version 1.2.21beta1
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index 58a826d..3d07af3 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.2.20
+;Version 1.2.21beta1
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3