Imported from libpng-1.2.9beta10.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 2e2ba47..4cb6c64 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.2.9beta9 - March 10, 2006
+Libpng 1.2.9beta10 - March 20, 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,26 +9,26 @@
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- 1.2.9beta9.tar.gz
- 1.2.9beta9.tar.bz2
+ 1.2.9beta10.tar.gz
+ 1.2.9beta10.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp129b09.zip
- lp129b09.tar.bz2
+ lp129b10.zip
+ lp129b10.tar.bz2
Project files
- 1.2.9beta9-project-netware.zip
- 1.2.9beta9-project-wince.zip
+ 1.2.9beta10-project-netware.zip
+ 1.2.9beta10-project-wince.zip
Other information:
- 1.2.9beta9-README.txt
- 1.2.9beta9-KNOWNBUGS.txt
- 1.2.9beta9-LICENSE.txt
- 1.2.9beta9-Y2K-compliance.txt
+ 1.2.9beta10-README.txt
+ 1.2.9beta10-KNOWNBUGS.txt
+ 1.2.9beta10-LICENSE.txt
+ 1.2.9beta10-Y2K-compliance.txt
Changes since the last public release (1.2.8):
@@ -124,11 +124,13 @@
version 1.2.9beta9 [March 10, 2006]
Include "config.h" in pngconf.h when available.
- Enabled MMX when appropriate in "configure".
- Made pnggccrd.c PIC-compliant.
- Added some checks for NULL png_ptr or NULL info_ptr (Coverity)
+ Added some checks for NULL png_ptr or NULL info_ptr (timeless)
-version 1.2.9beta10 [March 10, 2006]
+version 1.2.9beta10 [March 20, 2006]
+ Removed extra CR from contrib/visualpng/VisualPng.dsw (Cosmin)
+ Made pnggccrd.c PIC-compliant (Christian Aichinger).
+ Added makefile.mingw (Wolfgang Glas)
+ Revised pngconf.h MMX checking.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 33e7ab7..31289b2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1491,7 +1491,7 @@
Made some makefiles accept "exec_prefix".
version 1.2.9beta8 [March 9, 2006]
- Fixed some "#ifdef defined (..." which should be "#ifdef defined(..."
+ Fixed some "#if defined (..." which should be "#if defined(..."
Bug introduced in libpng-1.2.8.
Fixed inconsistency in definition of png_default_read_data()
Restored blank that was lost from makefile.sggcc "clean" target in beta7.
@@ -1503,7 +1503,13 @@
version 1.2.9beta9 [March 10, 2006]
Include "config.h" in pngconf.h when available.
- Added some checks for NULL png_ptr or NULL info_ptr (Coverity)
+ Added some checks for NULL png_ptr or NULL info_ptr (timeless)
+
+version 1.2.9beta10 [March 20, 2006]
+ Removed extra CR from contrib/visualpng/VisualPng.dsw (Cosmin)
+ Made pnggccrd.c PIC-compliant (Christian Aichinger).
+ Added makefile.mingw (Wolfgang Glas).
+ Revised pngconf.h MMX checking.
version 1.4.0beta1 [future]
Enabled iTXt support (changes png_struct, thus requires so-number change).
diff --git a/INSTALL b/INSTALL
index c32f38d..a0963f9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.9beta9 - March 10, 2006
+Installing libpng version 1.2.9beta10 - March 20, 2006
On Unix/Linux and similar systems, you can simply type
@@ -29,7 +29,7 @@
correspond to the version of zlib that's installed.
You can rename the directories that you downloaded (they
-might be called "libpng-1.2.9beta9" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.9beta10" or "lpng109" and "zlib-1.2.1"
or "zlib121") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:
@@ -85,11 +85,11 @@
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng12.so.0.1.2.9beta9)
+ gcc, creates libpng12.so.0.1.2.9beta10)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.9beta9)
+ (gcc, creates libpng12.so.0.1.2.9beta10)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.9beta9,
+ (gcc, creates libpng12.so.0.1.2.9beta10,
uses assembler code tuned for Intel MMX platform)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
@@ -112,12 +112,12 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.sggcc => Silicon Graphics (gcc,
- creates libpng12.so.0.1.2.9beta9)
+ creates libpng12.so.0.1.2.9beta10)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng12.so.0.1.2.9beta9)
+ creates libpng12.so.0.1.2.9beta10)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng12.so.0.1.2.9beta9)
+ creates libpng12.so.0.1.2.9beta10)
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 64cfa2f..35a2146 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.2.9beta9
+Known bugs in libpng version 1.2.9beta10
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 ed36304..50b3321 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.9beta9, March 10, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.9beta10, March 20, 2006, are
Copyright (c) 2004, 2006 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
@@ -106,4 +106,4 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-March 10, 2006
+March 20, 2006
diff --git a/Makefile.am b/Makefile.am
index 2edd83a..f9c4f26 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@
EXTRA_LTLIBRARIES= libpng.la
libpng12_la_SOURCES = 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 \
+ pngwtran.c pngmem.c pngerror.c pngpread.c pnggccrd.c \
png.h pngconf.h
libpng_la_SOURCES = $(libpng12_la_SOURCES)
# MAJOR UPGRADE: the version-number settings below must be changed.
@@ -79,7 +79,7 @@
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng.txt pnggccrd.c pngvcrd.c
+ example.c libpng.txt pngvcrd.c
CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers libpng.sym
@@ -100,7 +100,7 @@
libpng.vers: libpng.sym
rm -f $@ $@.new
$(ECHO) PNG@PNGLIB_MAJOR@_0 '{global:' > $@.new
- $(SED) s/$$/\;/ $< >> $@.new
+ $(SED) s/$$/\;/ libpng.sym >> $@.new
$(ECHO) 'local: *; };' >> $@.new
mv $@.new $@
diff --git a/Makefile.in b/Makefile.in
index 1cfb57f..7ca2588 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,14 +81,15 @@
libpng_la_LIBADD =
am__objects_1 = png.lo pngset.lo pngget.lo pngrutil.lo pngtrans.lo \
pngwutil.lo pngread.lo pngrio.lo pngwio.lo pngwrite.lo \
- pngrtran.lo pngwtran.lo pngmem.lo pngerror.lo pngpread.lo
+ pngrtran.lo pngwtran.lo pngmem.lo pngerror.lo pngpread.lo \
+ pnggccrd.lo
am_libpng_la_OBJECTS = $(am__objects_1)
libpng_la_OBJECTS = $(am_libpng_la_OBJECTS)
libpng12_la_LIBADD =
am_libpng12_la_OBJECTS = png.lo pngset.lo pngget.lo pngrutil.lo \
pngtrans.lo pngwutil.lo pngread.lo pngrio.lo pngwio.lo \
pngwrite.lo pngrtran.lo pngwtran.lo pngmem.lo pngerror.lo \
- pngpread.lo
+ pngpread.lo pnggccrd.lo
libpng12_la_OBJECTS = $(am_libpng12_la_OBJECTS)
am_pngtest_OBJECTS = pngtest.$(OBJEXT)
pngtest_OBJECTS = $(am_pngtest_OBJECTS)
@@ -268,7 +269,7 @@
EXTRA_LTLIBRARIES = libpng.la
libpng12_la_SOURCES = 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 \
+ pngwtran.c pngmem.c pngerror.c pngpread.c pnggccrd.c \
png.h pngconf.h
libpng_la_SOURCES = $(libpng12_la_SOURCES)
@@ -301,7 +302,7 @@
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng.txt pnggccrd.c pngvcrd.c
+ example.c libpng.txt pngvcrd.c
CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers libpng.sym
all: config.h
@@ -432,6 +433,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/png.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngerror.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pnggccrd.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngget.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngmem.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngpread.Plo@am__quote@
@@ -991,7 +993,7 @@
libpng.vers: libpng.sym
rm -f $@ $@.new
$(ECHO) PNG@PNGLIB_MAJOR@_0 '{global:' > $@.new
- $(SED) s/$$/\;/ $< >> $@.new
+ $(SED) s/$$/\;/ libpng.sym >> $@.new
$(ECHO) 'local: *; };' >> $@.new
mv $@.new $@
diff --git a/README b/README
index 47b717b..a2f5bd0 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.2.9beta9 - March 10, 2006 (shared library 12.0)
+README for libpng version 1.2.9beta10 - March 20, 2006 (shared library 12.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@@ -190,11 +190,11 @@
descrip.mms => VMS makefile for MMS or MMK
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng12.so.0.1.2.9beta9)
+ gcc, creates libpng12.so.0.1.2.9beta10)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.9beta9)
+ (gcc, creates libpng12.so.0.1.2.9beta10)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.9beta9,
+ (gcc, creates libpng12.so.0.1.2.9beta10,
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.9beta9)
+ (gcc, creates libpng12.so.0.1.2.9beta10)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng12.so.0.1.2.9beta9)
+ (gcc, creates libpng12.so.0.1.2.9beta10)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng12.so.0.1.2.9beta9)
+ (gcc, creates libpng12.so.0.1.2.9beta10)
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 7def218..b88e6f1 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- March 10, 2006
+ March 20, 2006
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
- upward through 1.2.9beta9 are Y2K compliant. It is my belief that earlier
+ upward through 1.2.9beta10 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 1826dff..314e5d7 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libpng 1.2.9beta7.
+# Generated by GNU Autoconf 2.59 for libpng 1.2.9beta10.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.2.9beta7'
-PACKAGE_STRING='libpng 1.2.9beta7'
+PACKAGE_VERSION='1.2.9beta10'
+PACKAGE_STRING='libpng 1.2.9beta10'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
@@ -875,13 +875,13 @@
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`
srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
+ if test ! -r "$srcdir/$ac_unique_file"; then
srcdir=..
fi
else
ac_srcdir_defaulted=no
fi
-if test ! -r $srcdir/$ac_unique_file; then
+if test ! -r "$srcdir/$ac_unique_file"; then
if test "$ac_srcdir_defaulted" = yes; then
{ echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
{ (exit 1); exit 1; }; }
@@ -890,7 +890,7 @@
{ (exit 1); exit 1; }; }
fi
fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
{ echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
{ (exit 1); exit 1; }; }
srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
@@ -954,7 +954,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libpng 1.2.9beta7 to adapt to many kinds of systems.
+\`configure' configures libpng 1.2.9beta10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.2.9beta7:";;
+ short | recursive ) echo "Configuration of libpng 1.2.9beta10:";;
esac
cat <<\_ACEOF
@@ -1167,7 +1167,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.2.9beta7
+libpng configure 1.2.9beta10
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1181,7 +1181,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libpng $as_me 1.2.9beta7, which was
+It was created by libpng $as_me 1.2.9beta10, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1824,7 +1824,7 @@
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.2.9beta7'
+ VERSION='1.2.9beta10'
cat >>confdefs.h <<_ACEOF
@@ -1979,7 +1979,7 @@
-PNGLIB_VERSION=1.2.9beta7
+PNGLIB_VERSION=1.2.9beta10
PNGLIB_MAJOR=12
PNGLIB_MINOR=9
@@ -20833,7 +20833,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by libpng $as_me 1.2.9beta7, which was
+This file was extended by libpng $as_me 1.2.9beta10, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20896,7 +20896,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libpng config.status 1.2.9beta7
+libpng config.status 1.2.9beta10
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 1d78d57..e46fc5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@
dnl Version number stuff here:
-AC_INIT([libpng], [1.2.9beta7], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.9beta10], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.2.9beta7
+PNGLIB_VERSION=1.2.9beta10
PNGLIB_MAJOR=12
PNGLIB_MINOR=9
diff --git a/contrib/visupng/VisualPng.dsw b/contrib/visupng/VisualPng.dsw
index c5a8928..a30e1cc 100644
--- a/contrib/visupng/VisualPng.dsw
+++ b/contrib/visupng/VisualPng.dsw
Binary files differ
diff --git a/libpng.3 b/libpng.3
index d627090..ae95467 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "March 10, 2006"
+.TH LIBPNG 3 "March 20, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta9
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta10
.SH SYNOPSIS
\fI\fB
@@ -821,7 +821,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.9beta9 - March 10, 2006
+ libpng version 1.2.9beta10 - March 20, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -3730,13 +3730,13 @@
.SH IX. Y2K Compliance in libpng
-March 10, 2006
+March 20, 2006
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.9beta9 are Y2K compliant. It is my belief that earlier
+upward through 1.2.9beta10 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
@@ -3946,7 +3946,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.9beta9 - March 10, 2006:
+Libpng version 1.2.9beta10 - March 20, 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).
@@ -3967,7 +3967,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.9beta9, March 10, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.9beta10, March 20, 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
@@ -4066,7 +4066,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-March 10, 2006
+March 20, 2006
.\" end of man page
diff --git a/libpng.txt b/libpng.txt
index d4d6b6e..c247627 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.9beta9 - March 10, 2006
+ libpng version 1.2.9beta10 - March 20, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -2909,13 +2909,13 @@
IX. Y2K Compliance in libpng
-March 10, 2006
+March 20, 2006
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.9beta9 are Y2K compliant. It is my belief that earlier
+upward through 1.2.9beta10 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 ddbc18c..e9f1374 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "March 10, 2006"
+.TH LIBPNGPF 3 "March 20, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta9
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta10
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 62841d8..197b5c8 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "March 10, 2006"
+.TH PNG 5 "March 20, 2006"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 68d3cce..dfcaf45 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.9 March 10, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 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_9beta9 Your_png_h_is_not_version_1_2_9beta9;
+typedef version_1_2_9beta10 Your_png_h_is_not_version_1_2_9beta10;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@@ -693,7 +693,7 @@
png_get_copyright(png_structp png_ptr)
{
if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */
- return ((png_charp) "\n libpng version 1.2.9beta9 - March 10, 2006\n\
+ return ((png_charp) "\n libpng version 1.2.9beta10 - March 20, 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 46ff5e6..635ad4f 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.9beta9 - March 10, 2006
+ * libpng version 1.2.9beta10 - March 20, 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.9beta9 - March 10, 2006: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.9beta10 - March 20, 2006: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -143,7 +143,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.9beta9, March 10, 2006, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.9beta10, March 20, 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:
@@ -255,13 +255,13 @@
* Y2K compliance in libpng:
* =========================
*
- * March 10, 2006
+ * March 20, 2006
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
- * upward through 1.2.9beta9 are Y2K compliant. It is my belief that earlier
+ * upward through 1.2.9beta10 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
@@ -317,9 +317,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.9beta9"
+#define PNG_LIBPNG_VER_STRING "1.2.9beta10"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.9beta9 - March 10, 2006 (header)\n"
+ " libpng version 1.2.9beta10 - March 20, 2006 (header)\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@@ -331,7 +331,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 9
+#define PNG_LIBPNG_VER_BUILD 10
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -1361,7 +1361,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_9beta9;
+typedef png_structp version_1_2_9beta10;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index 7f084ea..83d08d2 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.2.9beta9 - March 10, 2006
+ * libpng version 1.2.9beta10 - March 20, 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)
@@ -720,9 +720,14 @@
# ifndef PNG_ASSEMBLER_CODE_SUPPORTED
# define PNG_ASSEMBLER_CODE_SUPPORTED
# endif
-# if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+# if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE) && \
+ defined(__MMX__)
# define PNG_MMX_CODE_SUPPORTED
# endif
+# if !defined(PNG_USE_PNGGCCRD) && !defined(PNG_NO_MMX_CODE) && \
+ defined(__MMX__)
+# define PNG_USE_PNGGCCRD
+# endif
#endif
/* If you are sure that you don't need thread safety and you are compiling
diff --git a/pngerror.c b/pngerror.c
index ad99788..f13eb1b 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.9 March 10, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pnggccrd.c b/pnggccrd.c
index 012f68a..6723073 100644
--- a/pnggccrd.c
+++ b/pnggccrd.c
@@ -7,7 +7,7 @@
* and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm
* for Intel's performance analysis of the MMX vs. non-MMX code.
*
- * Last changed in libpng 1.2.9 March 10, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* Copyright (c) 1998, Intel Corporation
@@ -1739,6 +1739,7 @@
int dummy_value_c; // fix 'forbidden register spilled'
int dummy_value_S;
int dummy_value_D;
+ int dummy_value_a;
__asm__ __volatile__ (
"subl $21, %%edi \n\t"
@@ -1746,7 +1747,7 @@
".loop3_pass0: \n\t"
"movd (%%esi), %%mm0 \n\t" // x x x x x 2 1 0
- "pand _const4, %%mm0 \n\t" // z z z z z 2 1 0
+ "pand (%3), %%mm0 \n\t" // z z z z z 2 1 0
"movq %%mm0, %%mm1 \n\t" // z z z z z 2 1 0
"psllq $16, %%mm0 \n\t" // z z z 2 1 0 z z
"movq %%mm0, %%mm2 \n\t" // z z z 2 1 0 z z
@@ -1771,12 +1772,14 @@
: "=c" (dummy_value_c), // output regs (dummy)
"=S" (dummy_value_S),
- "=D" (dummy_value_D)
+ "=D" (dummy_value_D),
+ "=a" (dummy_value_a)
+
: "1" (sptr), // esi // input regs
"2" (dp), // edi
"0" (width), // ecx
- "rim" (_const4) // %1(?) (0x0000000000FFFFFFLL)
+ "3" (&_const4) // %1(?) (0x0000000000FFFFFFLL)
#if 0 /* %mm0, ..., %mm4 not supported by gcc 2.7.2.3 or egcs 1.1 */
: "%mm0", "%mm1", "%mm2" // clobber list
@@ -1789,6 +1792,7 @@
int dummy_value_c; // fix 'forbidden register spilled'
int dummy_value_S;
int dummy_value_D;
+ int dummy_value_a;
__asm__ __volatile__ (
"subl $9, %%edi \n\t"
@@ -1796,7 +1800,7 @@
".loop3_pass2: \n\t"
"movd (%%esi), %%mm0 \n\t" // x x x x x 2 1 0
- "pand _const4, %%mm0 \n\t" // z z z z z 2 1 0
+ "pand (%3), %%mm0 \n\t" // z z z z z 2 1 0
"movq %%mm0, %%mm1 \n\t" // z z z z z 2 1 0
"psllq $16, %%mm0 \n\t" // z z z 2 1 0 z z
"movq %%mm0, %%mm2 \n\t" // z z z 2 1 0 z z
@@ -1815,12 +1819,13 @@
: "=c" (dummy_value_c), // output regs (dummy)
"=S" (dummy_value_S),
- "=D" (dummy_value_D)
+ "=D" (dummy_value_D),
+ "=a" (dummy_value_a)
: "1" (sptr), // esi // input regs
"2" (dp), // edi
"0" (width), // ecx
- "rim" (_const4) // (0x0000000000FFFFFFLL)
+ "3" (&_const4) // (0x0000000000FFFFFFLL)
#if 0 /* %mm0, ..., %mm2 not supported by gcc 2.7.2.3 or egcs 1.1 */
: "%mm0", "%mm1", "%mm2" // clobber list
@@ -1841,6 +1846,8 @@
int dummy_value_c; // fix 'forbidden register spilled'
int dummy_value_S;
int dummy_value_D;
+ int dummy_value_a;
+ int dummy_value_d;
__asm__ __volatile__ (
"subl $3, %%esi \n\t"
@@ -1852,14 +1859,14 @@
"movq %%mm0, %%mm1 \n\t" // x x 5 4 3 2 1 0
"movq %%mm0, %%mm2 \n\t" // x x 5 4 3 2 1 0
"psllq $24, %%mm0 \n\t" // 4 3 2 1 0 z z z
- "pand _const4, %%mm1 \n\t" // z z z z z 2 1 0
+ "pand (%3), %%mm1 \n\t" // z z z z z 2 1 0
"psrlq $24, %%mm2 \n\t" // z z z x x 5 4 3
"por %%mm1, %%mm0 \n\t" // 4 3 2 1 0 2 1 0
"movq %%mm2, %%mm3 \n\t" // z z z x x 5 4 3
"psllq $8, %%mm2 \n\t" // z z x x 5 4 3 z
"movq %%mm0, (%%edi) \n\t"
"psrlq $16, %%mm3 \n\t" // z z z z z x x 5
- "pand _const6, %%mm3 \n\t" // z z z z z z z 5
+ "pand (%4), %%mm3 \n\t" // z z z z z z z 5
"por %%mm3, %%mm2 \n\t" // z z x x 5 4 3 5
"subl $6, %%esi \n\t"
"movd %%mm2, 8(%%edi) \n\t"
@@ -1870,13 +1877,15 @@
: "=c" (dummy_value_c), // output regs (dummy)
"=S" (dummy_value_S),
- "=D" (dummy_value_D)
+ "=D" (dummy_value_D),
+ "=a" (dummy_value_a),
+ "=d" (dummy_value_d)
: "1" (sptr), // esi // input regs
"2" (dp), // edi
"0" (width_mmx), // ecx
- "rim" (_const4), // 0x0000000000FFFFFFLL
- "rim" (_const6) // 0x00000000000000FFLL
+ "3" (&_const4), // 0x0000000000FFFFFFLL
+ "4" (&_const6) // 0x00000000000000FFLL
#if 0 /* %mm0, ..., %mm3 not supported by gcc 2.7.2.3 or egcs 1.1 */
: "%mm0", "%mm1" // clobber list
@@ -5341,6 +5350,7 @@
png_mmx_support(void)
{
#if defined(PNG_MMX_CODE_SUPPORTED)
+ int result;
__asm__ __volatile__ (
"pushl %%ebx \n\t" // ebx gets clobbered by CPUID instruction
"pushl %%ecx \n\t" // so does ecx...
@@ -5382,7 +5392,6 @@
"0: \n\t" // .NOT_SUPPORTED: target label for jump instructions
"movl $0, %%eax \n\t" // set return value to 0
"1: \n\t" // .RETURN: target label for jump instructions
- "movl %%eax, _mmx_supported \n\t" // save in global static variable, too
"popl %%edx \n\t" // restore edx
"popl %%ecx \n\t" // restore ecx
"popl %%ebx \n\t" // restore ebx
@@ -5390,15 +5399,16 @@
// "ret \n\t" // DONE: no MMX support
// (fall through to standard C "ret")
- : // output list (none)
+ : "=a" (result) // output list
: // any variables used on input (none)
- : "%eax" // clobber list
+ // no clobber list
// , "%ebx", "%ecx", "%edx" // GRR: we handle these manually
// , "memory" // if write to a variable gcc thought was in a reg
// , "cc" // "condition codes" (flag bits)
);
+ _mmx_supported = result;
#else
_mmx_supported = 0;
#endif /* PNG_MMX_CODE_SUPPORTED */
diff --git a/pngget.c b/pngget.c
index dacf821..1f37d8c 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
/* pngget.c - retrieval of values from info struct
*
- * Last changed in libpng 1.2.9 March 10, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -918,6 +918,7 @@
return (png_uint_32)(png_ptr? png_ptr->mmx_rowbytes_threshold : 0L);
}
#endif /* ?PNG_ASSEMBLER_CODE_SUPPORTED */
+#endif /* ?PNG_1_0_X */
#ifdef PNG_SET_USER_LIMITS_SUPPORTED
/* these functions were added to libpng 1.2.6 */
@@ -933,5 +934,4 @@
}
#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
-#endif /* ?PNG_1_0_X */
#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
diff --git a/pngmem.c b/pngmem.c
index b3f5868..7f6cb56 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@
/* pngmem.c - stub functions for memory allocation
*
- * Last changed in libpng 1.2.9 March 10, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngread.c b/pngread.c
index 2d99faf..26c18b3 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
- * Last changed in libpng 1.2.9 March 10, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrio.c b/pngrio.c
index 1d5b866..3d84880 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,7 +1,7 @@
/* pngrio.c - functions for data input
*
- * Last changed in libpng 1.2.9 March 10, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrtran.c b/pngrtran.c
index 19db095..59f3d02 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.9 March 10, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrutil.c b/pngrutil.c
index 647a12c..0109fe6 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.9 March 10, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngset.c b/pngset.c
index 60d5b95..2051f7b 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.9 March 10, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngsyms.c b/pngsyms.c
deleted file mode 100644
index 8f0b08a..0000000
--- a/pngsyms.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define PNG_BUILDSYMS
-#include "config.h"
-#include "png.h"
diff --git a/pngtest.c b/pngtest.c
index 7514f9c..40409b9 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1551,4 +1551,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_9beta9 your_png_h_is_not_version_1_2_9beta9;
+typedef version_1_2_9beta10 your_png_h_is_not_version_1_2_9beta10;
diff --git a/pngtrans.c b/pngtrans.c
index d64b47c..7bf20cb 100644
--- a/pngtrans.c
+++ b/pngtrans.c
@@ -1,7 +1,7 @@
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
*
- * Last changed in libpng 1.2.9 March 10, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwrite.c b/pngwrite.c
index 17d285b..88e01d1 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file
*
- * Last changed in libpng 1.2.9 March 10, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwtran.c b/pngwtran.c
index dca30f0..fb7694a 100644
--- a/pngwtran.c
+++ b/pngwtran.c
@@ -1,7 +1,7 @@
/* pngwtran.c - transforms the data in a row for PNG writers
*
- * Last changed in libpng 1.2.9 March 10, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwutil.c b/pngwutil.c
index db98c02..a4812d9 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.9 March 10, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index d3b9b53..45c19cb 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.2.9beta9
+version=1.2.9beta10
prefix=""
libdir=""
libs=""
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index d1d2cf2..06f76e2 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -7,7 +7,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=cc
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index b4de365..3697df6 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -7,7 +7,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=cc
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 2d97bae..c4a897b 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index a77364f..7216994 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -17,7 +17,7 @@
ZLIBINC=/usr/local/include
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
ALIGN=
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 582448d..2d9c94c 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -3,8 +3,8 @@
# of the library, and builds two copies of pngtest: one
# statically linked and one dynamically linked.
#
-# Copyright (C) 2002 Soren Anderson, Charles Wilson, and Glenn Randers-Pehrson
-# based on makefile for linux-elf w/mmx by:
+# Copyright (C) 2002, 2006 Soren Anderson, Charles Wilson,
+# and Glenn Randers-Pehrson, based on makefile for linux-elf w/mmx by:
# Copyright (C) 1998-2000 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
# For conditions of distribution and use, see copyright notice in png.h
@@ -80,7 +80,7 @@
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
@@ -94,7 +94,7 @@
LDSFLAGS=$(strip -shared -L. $(MINGW_LDFLAGS) -Wl,--export-all)
LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz
-MKDIR=/bin/mkdir -pv
+MKDIR_P=/bin/mkdir -pv
RANLIB=ranlib
#RANLIB=echo
@@ -205,15 +205,15 @@
./pngtest $(S)/pngtest.png
install-static: $(STATLIB) install-headers install-man
- -@if [ ! -d $(DL) ]; then $(MKDIR) $(DL); fi
+ -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
install -m 644 $(STATLIB) $(DL)/$(LIBNAME).a
-@rm -f $(DL)/$(STATLIB)
(cd $(DL); ln -sf $(LIBNAME).a $(STATLIB))
install-shared: $(SHAREDLIB) libpng.pc libpng-config install-headers install-man
- -@if [ ! -d $(DL) ]; then $(MKDIR) $(DL); fi
- -@if [ ! -d $(DB) ]; then $(MKDIR) $(DB); fi
- -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR) $(DL)/pkgconfig; fi
+ -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
+ -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
+ -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc
-@/bin/rm -f $(DL)/pkgconfig/libpng.pc
install -m 644 $(IMPLIB) $(DL)/$(LIBNAME).dll.a
@@ -224,8 +224,8 @@
(cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)
install-headers:
- -@if [ ! -d $(DI) ]; then $(MKDIR) $(DI); fi
- -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR) $(DI)/$(LIBNAME); fi
+ -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
+ -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
-@rm -f $(DI)/png.h
-@rm -f $(DI)/pngconf.h
install -m 644 $(S)/png.h $(S)/pngconf.h $(DI)/$(LIBNAME)
@@ -233,13 +233,13 @@
(cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
install-man:
- -@if [ ! -d $(D)$(MAN3PATH) ]; then $(MKDIR) $(D)$(MAN3PATH); fi
- -@if [ ! -d $(D)$(MAN5PATH) ]; then $(MKDIR) $(D)$(MAN5PATH); fi
+ -@if [ ! -d $(D)$(MAN3PATH) ]; then $(MKDIR_P) $(D)$(MAN3PATH); fi
+ -@if [ ! -d $(D)$(MAN5PATH) ]; then $(MKDIR_P) $(D)$(MAN5PATH); fi
install -m 644 $(S)/libpngpf.3 $(S)/libpng.3 $(D)$(MAN3PATH)
install -m 644 $(S)/png.5 $(D)$(MAN5PATH)
install-config: libpng-config
- -@if [ ! -d $(DB) ]; then mkdir $(DB); fi
+ -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
-@/bin/rm -f $(DB)/libpng-config
-@/bin/rm -f $(DB)/$(LIBNAME)-config
cp libpng-config $(DB)/$(LIBNAME)-config
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 1b2d159..8558960 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -27,7 +27,7 @@
LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index b8c1fbd..dd72b0d 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -33,7 +33,7 @@
ZLIBINC=../zlib
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index cca9f39..b2ba695 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -11,7 +11,7 @@
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
AR_RC=ar rc
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 38b588d..b8f35dc 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -15,7 +15,7 @@
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
# Compiler, linker, lib and other tools
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index ed76d95..a3fe2ec 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -32,7 +32,7 @@
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index 04c54d7..8290c71 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -44,7 +44,7 @@
LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 0b1fc32..4c48a94 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -28,7 +28,7 @@
LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 61eead8..171b749 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -5,7 +5,7 @@
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
AR_RC=ar rc
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
new file mode 100644
index 0000000..fcdc2bb
--- /dev/null
+++ b/scripts/makefile.mingw
@@ -0,0 +1,312 @@
+# makefile for mingw on x86
+# Builds both dll (with import lib) and static lib versions
+# of the library, and builds two copies of pngtest: one
+# statically linked and one dynamically linked.
+#
+# Built from makefile.cygwin
+# Copyright (C) 2002, 2006 Soren Anderson, Charles Wilson,
+# and Glenn Randers-Pehrson, based on makefile for linux-elf w/mmx by:
+# Copyright (C) 1998-2000 Greg Roelofs
+# Copyright (C) 1996, 1997 Andreas Dilger
+# For conditions of distribution and use, see copyright notice in png.h
+
+# This makefile intends to support building outside the src directory
+# if desired. When invoking it, specify an argument to SRCDIR on the
+# command line that points to the top of the directory where your source
+# is located.
+
+ifdef SRCDIR
+VPATH = $(SRCDIR)
+else
+SRCDIR = .
+endif
+
+# Override DESTDIR= on the make install command line to easily support
+# installing into a temporary location. Example:
+#
+# make install DESTDIR=/tmp/build/libpng
+#
+# If you're going to install into a temporary location
+# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
+# you execute make install.
+
+DESTDIR=
+
+# To enable assembler optimizations, add '-DPNG_USE_PNGGCCRD' to
+# $CFLAGS, and include pnggccrd.o in $OBJS, below, and in the dependency
+# list at the bottom of this makefile.
+
+CC=gcc
+
+
+# Where "make install" puts libpng*.a, *png*.dll, png.h, and pngconf.h
+ifndef prefix
+prefix=/usr
+$(warning You haven't specified a 'prefix=' location. Defaulting to "/usr")
+endif
+exec_prefix=$prefix
+
+# Where the zlib library and include files are located
+ZLIBLIB= /usr/lib
+ZLIBINC=
+
+ALIGN=
+# for i386:
+#ALIGN=-malign-loops=2 -malign-functions=2
+
+WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
+ -Wmissing-declarations -Wtraditional -Wcast-align \
+ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
+
+### if you use the asm, add pnggccrd.o to the OBJS list
+###
+### if you don't need thread safety, but want the asm accel
+#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD \
+# $(addprefix -I,$(ZLIBINC)) -Wall -O3 $(ALIGN) -funroll-loops \
+# -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
+### if you need thread safety and want (minimal) asm accel
+#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_USE_PNGGCCRD $(addprefix -I,$(ZLIBINC)) \
+# -Wall -O3 $(ALIGN) -funroll-loops \
+# -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
+### Normal (non-asm) compilation
+CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
+ -Wall -O3 $(ALIGN) -funroll-loops \
+ -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
+
+LIBNAME = libpng12
+PNGMAJ = 0
+MINGDLL = 12
+PNGMIN = 1.2.9beta10
+PNGVER = $(PNGMAJ).$(PNGMIN)
+
+SHAREDLIB=libpng$(MINGDLL).dll
+STATLIB=libpng.a
+IMPLIB=libpng.dll.a
+SHAREDDEF=libpng.def
+LIBS=$(SHAREDLIB) $(STATLIB)
+EXE=.exe
+
+LDFLAGS=$(strip -L. $(MINGW_LDFLAGS) -lpng $(addprefix -L,$(ZLIBLIB)) -lz)
+LDSFLAGS=$(strip -shared -L. $(MINGW_LDFLAGS))
+LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz
+
+MKDIR_P=/bin/mkdir -pv
+RANLIB=ranlib
+#RANLIB=echo
+
+INCPATH=$(prefix)/include
+LIBPATH=$(exec_prefix)/lib
+
+BINPATH=$(exec_prefix)/bin
+MANPATH=$(prefix)/man
+MAN3PATH=$(MANPATH)/man3
+MAN5PATH=$(MANPATH)/man5
+
+# cosmetic: shortened strings:
+S =$(SRCDIR)
+D =$(DESTDIR)
+DB =$(D)$(BINPATH)
+DI =$(D)$(INCPATH)
+DL =$(D)$(LIBPATH)
+
+OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
+ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
+ pngwtran.o pngmem.o pngerror.o pngpread.o # pnggccrd.o
+
+OBJSDLL = $(OBJS:.o=.pic.o)
+
+.SUFFIXES: .c .o .pic.o
+
+%.o : %.c
+ $(CC) -c $(CFLAGS) -o $@ $<
+%.pic.o : CFLAGS += -DPNG_BUILD_DLL
+%.pic.o : %.c
+ $(CC) -c $(CFLAGS) -o $@ $<
+
+all: all-static all-shared libpng.pc libpng-config libpng.pc libpng-config
+
+# Make this to verify that "make [...] install" will do what you want.
+buildsetup-tell:
+ @echo VPATH is set to: \"$(VPATH)\"
+ @echo prefix is set to: \"$(prefix)\"
+ @echo -e INCPATH,LIBPATH, etc. are set to:'\n' \
+ $(addprefix $(D),$(INCPATH)'\n' $(LIBPATH)'\n' $(BINPATH)'\n' \
+ $(MANPATH)'\n' $(MAN3PATH)'\n' $(MAN5PATH)'\n')'\n'
+
+libpng.pc: scripts/libpng.pc.in
+ @echo -e Making pkg-config file for this libpng installation..'\n' \
+ using PREFIX=\"$(prefix)\"'\n'
+ cat $(S)/scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! | \
+ sed -e s/-lm// > libpng.pc
+
+libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in
+ @echo -e Making $(LIBNAME) libpng-config file for this libpng \
+ installation..'\n' using PREFIX=\"$(prefix)\"'\n'
+ ( cat $(S)/scripts/libpng-config-head.in; \
+ echo prefix=\"$(prefix)\"; \
+ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+ echo L_opts=\"-L$(LIBPATH)\"; \
+ echo libs=\"-lpng$(MINGDLL) -lz\"; \
+ cat $(S)/scripts/libpng-config-body.in ) > libpng-config
+ chmod +x libpng-config
+
+static: all-static
+shared: all-shared
+all-static: $(STATLIB) pngtest-stat$(EXE)
+all-shared: $(SHAREDLIB) pngtest$(EXE)
+
+pnggccrd.o: pnggccrd.c png.h pngconf.h
+ @echo ""
+ @echo ' You can ignore the "control reaches end of non-void function"'
+ @echo ' warning and "<variable> defined but not used" warnings:'
+ @echo ""
+ $(CC) -c $(CFLAGS) -o $@ $<
+
+pnggccrd.pic.o: pnggccrd.c png.h pngconf.h
+ @echo ""
+ @echo ' You can ignore the "control reaches end of non-void function"'
+ @echo ' warning and "<variable> defined but not used" warnings:'
+ @echo ""
+ $(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
+
+$(STATLIB): $(OBJS)
+ ar rc $@ $(OBJS)
+ $(RANLIB) $@
+
+$(SHAREDDEF): scripts/pngw32.def
+ cat $< | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' | \
+ sed -e 's/\([^;]*\);/;/' > $@
+
+$(SHAREDLIB): $(OBJSDLL) $(SHAREDDEF)
+ $(CC) $(LDSFLAGS) -o $@ $(OBJSDLL) -L. $(LDEXTRA)
+
+pngtest$(EXE): pngtest.pic.o $(SHAREDLIB)
+ $(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
+
+pngtest-stat$(EXE): pngtest.o $(STATLIB)
+ $(CC) -static $(CFLAGS) $< $(LDFLAGS) -o $@
+
+pngtest.pic.o: pngtest.c
+ $(CC) $(CFLAGS) -c $< -o $@
+
+pngtest.o: pngtest.c
+ $(CC) $(CFLAGS) -c $< -o $@
+
+test: test-static test-shared
+
+test-static: pngtest-stat$(EXE)
+ ./pngtest-stat $(S)/pngtest.png
+
+test-shared: pngtest$(EXE)
+ ./pngtest $(S)/pngtest.png
+
+install-static: $(STATLIB) install-headers install-man
+ -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
+ install -m 644 $(STATLIB) $(DL)/$(LIBNAME).a
+ -@rm -f $(DL)/$(STATLIB)
+ (cd $(DL); ln -sf $(LIBNAME).a $(STATLIB))
+
+install-shared: $(SHAREDLIB) libpng.pc libpng-config install-headers install-man
+ -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
+ -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
+ -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
+ -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc
+ -@/bin/rm -f $(DL)/pkgconfig/libpng.pc
+ install -m 644 $(IMPLIB) $(DL)/$(LIBNAME).dll.a
+ -@rm -f $(DL)/$(IMPLIB)
+ (cd $(DL); ln -sf $(LIBNAME).dll.a $(IMPLIB))
+ install -s -m 755 $(SHAREDLIB) $(DB)
+ install -m 644 libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
+ (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)
+
+install-headers:
+ -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
+ -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
+ -@rm -f $(DI)/png.h
+ -@rm -f $(DI)/pngconf.h
+ install -m 644 $(S)/png.h $(S)/pngconf.h $(DI)/$(LIBNAME)
+ -@rm -f $(DI)/libpng
+ (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
+
+install-man:
+ -@if [ ! -d $(D)$(MAN3PATH) ]; then $(MKDIR_P) $(D)$(MAN3PATH); fi
+ -@if [ ! -d $(D)$(MAN5PATH) ]; then $(MKDIR_P) $(D)$(MAN5PATH); fi
+ install -m 644 $(S)/libpngpf.3 $(S)/libpng.3 $(D)$(MAN3PATH)
+ install -m 644 $(S)/png.5 $(D)$(MAN5PATH)
+
+install-config: libpng-config
+ -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
+ -@/bin/rm -f $(DB)/libpng-config
+ -@/bin/rm -f $(DB)/$(LIBNAME)-config
+ cp libpng-config $(DB)/$(LIBNAME)-config
+ chmod 755 $(DB)/$(LIBNAME)-config
+ (cd $(DB); ln -sf $(LIBNAME)-config libpng-config)
+
+# Run this to verify that a future `configure' run will pick up the settings
+# you want.
+test-config-install: SHELL=/bin/bash
+test-config-install: $(DB)/libpng-config
+ @echo -e Testing libpng-config functions...'\n'
+ @ for TYRA in LDFLAGS CPPFLAGS CFLAGS LIBS VERSION; \
+ do \
+ printf "(%d)\t %10s =%s\n" $$(($$gytiu + 1)) $$TYRA \
+ "$$($(DB)/libpng-config `echo --$$TYRA |tr '[:upper:]' '[:lower:]'`)"; \
+ gytiu=$$(( $$gytiu + 1 )); \
+ done
+
+install: install-static install-shared install-man install-config
+
+# If you installed in $(DESTDIR), test-installed won't work until you
+# move the library to its final location. Use test-dd to test it
+# before then.
+
+test-dd:
+ echo
+ echo Testing installed dynamic shared library in $(DL).
+ $(CC) -I$(DI) $(CFLAGS) \
+ `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+ -L$(DL) -L$(ZLIBLIB) \
+ -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
+ ./pngtestd pngtest.png
+
+test-installed:
+ $(CC) $(CFLAGS) \
+ `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+ -L$(ZLIBLIB) \
+ -o pngtesti$(EXE) `$(BINPATH)/libpng12-config --ldflags`
+ ./pngtesti$(EXE) pngtest.png
+
+clean:
+ /bin/rm -f *.pic.o *.o $(STATLIB) $(IMPLIB) $(SHAREDLIB) \
+ pngtest-stat$(EXE) pngtest$(EXE) pngout.png $(SHAREDDEF) \
+ libpng-config libpng.pc pngtesti$(EXE)
+
+DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
+writelock:
+ chmod a-w *.[ch35] $(DOCS) scripts/*
+
+.PHONY: buildsetup-tell libpng.pc libpng-config test-config-install clean
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+png.o png.pic.o: png.h pngconf.h png.c
+pngerror.o pngerror.pic.o: png.h pngconf.h pngerror.c
+pngrio.o pngrio.pic.o: png.h pngconf.h pngrio.c
+pngwio.o pngwio.pic.o: png.h pngconf.h pngwio.c
+pngmem.o pngmem.pic.o: png.h pngconf.h pngmem.c
+pngset.o pngset.pic.o: png.h pngconf.h pngset.c
+pngget.o pngget.pic.o: png.h pngconf.h pngget.c
+pngread.o pngread.pic.o: png.h pngconf.h pngread.c
+pngrtran.o pngrtran.pic.o: png.h pngconf.h pngrtran.c
+pngrutil.o pngrutil.pic.o: png.h pngconf.h pngrutil.c
+pngtrans.o pngtrans.pic.o: png.h pngconf.h pngtrans.c
+pngwrite.o pngwrite.pic.o: png.h pngconf.h pngwrite.c
+pngwtran.o pngwtran.pic.o: png.h pngconf.h pngwtran.c
+pngwutil.o pngwutil.pic.o: png.h pngconf.h pngwutil.c
+pngpread.o pngpread.pic.o: png.h pngconf.h pngpread.c
+
+pngtest.o: png.h pngconf.h pngtest.c
+pngtest-stat.o: png.h pngconf.h pngtest.c
+
+
+
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index c3550d6..24c7332 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.9beta9
+SHLIB_MINOR= 1.2.9beta10
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 49c0dd6..9a28232 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.2.9beta9
+SHLIB_MINOR= 1.2.9beta10
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 eb13226..0a57697 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -7,7 +7,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.9beta9
+SHLIB_MINOR= 1.2.9beta10
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 30c8307..0114f6c 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -27,7 +27,7 @@
LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 1fa1fd7..c4e260a 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -19,7 +19,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
AR_RC=ar rc
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 6832665..c5bd816 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -5,7 +5,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
# Where make install puts libpng.a, libpng12.so, and libpng12/png.h
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 5cb5dc7..850ff71 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -37,7 +37,7 @@
LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 6bbf086..6fdb398 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -33,7 +33,7 @@
LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
PNGMAJ = 0
-PNGMIN = 1.2.9beta9
+PNGMIN = 1.2.9beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index f055386..3de06d1 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.2.9beta9
+; Version 1.2.9beta10
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index 0ace647..808f608 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.2.9beta9
+;Version 1.2.9beta10
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
