Imported from libpng-1.4.0beta4.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 713f597..51fa507 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.4.0beta3 - May 10, 2006
+Libpng 1.4.0beta4 - May 11, 2006
This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version.
@@ -9,32 +9,32 @@
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- 1.4.0beta3.tar.gz
- 1.4.0beta3.tar.bz2
+ 1.4.0beta4.tar.gz
+ 1.4.0beta4.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- 1.4.0beta3-no-config.tar.gz
- 1.4.0beta3-no-config.tar.bz2
+ 1.4.0beta4-no-config.tar.gz
+ 1.4.0beta4-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp140b03.zip
- lp140b03.tar.bz2
+ lp140b04.zip
+ lp140b04.tar.bz2
Project files
- 1.4.0beta3-project-netware.zip
- 1.4.0beta3-project-wince.zip
+ 1.4.0beta4-project-netware.zip
+ 1.4.0beta4-project-wince.zip
Other information:
- 1.4.0beta3-README.txt
- 1.4.0beta3-KNOWNBUGS.txt
- 1.4.0beta3-LICENSE.txt
- 1.4.0beta3-Y2K-compliance.txt
+ 1.4.0beta4-README.txt
+ 1.4.0beta4-KNOWNBUGS.txt
+ 1.4.0beta4-LICENSE.txt
+ 1.4.0beta4-Y2K-compliance.txt
Changes since the last public release (1.2.9):
@@ -94,14 +94,18 @@
Moved some leftover MMX-related defines from pngconf.h to pngintrn.h
Updated scripts/pngos2.def, pngw32.def, and projects/wince/png32ce.def
Updated scripts/pngw32.def to comment out MMX functions.
+
+version 1.4.0beta3 [May 10, 2006]
+ Updated scripts/pngw32.def to comment out MMX functions.
Added PNG_NO_GET_INT_32 and PNG_NO_SAVE_INT_32 macros.
Scripts/libpng.pc.in contained "configure" style version info and would
not work with makefiles.
Revised pngconf.h and added pngconf.h.in so makefiles and configure can
pass defines to libpng and applications.
-version 1.4.0beta3 [May 10, 2006]
- Updated scripts/pngw32.def to comment out MMX functions.
+version 1.4.0beta4 [May 11, 2006]
+ Revised configure.ac, Makefile.am, and many of the makefiles to write
+ their defines in pngconf.h.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index a2f47e5..af1e79d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1583,9 +1583,13 @@
Added PNG_NO_GET_INT_32 and PNG_NO_SAVE_INT_32 macros.
Scripts/libpng.pc.in contained "configure" style version info and would
not work with makefiles.
- Revised pngconf.h and added pngconf.h.in so makefiles and configure can
+ Revised pngconf.h and added pngconf.h.in, so makefiles and configure can
pass defines to libpng and applications.
+version 1.4.0beta4 [May 11, 2006]
+ Revised configure.ac, Makefile.am, and many of the makefiles to write
+ their defines in pngconf.h.
+
version 1.4.0betaN [future]
Cleaned up error and warning messages.
Implemented sTER chunk.
diff --git a/INSTALL b/INSTALL
index 9afe02e..f257aa8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.4.0beta3 - May 10, 2006
+Installing libpng version 1.4.0beta4 - May 11, 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.4.0beta3" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.4.0beta4" 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 libpng14.so.0.1.4.0beta3)
+ gcc, creates libpng14.so.0.1.4.0beta4)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.0.1.4.0beta3)
+ (gcc, creates libpng14.so.0.1.4.0beta4)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng14.so.0.1.4.0beta3,
+ (gcc, creates libpng14.so.0.1.4.0beta4,
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 libpng14.so.0.1.4.0beta3)
+ creates libpng14.so.0.1.4.0beta4)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng14.so.0.1.4.0beta3)
+ creates libpng14.so.0.1.4.0beta4)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng14.so.0.1.4.0beta3)
+ creates libpng14.so.0.1.4.0beta4)
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 7a74a57..7ea7b2c 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.4.0beta3
+Known bugs in libpng version 1.4.0beta4
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 e53ad7d..9e0a2eb 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.4.0beta3, May 10, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0beta4, May 11, 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
-May 10, 2006
+May 11, 2006
diff --git a/Makefile.am b/Makefile.am
index 165cd0b..62f498b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,6 +87,16 @@
CLEANFILES= pngout.png libpng14.pc libpng14-config libpng.vers libpng.sym
+pngconf.h.in:
+ cat pngconf.h > pngconf.h.in
+
+pngconf.h: pngconf.h.in
+ sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
+ @if test -n "@LIBPNG_NO_MMX@"; then \
+ echo "#define PNG_NO_MMX_CODE" >> pngconf.h \
+ fi
+ sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h
+
$(PNGLIB_BASENAME).pc: libpng.pc
cp libpng.pc $@
@@ -96,9 +106,10 @@
libpng.sym: png.h pngconf.h
rm -f $@ $@.new
$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \
- $(SED) -n -e 's|^.*PNG_FUNCTION_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \
- -e 's|^.*PNG_DATA_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \
- >$@.new
+ $(SED) -n -e \
+ 's|^.*PNG_FUNCTION_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \
+ -e 's|^.*PNG_DATA_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \
+ >$@.new
mv $@.new $@
libpng.vers: libpng.sym
diff --git a/Makefile.in b/Makefile.in
index 76f2a1a..270f320 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -182,6 +182,7 @@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBPNG_DEFINES = @LIBPNG_DEFINES@
+LIBPNG_NO_MMX = @LIBPNG_NO_MMX@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
@@ -1229,6 +1230,16 @@
@HAVE_LD_VERSION_SCRIPT_TRUE@ # Versioned symbols and restricted exports
@HAVE_LD_VERSION_SCRIPT_FALSE@ # Only restricted exports when possible
+pngconf.h.in:
+ cat pngconf.h > pngconf.h.in
+
+pngconf.h: pngconf.h.in
+ sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
+ @if test -n "@LIBPNG_NO_MMX@"; then \
+ echo "#define PNG_NO_MMX_CODE" >> pngconf.h \
+ fi
+ sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h
+
$(PNGLIB_BASENAME).pc: libpng.pc
cp libpng.pc $@
@@ -1238,9 +1249,10 @@
libpng.sym: png.h pngconf.h
rm -f $@ $@.new
$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \
- $(SED) -n -e 's|^.*PNG_FUNCTION_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \
- -e 's|^.*PNG_DATA_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \
- >$@.new
+ $(SED) -n -e \
+ 's|^.*PNG_FUNCTION_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \
+ -e 's|^.*PNG_DATA_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \
+ >$@.new
mv $@.new $@
libpng.vers: libpng.sym
diff --git a/README b/README
index 66a4385..b081caf 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.0beta3 - May 10, 2006 (shared library 14.0)
+README for libpng version 1.4.0beta4 - May 11, 2006 (shared library 14.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 libpng14.so.0.1.4.0beta3)
+ gcc, creates libpng14.so.0.1.4.0beta4)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.0.1.4.0beta3)
+ (gcc, creates libpng14.so.0.1.4.0beta4)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng14.so.0.1.4.0beta3,
+ (gcc, creates libpng14.so.0.1.4.0beta4,
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 libpng14.so.0.1.4.0beta3)
+ (gcc, creates libpng14.so.0.1.4.0beta4)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng14.so.0.1.4.0beta3)
+ (gcc, creates libpng14.so.0.1.4.0beta4)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng14.so.0.1.4.0beta3)
+ (gcc, creates libpng14.so.0.1.4.0beta4)
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 38e8fdd..8cd49e1 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- May 10, 2006
+ May 11, 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.4.0beta3 are Y2K compliant. It is my belief that earlier
+ upward through 1.4.0beta4 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 3619bc2..cf7ccb1 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.4.0beta3.
+# Generated by GNU Autoconf 2.59 for libpng 1.4.0beta4.
#
# 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.4.0beta3'
-PACKAGE_STRING='libpng 1.4.0beta3'
+PACKAGE_VERSION='1.4.0beta4'
+PACKAGE_STRING='libpng 1.4.0beta4'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
@@ -465,7 +465,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP CPP SED ac_ct_SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS POW_LIB LIBPNG_DEFINES HAVE_LD_VERSION_SCRIPT_TRUE HAVE_LD_VERSION_SCRIPT_FALSE PNGLIB_VERSION PNGLIB_MAJOR PNGLIB_MINOR pkgconfigdir binconfigs compatlib LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP CPP SED ac_ct_SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS POW_LIB LIBPNG_NO_MMX LIBPNG_DEFINES HAVE_LD_VERSION_SCRIPT_TRUE HAVE_LD_VERSION_SCRIPT_FALSE PNGLIB_VERSION PNGLIB_MAJOR PNGLIB_MINOR pkgconfigdir binconfigs compatlib LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -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.4.0beta3 to adapt to many kinds of systems.
+\`configure' configures libpng 1.4.0beta4 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.4.0beta3:";;
+ short | recursive ) echo "Configuration of libpng 1.4.0beta4:";;
esac
cat <<\_ACEOF
@@ -1167,7 +1167,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.4.0beta3
+libpng configure 1.4.0beta4
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.4.0beta3, which was
+It was created by libpng $as_me 1.4.0beta4, 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.4.0beta3'
+ VERSION='1.4.0beta4'
cat >>confdefs.h <<_ACEOF
@@ -1979,7 +1979,7 @@
-PNGLIB_VERSION=1.4.0beta3
+PNGLIB_VERSION=1.4.0beta4
PNGLIB_MAJOR=14
PNGLIB_MINOR=0
@@ -20180,24 +20180,26 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- LIBPNG_DEFINES=
+ LIBPNG_NO_MMX=
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG\ -DPNG_NO_MMX_CODE
+LIBPNG_NO_MMX=true
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-if test "$LIBPNG_DEFINES"; then
+if test "$LIBPNG_NO_MMX"; then
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
else
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
- LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
fi
+LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
+
+
echo "$as_me:$LINENO: checking if libraries can be versioned" >&5
echo $ECHO_N "checking if libraries can be versioned... $ECHO_C" >&6
GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
@@ -20681,7 +20683,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by libpng $as_me 1.4.0beta3, which was
+This file was extended by libpng $as_me 1.4.0beta4, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20744,7 +20746,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libpng config.status 1.4.0beta3
+libpng config.status 1.4.0beta4
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -21016,6 +21018,7 @@
s,@LIBTOOL@,$LIBTOOL,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@POW_LIB@,$POW_LIB,;t t
+s,@LIBPNG_NO_MMX@,$LIBPNG_NO_MMX,;t t
s,@LIBPNG_DEFINES@,$LIBPNG_DEFINES,;t t
s,@HAVE_LD_VERSION_SCRIPT_TRUE@,$HAVE_LD_VERSION_SCRIPT_TRUE,;t t
s,@HAVE_LD_VERSION_SCRIPT_FALSE@,$HAVE_LD_VERSION_SCRIPT_FALSE,;t t
diff --git a/configure.ac b/configure.ac
index 226387f..f7c4a39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@
dnl Version number stuff here:
-AC_INIT([libpng], [1.4.0beta3], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.4.0beta4], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.4.0beta3
+PNGLIB_VERSION=1.4.0beta4
PNGLIB_MAJOR=14
PNGLIB_MINOR=0
@@ -62,14 +62,16 @@
AC_TRY_COMPILE(
[#include "pnggccrd.c"],
[return 0;],
- LIBPNG_DEFINES=,
- LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG\ -DPNG_NO_MMX_CODE)
-if test "$LIBPNG_DEFINES"; then
+ LIBPNG_NO_MMX=,
+ LIBPNG_NO_MMX=true)
+if test "$LIBPNG_NO_MMX"; then
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
- LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
fi
+AC_SUBST(LIBPNG_NO_MMX)
+
+LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
AC_SUBST(LIBPNG_DEFINES)
AC_MSG_CHECKING([if libraries can be versioned])
diff --git a/libpng.3 b/libpng.3
index d1ecbaf..1084335 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,815 +1,404 @@
-.TH LIBPNG 3 "May 10, 2006"
+.TH LIBPNG 3 "May 11, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta3
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta4
.SH SYNOPSIS
-\fI\fB
-
-\fB#include <png.h>\fP
-
-\fI\fB
+\fB
+#include <png.h>\fP
\fBpng_uint_32 png_access_version_number \fI(void\fP\fB);\fP
-\fI\fB
-
\fBint png_check_sig (png_bytep \fP\fIsig\fP\fB, int \fInum\fP\fB);\fP
-\fI\fB
-
\fBvoid png_chunk_error (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fIerror\fP\fB);\fP
-\fI\fB
-
\fBvoid png_chunk_warning (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fImessage\fP\fB);\fP
-\fI\fB
-
\fBvoid png_convert_from_struct_tm (png_timep \fP\fIptime\fP\fB, struct tm FAR * \fIttime\fP\fB);\fP
-\fI\fB
-
\fBvoid png_convert_from_time_t (png_timep \fP\fIptime\fP\fB, time_t \fIttime\fP\fB);\fP
-\fI\fB
-
\fBpng_charp png_convert_to_rfc1123 (png_structp \fP\fIpng_ptr\fP\fB, png_timep \fIptime\fP\fB);\fP
-\fI\fB
-
\fBpng_infop png_create_info_struct (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_structp png_create_read_struct (png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fIwarn_fn\fP\fB);\fP
-\fI\fB
-
\fBpng_structp png_create_read_struct_2(png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fP\fIwarn_fn\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP
-\fI\fB
-
\fBpng_structp png_create_write_struct (png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fIwarn_fn\fP\fB);\fP
-\fI\fB
-
\fBpng_structp png_create_write_struct_2(png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fP\fIwarn_fn\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP
-\fI\fB
-
\fBint png_debug(int \fP\fIlevel\fP\fB, png_const_charp \fImessage\fP\fB);\fP
-\fI\fB
-
\fBint png_debug1(int \fP\fIlevel\fP\fB, png_const_charp \fP\fImessage\fP\fB, \fIp1\fP\fB);\fP
-\fI\fB
-
\fBint png_debug2(int \fP\fIlevel\fP\fB, png_const_charp \fP\fImessage\fP\fB, \fP\fIp1\fP\fB, \fIp2\fP\fB);\fP
-\fI\fB
-
\fBvoid png_destroy_info_struct (png_structp \fP\fIpng_ptr\fP\fB, png_infopp \fIinfo_ptr_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_destroy_read_struct (png_structpp \fP\fIpng_ptr_ptr\fP\fB, png_infopp \fP\fIinfo_ptr_ptr\fP\fB, png_infopp \fIend_info_ptr_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_destroy_write_struct (png_structpp \fP\fIpng_ptr_ptr\fP\fB, png_infopp \fIinfo_ptr_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_error (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fIerror\fP\fB);\fP
-\fI\fB
-
\fBvoid png_free (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fIptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_free_chunk_list (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_free_default(png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fIptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_free_data (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fInum\fP\fB);\fP
-\fI\fB
-
\fBpng_byte png_get_bit_depth (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_bKGD (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_16p \fI*background\fP\fB);\fP
-\fI\fB
-
\fBpng_byte png_get_channels (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fP\fI*white_x\fP\fB, double \fP\fI*white_y\fP\fB, double \fP\fI*red_x\fP\fB, double \fP\fI*red_y\fP\fB, double \fP\fI*green_x\fP\fB, double \fP\fI*green_y\fP\fB, double \fP\fI*blue_x\fP\fB, double \fI*blue_y\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_cHRM_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*white_x\fP\fB, png_uint_32 \fP\fI*white_y\fP\fB, png_uint_32 \fP\fI*red_x\fP\fB, png_uint_32 \fP\fI*red_y\fP\fB, png_uint_32 \fP\fI*green_x\fP\fB, png_uint_32 \fP\fI*green_y\fP\fB, png_uint_32 \fP\fI*blue_x\fP\fB, png_uint_32 \fI*blue_y\fP\fB);\fP
-\fI\fB
-
\fBpng_byte png_get_color_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_byte png_get_compression_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_byte png_get_copyright (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_voidp png_get_error_ptr (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_byte png_get_filter_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_gAMA (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fI*file_gamma\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_gAMA_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fI*int_file_gamma\fP\fB);\fP
-\fI\fB
-
\fBpng_byte png_get_header_ver (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_byte png_get_header_version (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_16p \fI*hist\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charpp \fP\fIname\fP\fB, int \fP\fI*compression_type\fP\fB, png_charpp \fP\fIprofile\fP\fB, png_uint_32 \fI*proflen\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*width\fP\fB, png_uint_32 \fP\fI*height\fP\fB, int \fP\fI*bit_depth\fP\fB, int \fP\fI*color_type\fP\fB, int \fP\fI*interlace_type\fP\fB, int \fP\fI*compression_type\fP\fB, int \fI*filter_type\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_image_height (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_image_width (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
-\fB#if \fI!defined(PNG_1_0_X)
-
-\fBpng_int_32 png_get_int_32 (png_bytep \fIbuf\fP\fB);\fP
-
-\fI\fB#endif
-
-\fI\fB
+\fB#if !defined(PNG_1_0_X) png_int_32 png_get_int_32 (png_bytep buf); \fI#endif
\fBpng_byte png_get_interlace_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_voidp png_get_io_ptr (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_byte png_get_libpng_ver (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_voidp png_get_mem_ptr(png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*offset_x\fP\fB, png_uint_32 \fP\fI*offset_y\fP\fB, int \fI*unit_type\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fI*purpose\fP\fB, png_int_32 \fP\fI*X0\fP\fB, png_int_32 \fP\fI*X1\fP\fB, int \fP\fI*type\fP\fB, int \fP\fI*nparams\fP\fB, png_charp \fP\fI*units\fP\fB, png_charpp \fI*params\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*res_x\fP\fB, png_uint_32 \fP\fI*res_y\fP\fB, int \fI*unit_type\fP\fB);\fP
-\fI\fB
-
\fBfloat png_get_pixel_aspect_ratio (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_pixels_per_meter (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_voidp png_get_progressive_ptr (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_colorp \fP\fI*palette\fP\fB, int \fI*num_palette\fP\fB);\fP
-\fI\fB
-
-\fBpng_byte png_get_rgb_to_gray_status (png_structp \fIpng_ptr)
-
-\fBpng_uint_32 png_get_rowbytes (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-
-\fI\fB
+\fBpng_byte png_get_rgb_to_gray_status (png_structp png_ptr) png_uint_32 png_get_rowbytes (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
\fBpng_bytepp png_get_rows (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_8p \fI*sig_bit\fP\fB);\fP
-\fI\fB
-
\fBpng_bytep png_get_signature (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_spalette_p \fI*splt_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_sRGB (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fI*intent\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_text (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_textp \fP\fI*text_ptr\fP\fB, int \fI*num_text\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_timep \fI*mod_time\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fI*trans\fP\fB, int \fP\fI*num_trans\fP\fB, png_color_16p \fI*trans_values\fP\fB);\fP
-\fI\fB
-
-\fB#if \fI!defined(PNG_1_0_X)
-
-\fBpng_uint_16 png_get_uint_16 (png_bytep \fIbuf\fP\fB);\fP
-
-\fI\fB
+\fB#if !defined(PNG_1_0_X) png_uint_16 png_get_uint_16 (png_bytep \fIbuf\fP\fB);\fP
\fBpng_uint_32 png_get_uint_31 (png_bytep \fIbuf\fP\fB);\fP
-\fI\fB
-
-\fBpng_uint_32 png_get_uint_32 (png_bytep \fIbuf\fP\fB);\fP
-
-\fI\fB#endif
-
-\fI\fB
+\fBpng_uint_32 png_get_uint_32 (png_bytep buf); \fI#endif
\fBpng_uint_32 png_get_unknown_chunks (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_unknown_chunkpp \fIunknowns\fP\fB);\fP
-\fI\fB
-
\fBpng_voidp png_get_user_chunk_ptr (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_user_height_max( png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_voidp png_get_user_transform_ptr (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_user_width_max (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_valid (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIflag\fP\fB);\fP
-\fI\fB
-
\fBpng_int_32 png_get_x_offset_microns (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_int_32 png_get_x_offset_pixels (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_x_pixels_per_meter (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_int_32 png_get_y_offset_microns (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_int_32 png_get_y_offset_pixels (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_y_pixels_per_meter (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_get_compression_buffer_size (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBint png_handle_as_unknown (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIchunk_name\fP\fB);\fP
-\fI\fB
-
\fBvoid png_init_io (png_structp \fP\fIpng_ptr\fP\fB, FILE \fI*fp\fP\fB);\fP
-\fI\fB
-
\fBDEPRECATED: void png_info_init (png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBDEPRECATED: void png_info_init_2 (png_infopp \fP\fIptr_ptr\fP\fB, png_size_t \fIpng_info_struct_size\fP\fB);\fP
-\fI\fB
-
\fBpng_voidp png_malloc (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
-\fI\fB
-
\fBpng_voidp png_malloc_default(png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
-\fI\fB
-
\fBvoidp png_memcpy (png_voidp \fP\fIs1\fP\fB, png_voidp \fP\fIs2\fP\fB, png_size_t \fIsize\fP\fB);\fP
-\fI\fB
-
\fBpng_voidp png_memcpy_check (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIs1\fP\fB, png_voidp \fP\fIs2\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
-\fI\fB
-
\fBvoidp png_memset (png_voidp \fP\fIs1\fP\fB, int \fP\fIvalue\fP\fB, png_size_t \fIsize\fP\fB);\fP
-\fI\fB
-
\fBpng_voidp png_memset_check (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIs1\fP\fB, int \fP\fIvalue\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
-\fI\fB
-
\fBDEPRECATED: void png_permit_empty_plte (png_structp \fP\fIpng_ptr\fP\fB, int \fIempty_plte_permitted\fP\fB);\fP
-\fI\fB
-
\fBvoid png_process_data (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_size\fP\fB);\fP
-\fI\fB
-
\fBvoid png_progressive_combine_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIold_row\fP\fB, png_bytep \fInew_row\fP\fB);\fP
-\fI\fB
-
\fBvoid png_read_destroy (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_infop \fIend_info_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_read_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_read_image (png_structp \fP\fIpng_ptr\fP\fB, png_bytepp \fIimage\fP\fB);\fP
-\fI\fB
-
\fBDEPRECATED: void png_read_init (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBDEPRECATED: void png_read_init_2 (png_structpp \fP\fIptr_ptr\fP\fB, png_const_charp \fP\fIuser_png_ver\fP\fB, png_size_t \fP\fIpng_struct_size\fP\fB, png_size_t \fIpng_info_size\fP\fB);\fP
-\fI\fB
-
\fBvoid png_read_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_read_png (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fItransforms\fP\fB, png_voidp \fIparams\fP\fB);\fP
-\fI\fB
-
\fBvoid png_read_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fIdisplay_row\fP\fB);\fP
-\fI\fB
-
\fBvoid png_read_rows (png_structp \fP\fIpng_ptr\fP\fB, png_bytepp \fP\fIrow\fP\fB, png_bytepp \fP\fIdisplay_row\fP\fB, png_uint_32 \fInum_rows\fP\fB);\fP
-\fI\fB
-
\fBvoid png_read_update_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
-\fB#if \fI!defined(PNG_1_0_X)
-
-\fBpng_save_int_32 (png_bytep \fP\fIbuf\fP\fB, png_int_32 \fIi\fP\fB);\fP
-
-\fI\fB
+\fB#if !defined(PNG_1_0_X) png_save_int_32 (png_bytep \fP\fIbuf\fP\fB, png_int_32 \fIi\fP\fB);\fP
\fBvoid png_save_uint_16 (png_bytep \fP\fIbuf\fP\fB, unsigned int \fIi\fP\fB);\fP
-\fI\fB
-
\fBvoid png_save_uint_32 (png_bytep \fP\fIbuf\fP\fB, png_uint_32 \fIi\fP\fB);\fP
-\fI\fB
-
-\fBvoid png_set_add_alpha (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIfiller\fP\fB, int \fIflags\fP\fB);\fP
-
-\fI\fB#endif
-
-\fI\fB
+\fBvoid png_set_add_alpha (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIfiller\fP\fB, int flags); \fI#endif
\fBvoid png_set_background (png_structp \fP\fIpng_ptr\fP\fB, png_color_16p \fP\fIbackground_color\fP\fB, int \fP\fIbackground_gamma_code\fP\fB, int \fP\fIneed_expand\fP\fB, double \fIbackground_gamma\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_bgr (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_bKGD (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_16p \fIbackground\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fP\fIwhite_x\fP\fB, double \fP\fIwhite_y\fP\fB, double \fP\fIred_x\fP\fB, double \fP\fIred_y\fP\fB, double \fP\fIgreen_x\fP\fB, double \fP\fIgreen_y\fP\fB, double \fP\fIblue_x\fP\fB, double \fIblue_y\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_cHRM_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fIwhite_x\fP\fB, png_uint_32 \fP\fIwhite_y\fP\fB, png_uint_32 \fP\fIred_x\fP\fB, png_uint_32 \fP\fIred_y\fP\fB, png_uint_32 \fP\fIgreen_x\fP\fB, png_uint_32 \fP\fIgreen_y\fP\fB, png_uint_32 \fP\fIblue_x\fP\fB, png_uint_32 \fIblue_y\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_compression_level (png_structp \fP\fIpng_ptr\fP\fB, int \fIlevel\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_compression_mem_level (png_structp \fP\fIpng_ptr\fP\fB, int \fImem_level\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_compression_method (png_structp \fP\fIpng_ptr\fP\fB, int \fImethod\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_compression_strategy (png_structp \fP\fIpng_ptr\fP\fB, int \fIstrategy\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_compression_window_bits (png_structp \fP\fIpng_ptr\fP\fB, int \fIwindow_bits\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_crc_action (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIcrit_action\fP\fB, int \fIancil_action\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_dither (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, int \fP\fInum_palette\fP\fB, int \fP\fImaximum_colors\fP\fB, png_uint_16p \fP\fIhistogram\fP\fB, int \fIfull_dither\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_error_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fIwarning_fn\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_expand (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_expand_gray_1_2_4_to_8(png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_filler (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIfiller\fP\fB, int \fIflags\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_filter (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fImethod\fP\fB, int \fIfilters\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_filter_heuristics (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIheuristic_method\fP\fB, int \fP\fInum_weights\fP\fB, png_doublep \fP\fIfilter_weights\fP\fB, png_doublep \fIfilter_costs\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_flush (png_structp \fP\fIpng_ptr\fP\fB, int \fInrows\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_gamma (png_structp \fP\fIpng_ptr\fP\fB, double \fP\fIscreen_gamma\fP\fB, double \fIdefault_file_gamma\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_gAMA (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fIfile_gamma\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_gAMA_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIfile_gamma\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_gray_1_2_4_to_8(png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_gray_to_rgb (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_16p \fIhist\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fIname\fP\fB, int \fP\fIcompression_type\fP\fB, png_charp \fP\fIprofile\fP\fB, png_uint_32 \fIproflen\fP\fB);\fP
-\fI\fB
-
\fBint png_set_interlace_handling (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_invalid (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fImask\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_invert_alpha (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_invert_mono (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fIwidth\fP\fB, png_uint_32 \fP\fIheight\fP\fB, int \fP\fIbit_depth\fP\fB, int \fP\fIcolor_type\fP\fB, int \fP\fIinterlace_type\fP\fB, int \fP\fIcompression_type\fP\fB, int \fIfilter_type\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_keep_unknown_chunks (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIkeep\fP\fB, png_bytep \fP\fIchunk_list\fP\fB, int \fInum_chunks\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_mem_fn(png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fIoffset_x\fP\fB, png_uint_32 \fP\fIoffset_y\fP\fB, int \fIunit_type\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_packing (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_packswap (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_palette_to_rgb(png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fIpurpose\fP\fB, png_int_32 \fP\fIX0\fP\fB, png_int_32 \fP\fIX1\fP\fB, int \fP\fItype\fP\fB, int \fP\fInparams\fP\fB, png_charp \fP\fIunits\fP\fB, png_charpp \fIparams\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fIres_x\fP\fB, png_uint_32 \fP\fIres_y\fP\fB, int \fIunit_type\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_progressive_read_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIprogressive_ptr\fP\fB, png_progressive_info_ptr \fP\fIinfo_fn\fP\fB, png_progressive_row_ptr \fP\fIrow_fn\fP\fB, png_progressive_end_ptr \fIend_fn\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, int \fInum_palette\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_read_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIio_ptr\fP\fB, png_rw_ptr \fIread_data_fn\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_read_status_fn (png_structp \fP\fIpng_ptr\fP\fB, png_read_status_ptr \fIread_row_fn\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_read_user_transform_fn (png_structp \fP\fIpng_ptr\fP\fB, png_user_transform_ptr \fIread_user_transform_fn\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_rgb_to_gray (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIerror_action\fP\fB, double \fP\fIred\fP\fB, double \fIgreen\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_rgb_to_gray_fixed (png_structp \fP\fIpng_ptr\fP\fB, int error_action png_fixed_point \fP\fIred\fP\fB, png_fixed_point \fIgreen\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_rows (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytepp \fIrow_pointers\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_8p \fIsig_bit\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fIunit\fP\fB, double \fP\fIwidth\fP\fB, double \fIheight\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_shift (png_structp \fP\fIpng_ptr\fP\fB, png_color_8p \fItrue_bits\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_sig_bytes (png_structp \fP\fIpng_ptr\fP\fB, int \fInum_bytes\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_spalette_p \fP\fIsplt_ptr\fP\fB, int \fInum_spalettes\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_sRGB (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fIintent\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_sRGB_gAMA_and_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fIintent\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_strip_16 (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_strip_alpha (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_swap (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_swap_alpha (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_text (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_textp \fP\fItext_ptr\fP\fB, int \fInum_text\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_timep \fImod_time\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fItrans\fP\fB, int \fP\fInum_trans\fP\fB, png_color_16p \fItrans_values\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_tRNS_to_alpha(png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBpng_uint_32 png_set_unknown_chunks (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_unknown_chunkp \fP\fIunknowns\fP\fB, int \fP\fInum\fP\fB, int \fIlocation\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_unknown_chunk_location(png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fIchunk\fP\fB, int \fIlocation\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_read_user_chunk_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIuser_chunk_ptr\fP\fB, png_user_chunk_ptr \fIread_user_chunk_fn\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_user_limits (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIuser_width_max\fP\fB, png_uint_32 \fIuser_height_max\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_user_transform_info (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIuser_transform_ptr\fP\fB, int \fP\fIuser_transform_depth\fP\fB, int \fIuser_transform_channels\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_write_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIio_ptr\fP\fB, png_rw_ptr \fP\fIwrite_data_fn\fP\fB, png_flush_ptr \fIoutput_flush_fn\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_write_status_fn (png_structp \fP\fIpng_ptr\fP\fB, png_write_status_ptr \fIwrite_row_fn\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_write_user_transform_fn (png_structp \fP\fIpng_ptr\fP\fB, png_user_transform_ptr \fIwrite_user_transform_fn\fP\fB);\fP
-\fI\fB
-
\fBvoid png_set_compression_buffer_size(png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
-\fI\fB
-
\fBint png_sig_cmp (png_bytep \fP\fIsig\fP\fB, png_size_t \fP\fIstart\fP\fB, png_size_t \fInum_to_check\fP\fB);\fP
-\fI\fB
-
\fBvoid png_start_read_image (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_warning (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fImessage\fP\fB);\fP
-\fI\fB
-
\fBvoid png_write_chunk (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIchunk_name\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
-\fI\fB
-
\fBvoid png_write_chunk_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
-\fI\fB
-
\fBvoid png_write_chunk_end (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_write_chunk_start (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIchunk_name\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
\fBvoid png_write_destroy (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_write_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_write_flush (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_write_image (png_structp \fP\fIpng_ptr\fP\fB, png_bytepp \fIimage\fP\fB);\fP
-\fI\fB
-
\fBDEPRECATED: void png_write_init (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
\fBDEPRECATED: void png_write_init_2 (png_structpp \fP\fIptr_ptr\fP\fB, png_const_charp \fP\fIuser_png_ver\fP\fB, png_size_t \fP\fIpng_struct_size\fP\fB, png_size_t \fIpng_info_size\fP\fB);\fP
-\fI\fB
-
\fBvoid png_write_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_write_info_before_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
\fBvoid png_write_png (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fItransforms\fP\fB, png_voidp \fIparams\fP\fB);\fP
-\fI\fB
-
\fBvoid png_write_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIrow\fP\fB);\fP
-\fI\fB
-
\fBvoid png_write_rows (png_structp \fP\fIpng_ptr\fP\fB, png_bytepp \fP\fIrow\fP\fB, png_uint_32 \fInum_rows\fP\fB);\fP
-\fI\fB
-
\fBvoidpf png_zalloc (voidpf \fP\fIpng_ptr\fP\fB, uInt \fP\fIitems\fP\fB, uInt \fIsize\fP\fB);\fP
-\fI\fB
-
\fBvoid png_zfree (voidpf \fP\fIpng_ptr\fP\fB, voidpf \fIptr\fP\fB);\fP
-\fI\fB
-
.SH DESCRIPTION
The
.I libpng
@@ -821,7 +410,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.0beta3 - May 10, 2006
+ libpng version 1.4.0beta4 - May 11, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -3736,13 +3325,13 @@
.SH IX. Y2K Compliance in libpng
-May 10, 2006
+May 11, 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.4.0beta3 are Y2K compliant. It is my belief that earlier
+upward through 1.4.0beta4 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
@@ -3902,7 +3491,7 @@
1.2.10beta1-7 13 10210 12.so.0.10[.0]
1.2.10rc1-2 13 10210 12.so.0.10[.0]
1.2.10 13 10210 12.so.0.10[.0]
- 1.4.0beta1-3 14 10400 14.so.0.0[.0]
+ 1.4.0beta1-4 14 10400 14.so.0.0[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3958,7 +3547,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.4.0beta3 - May 10, 2006:
+Libpng version 1.4.0beta4 - May 11, 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).
@@ -3979,7 +3568,7 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.4.0beta3, May 10, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0beta4, May 11, 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
@@ -4078,7 +3667,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-May 10, 2006
+May 11, 2006
.\" end of man page
diff --git a/libpng.txt b/libpng.txt
index 525ec06..70f7b8c 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.4.0beta3 - May 10, 2006
+ libpng version 1.4.0beta4 - May 11, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -2915,13 +2915,13 @@
IX. Y2K Compliance in libpng
-May 10, 2006
+May 11, 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.4.0beta3 are Y2K compliant. It is my belief that earlier
+upward through 1.4.0beta4 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 c39a87b..506b0b0 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,776 +1,266 @@
-.TH LIBPNGPF 3 "May 10, 2006"
+.TH LIBPNGPF 3 "May 11, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta3
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta4
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_build_gamma_table (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_build_grayscale_palette (int \fP\fIbit_depth\fP\fB, png_colorp \fIpalette\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_calculate_crc (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIptr\fP\fB, png_size_t \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_check_chunk_name (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIchunk_name\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBpng_size_t png_check_keyword (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charpp \fInew_key\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_combine_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fImask\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_correct_palette (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, int \fInum_palette\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBint png_crc_error (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBint png_crc_finish (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIskip\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_crc_read (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuf\fP\fB, png_size_t \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBpng_voidp png_create_struct (int \fItype\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBpng_voidp png_create_struct_2 (int \fP\fItype\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_voidp \fImem_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBpng_charp png_decompress_chunk (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIcomp_type\fP\fB, png_charp \fP\fIchunkdata\fP\fB, png_size_t \fP\fIchunklength\fP\fB, png_size_t \fP\fIprefix_length\fP\fB, png_size_t \fI*data_length\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_destroy_struct (png_voidp \fIstruct_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_destroy_struct_2 (png_voidp \fP\fIstruct_ptr\fP\fB, png_free_ptr \fP\fIfree_fn\fP\fB, png_voidp \fImem_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_background (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_16p \fP\fItrans_values\fP\fB, png_color_16p \fP\fIbackground\fP\fB, png_color_16p \fP\fIbackground_1\fP\fB, png_bytep \fP\fIgamma_table\fP\fB, png_bytep \fP\fIgamma_from_1\fP\fB, png_bytep \fP\fIgamma_to_1\fP\fB, png_uint_16pp \fP\fIgamma_16\fP\fB, png_uint_16pp \fP\fIgamma_16_from_1\fP\fB, png_uint_16pp \fP\fIgamma_16_to_1\fP\fB, int \fIgamma_shift\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_bgr (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_chop (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_dither (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIpalette_lookup\fP\fB, png_bytep \fIdither_lookup\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_expand (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_16p \fItrans_value\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_expand_palette (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_colorp \fP\fIpalette\fP\fB, png_bytep \fP\fItrans\fP\fB, int \fInum_trans\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_gamma (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIgamma_table\fP\fB, png_uint_16pp \fP\fIgamma_16_table\fP\fB, int \fIgamma_shift\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_gray_to_rgb (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_invert (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_pack (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fIbit_depth\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_packswap (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_read_filler (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fP\fIfiller\fP\fB, png_uint_32 \fIflags\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_read_interlace (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fP\fIpass\fP\fB, png_uint_32 \fItransformations\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_read_invert_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_read_swap_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_read_transformations (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBint png_do_rgb_to_gray (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_shift (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_8p \fIbit_depth\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_strip_filler (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fIflags\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_swap (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_unpack (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_unshift (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_8p \fIsig_bits\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_write_interlace (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fIpass\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_write_invert_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_write_swap_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_do_write_transformations (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid *png_far_to_near (png_structp png_ptr,png_voidp \fP\fIptr\fP\fB, int \fIcheck\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_flush (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_bKGD (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_gAMA (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_IEND (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_iTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_sRGB (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_unknown (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_handle_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_info_destroy (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_init_mmx_flags (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_init_read_transformations (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_process_IDAT_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_length\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_process_some_data (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_check_crc (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_crc_finish (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_crc_skip (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_fill_buffer (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_handle_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_handle_unknown (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_handle_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_have_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_have_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_have_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIrow\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_process_row (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_read_chunk (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_read_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_read_IDAT (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_read_sig (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_read_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_read_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_restore_buffer (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_length\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_push_save_buffer (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_read_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_read_filter_row (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIprev_row\fP\fB, int \fIfilter\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_read_finish_row (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_read_push_finish_row (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_read_start_row (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_read_transform_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_reset_crc (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBint png_set_text_2 (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_textp \fP\fItext_ptr\fP\fB, int \fInum_text\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_cHRM (png_structp \fP\fIpng_ptr\fP\fB, double \fP\fIwhite_x\fP\fB, double \fP\fIwhite_y\fP\fB, double \fP\fIred_x\fP\fB, double \fP\fIred_y\fP\fB, double \fP\fIgreen_x\fP\fB, double \fP\fIgreen_y\fP\fB, double \fP\fIblue_x\fP\fB, double \fIblue_y\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_cHRM_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIwhite_x\fP\fB, png_uint_32 \fP\fIwhite_y\fP\fB, png_uint_32 \fP\fIred_x\fP\fB, png_uint_32 \fP\fIred_y\fP\fB, png_uint_32 \fP\fIgreen_x\fP\fB, png_uint_32 \fP\fIgreen_y\fP\fB, png_uint_32 \fP\fIblue_x\fP\fB, png_uint_32 \fIblue_y\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_filtered_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIfiltered_row\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_find_filter (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fIrow_info\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_finish_row (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_gAMA (png_structp \fP\fIpng_ptr\fP\fB, double \fIfile_gamma\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_gAMA_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIint_file_gamma\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_uint_16p \fP\fIhist\fP\fB, int \fInum_hist\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIname\fP\fB, int \fP\fIcompression_type\fP\fB, png_charp \fP\fIprofile\fP\fB, int \fIproflen\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_IDAT (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_IEND (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIwidth\fP\fB, png_uint_32 \fP\fIheight\fP\fB, int \fP\fIbit_depth\fP\fB, int \fP\fIcolor_type\fP\fB, int \fP\fIcompression_type\fP\fB, int \fP\fIfilter_type\fP\fB, int \fIinterlace_type\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_iTXt (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIcompression\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fIlang\fP\fB, png_charp \fP\fItranslated_key\fP\fB, png_charp \fItext\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIx_offset\fP\fB, png_uint_32 \fP\fIy_offset\fP\fB, int \fIunit_type\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIpurpose\fP\fB, png_int_32 \fP\fIX0\fP\fB, png_int_32 \fP\fIX1\fP\fB, int \fP\fItype\fP\fB, int \fP\fInparams\fP\fB, png_charp \fP\fIunits\fP\fB, png_charpp \fIparams\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIx_pixels_per_unit\fP\fB, png_uint_32 \fP\fIy_pixels_per_unit\fP\fB, int \fIunit_type\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, png_uint_32 \fInum_pal\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_color_8p \fP\fIsbit\fP\fB, int \fIcolor_type\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIunit\fP\fB, double \fP\fIwidth\fP\fB, double \fIheight\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_sCAL_s (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIunit\fP\fB, png_charp \fP\fIwidth\fP\fB, png_charp \fIheight\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_sig (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_sRGB (png_structp \fP\fIpng_ptr\fP\fB, int \fIintent\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_spalette_p \fIpalette\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_start_row (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fItext\fP\fB, png_size_t \fItext_len\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_timep \fImod_time\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fItrans\fP\fB, png_color_16p \fP\fIvalues\fP\fB, int \fP\fInumber\fP\fB, int \fIcolor_type\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_write_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fItext\fP\fB, png_size_t \fP\fItext_len\fP\fB, int \fIcompression\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoidpf png_zalloc (voidpf \fP\fIpng_ptr\fP\fB, uInt \fP\fIitems\fP\fB, uInt \fIsize\fP\fB);\fP
-\fI\fB
-
-\fI\fB
-
\fBvoid png_zfree (voidpf \fP\fIpng_ptr\fP\fB, voidpf \fIptr\fP\fB);\fP
\fI\fB
-\fI\fB
-
.SH DESCRIPTION
The functions listed above are used privately by libpng
and are not recommended for use by applications. They are
diff --git a/png.5 b/png.5
index 94e8473..ea26d02 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "May 10, 2006"
+.TH PNG 5 "May 11, 2006"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 88a646a..d36b5cb 100644
--- a/png.c
+++ b/png.c
@@ -13,7 +13,7 @@
#include "pngintrn.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_0beta3 Your_png_h_is_not_version_1_4_0beta3;
+typedef version_1_4_0beta4 Your_png_h_is_not_version_1_4_0beta4;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@@ -637,7 +637,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.4.0beta3 - May 10, 2006\n\
+ return ((png_charp) "\n libpng version 1.4.0beta4 - May 11, 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 b02e15d..e778900 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.4.0beta3 - May 10, 2006
+ * libpng version 1.4.0beta4 - May 11, 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.4.0beta3 - May 10, 2006: Glenn
+ * libpng versions 0.97, January 1998, through 1.4.0beta4 - May 11, 2006: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -119,7 +119,7 @@
* 1.2.10beta1-7 13 10210 12.so.0.10[.0]
* 1.2.10rc1-2 13 10210 12.so.0.10[.0]
* 1.2.10 13 10210 12.so.0.10[.0]
- * 1.4.0beta1-3 14 10400 14.so.0.0[.0]
+ * 1.4.0beta1-4 14 10400 14.so.0.0[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -149,7 +149,7 @@
* If you modify libpng you may insert additional notices immediately following
* this sentence.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta3, May 10, 2006, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta4, May 11, 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:
@@ -261,13 +261,13 @@
* Y2K compliance in libpng:
* =========================
*
- * May 10, 2006
+ * May 11, 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.4.0beta3 are Y2K compliant. It is my belief that earlier
+ * upward through 1.4.0beta4 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
@@ -323,9 +323,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.4.0beta3"
+#define PNG_LIBPNG_VER_STRING "1.4.0beta4"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.4.0beta3 - May 10, 2006 (header)\n"
+ " libpng version 1.4.0beta4 - May 11, 2006 (header)\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 14
@@ -337,7 +337,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 3
+#define PNG_LIBPNG_VER_BUILD 4
/* 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_4_0beta3;
+typedef png_structp version_1_4_0beta4;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index 5f757de..2724379 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.4.0beta3 - May 10, 2006
+ * libpng version 1.4.0beta4 - May 11, 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/pngintrn.h b/pngintrn.h
index 0bf13d0..01e8b72 100644
--- a/pngintrn.h
+++ b/pngintrn.h
@@ -1,7 +1,7 @@
/* pngintrn.h - internal header file for libpng
*
- * libpng version 1.4.0beta3 - May 10, 2006
+ * libpng version 1.4.0beta4 - May 11, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2005 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngtest.c b/pngtest.c
index 84548ee..ce4bd42 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1483,4 +1483,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_0beta3 your_png_h_is_not_version_1_4_0beta3;
+typedef version_1_4_0beta4 your_png_h_is_not_version_1_4_0beta4;
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index d1372be..1e84fc5 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.4.0beta3
+version=1.4.0beta4
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index d9a2d43..6ad0db7 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.4.0beta3
+Version: 1.4.0beta4
Libs: -L${libdir} -lpng14
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 1182e32..1073068 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 3779679..d537a6d 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index d79192b..4eee22a 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@
LIBNAME=libpng14
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
@@ -56,7 +56,8 @@
# Variables
OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \
- pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
+ pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O) \
+ pnggccrd$(O)
# Targets
all: $(LIBNAME)$(A) pngtest$(E)
@@ -96,6 +97,7 @@
png$(O): png.h pngconf.h pngintrn.h
pngerror$(O): png.h pngconf.h pngintrn.h
+pnggccrd$(O): png.h pngconf.h pngintrn.h
pngget$(O): png.h pngconf.h pngintrn.h
pngmem$(O): png.h pngconf.h pngintrn.h
pngpread$(O): png.h pngconf.h pngintrn.h
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 0526cb2..37f2b9c 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 7f116aa..961e43c 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -31,10 +31,6 @@
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
ifdef MINGW
MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw
@@ -62,17 +58,6 @@
-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
@@ -80,7 +65,7 @@
LIBNAME = libpng14
PNGMAJ = 0
CYGDLL = 14
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
@@ -129,6 +114,20 @@
all: all-static all-shared libpng.pc libpng-config libpng.pc libpng-config
+pngconf.h.in:
+ cat pngconf.h > pngconf.h.in
+
+pngconf.h: pngconf.h.in
+ sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
+
+ /* if you don't want to use the intel MMX code, uncomment this */
+ # echo "#define PNG_NO_MMX_CODE" >> pngconf.h
+
+ /* if you don't need thread safety you can uncomment this */
+ # echo "#define PNG_THREAD_UNSAFE_OK" >> pngconf.h
+
+ sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h
+
# Make this to verify that "make [...] install" will do what you want.
buildsetup-tell:
@echo VPATH is set to: \"$(VPATH)\"
@@ -299,6 +298,7 @@
pngwio.o pngwio.pic.o: png.h pngconf.h pngintrn.h pngwio.c
pngmem.o pngmem.pic.o: png.h pngconf.h pngintrn.h pngmem.c
pngset.o pngset.pic.o: png.h pngconf.h pngintrn.h pngset.c
+pnggccrd.o pnggccrd.pic.o: png.h pngconf.h pngintrn.h pngget.c
pngget.o pngget.pic.o: png.h pngconf.h pngintrn.h pngget.c
pngread.o pngread.pic.o: png.h pngconf.h pngintrn.h pngread.c
pngrtran.o pngrtran.pic.o: png.h pngconf.h pngintrn.h pngrtran.c
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 38d79c8..91491f7 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index c7cc772..8c9403a 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14
diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2
index e259412..6dc9d4a 100644
--- a/scripts/makefile.dj2
+++ b/scripts/makefile.dj2
@@ -1,4 +1,5 @@
# DJGPP (DOS gcc) makefile for libpng
+# Copyright (C) 2006 Glenn Randers-Pehrson
# Copyright (C) 2002 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# For conditions of distribution and use, see copyright notice in png.h
@@ -42,6 +43,7 @@
pngwio.o: png.h pngconf.h pngintrn.h
pngmem.o: png.h pngconf.h pngintrn.h
pngset.o: png.h pngconf.h pngintrn.h
+pnggccrd.o: png.h pngconf.h pngintrn.h
pngget.o: png.h pngconf.h pngintrn.h
pngread.o: png.h pngconf.h pngintrn.h
pngpread.o: png.h pngconf.h pngintrn.h
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index 8dee43b..974083a 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd
index 508cc21..f7ce581 100644
--- a/scripts/makefile.freebsd
+++ b/scripts/makefile.freebsd
@@ -1,5 +1,5 @@
# makefile for libpng under FreeBSD
-# Copyright (C) 2002 Glenn Randers-Pehrson and Andrey A. Chernov
+# Copyright (C) 2002, 2006 Glenn Randers-Pehrson and Andrey A. Chernov
# For conditions of distribution and use, see copyright notice in png.h
PREFIX?= /usr/local
@@ -24,10 +24,19 @@
LDADD+= -lm -lz
DPADD+= ${LIBM} ${LIBZ}
-CFLAGS+= -I. -DPNG_USE_PNGGCCRD
+pngconf.h.in:
+ cat pngconf.h > pngconf.h.in
+
+pngconf.h: pngconf.h.in
+ sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
.if (${MACHINE_ARCH} != "i386")
-CFLAGS+= -DPNG_NO_MMX_CODE
+ /* uncoment this if you don't need thread safety */
+ # echo "#define PNG_THREAD_UNSAFE_OK" >> pngconf.h
+.else
+ echo "#define PNG_NO_MMX_CODE" >> pngconf.h
.endif
+ sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h
+
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc
index f0eb739..3f26cc8 100644
--- a/scripts/makefile.gcc
+++ b/scripts/makefile.gcc
@@ -1,4 +1,5 @@
# makefile for libpng using gcc (generic, static library)
+# Copyright (C) 2006 Glenn Randers-Pehrson
# Copyright (C) 2000 Cosmin Truta
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# For conditions of distribution and use, see copyright notice in png.h
@@ -49,6 +50,7 @@
png$(O): png.h pngconf.h pngintrn.h
pngerror$(O): png.h pngconf.h pngintrn.h
+pnggccrd$(O): png.h pngconf.h pngintrn.h
pngget$(O): png.h pngconf.h pngintrn.h
pngmem$(O): png.h pngconf.h pngintrn.h
pngpread$(O): png.h pngconf.h pngintrn.h
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index e52a266..8a801b5 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 9cb67e8..650af76 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -1,5 +1,5 @@
# makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product.
-# Copyright (C) 1999-2002 Glenn Randers-Pehrson
+# Copyright (C) 1999-2002, 2006 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42
# contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
# For conditions of distribution and use, see copyright notice in png.h
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index aef3981..9546f72 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index c8dfccb..c1195d9 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc
index e9a9f31..48ebb5f 100644
--- a/scripts/makefile.ibmc
+++ b/scripts/makefile.ibmc
@@ -1,5 +1,6 @@
# Makefile for libpng (static)
# IBM C version 3.x for Win32 and OS/2
+# Copyright (C) 2006 Glenn Randers-Pehrson
# Copyright (C) 2000 Cosmin Truta
# For conditions of distribution and use, see copyright notice in png.h
# Notes:
@@ -55,6 +56,7 @@
png$(O): png.h pngconf.h pngintrn.h
pngerror$(O): png.h pngconf.h pngintrn.h
+pnggccrd$(O): png.h pngconf.h pngintrn.h
pngget$(O): png.h pngconf.h pngintrn.h
pngmem$(O): png.h pngconf.h pngintrn.h
pngpread$(O): png.h pngconf.h pngintrn.h
diff --git a/scripts/makefile.intel b/scripts/makefile.intel
index 7f3d146..b27a2bd 100644
--- a/scripts/makefile.intel
+++ b/scripts/makefile.intel
@@ -1,6 +1,7 @@
# Makefile for libpng
# Microsoft Visual C++ with Intel C/C++ Compiler 4.0 and later
+# Copyright (C) 2006 Glenn Randers-Pehrson
# Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is
# copyright 1995 Guy Eric Schalnat, Group 42, Inc.
# For conditions of distribution and use, see copyright notice in png.h
@@ -13,8 +14,6 @@
# Caution: the assembler code was introduced at libpng version 1.0.4 and has
# not yet been thoroughly tested.
-# Use assembler code
-ASMCODE=-DPNG_USE_PNGVCRD
# Where the zlib library and include files are located
ZLIBLIB=..\zlib
@@ -36,7 +35,7 @@
CC=icl -c
-CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) $(ASMCODE) -nologo
+CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) -nologo
LD=link
LDFLAGS=/SUBSYSTEM:CONSOLE /NOLOGO
@@ -49,6 +48,16 @@
all: test
+pngconf.h.in:
+ cat pngconf.h > pngconf.h.in
+
+# Remove the line with #define PNG_THREAD_UNSAFE_OK if you need thread safety
+### for generic gcc:
+pngconf.h: pngconf.h.in
+ sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
+ echo "#define PNG_USE_PNGVCRD" >> pngconf.h
+ sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h
+
png$(O): png.h pngconf.h pngintrn.h
$(CC) $(CFLAGS) $*.c $(ERRFILE)
diff --git a/scripts/makefile.knr b/scripts/makefile.knr
index c25f308..f7e53cd 100644
--- a/scripts/makefile.knr
+++ b/scripts/makefile.knr
@@ -1,5 +1,5 @@
# makefile for libpng
-# Copyright (C) 2002 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# For conditions of distribution and use, see copyright notice in png.h
@@ -87,6 +87,7 @@
pngwio.o: png.h pngconf.h pntintrn.h
pngmem.o: png.h pngconf.h pntintrn.h
pngset.o: png.h pngconf.h pntintrn.h
+pnggccrd.o: png.h pngconf.h pntintrn.h
pngget.o: png.h pngconf.h pntintrn.h
pngread.o: png.h pngconf.h pntintrn.h
pngpread.o: png.h pngconf.h pntintrn.h
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 89f17ca..3e7407d 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index 34517ad..8ec3597 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -58,17 +58,7 @@
-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
+### Normal compilation
CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
-Wall -O3 $(ALIGN) -funroll-loops \
-fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
@@ -76,7 +66,7 @@
LIBNAME = libpng14
PNGMAJ = 0
MINGDLL = 14
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
@@ -111,7 +101,7 @@
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
+ pngwtran.o pngmem.o pngerror.o pngpread.o pnggccrd.o
OBJSDLL = $(OBJS:.o=.pic.o)
@@ -125,6 +115,20 @@
all: all-static all-shared libpng.pc libpng-config libpng.pc libpng-config
+pngconf.h.in:
+ cat pngconf.h > pngconf.h.in
+
+pngconf.h: pngconf.h.in
+ sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
+
+ /* if you don't want to use the intel MMX code, uncomment this */
+ # echo "#define PNG_NO_MMX_CODE" >> pngconf.h
+
+ /* if you don't need thread safety you can uncomment this */
+ # echo "#define PNG_THREAD_UNSAFE_OK" >> pngconf.h
+
+ sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h
+
# Make this to verify that "make [...] install" will do what you want.
buildsetup-tell:
@echo VPATH is set to: \"$(VPATH)\"
@@ -295,6 +299,7 @@
pngwio.o pngwio.pic.o: png.h pngconf.h pngintrn.h pngwio.c
pngmem.o pngmem.pic.o: png.h pngconf.h pngintrn.h pngmem.c
pngset.o pngset.pic.o: png.h pngconf.h pngintrn.h pngset.c
+pnggcrd.o pnggcrd.pic.o: png.h pngconf.h pngintrn.h pngget.c
pngget.o pngget.pic.o: png.h pngconf.h pngintrn.h pngget.c
pngread.o pngread.pic.o: png.h pngconf.h pngintrn.h pngread.c
pngrtran.o pngrtran.pic.o: png.h pngconf.h pngintrn.h pngrtran.c
diff --git a/scripts/makefile.msc b/scripts/makefile.msc
index e47d5a6..e739ba0 100644
--- a/scripts/makefile.msc
+++ b/scripts/makefile.msc
@@ -1,4 +1,5 @@
# makefile for libpng
+# Copyright (C) 2006 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# For conditions of distribution and use, see copyright notice in png.h
# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
@@ -28,6 +29,9 @@
pngset$(O): png.h pngconf.h pngintrn.h
$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
+pnggccrd$(O): png.h pngconf.h pngintrn.h
+ $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
+
pngget$(O): png.h pngconf.h pngintrn.h
$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index cbee1d4..ccacacf 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -1,6 +1,7 @@
# makefile for libpng for NetBSD for the standard
# make obj && make depend && make && make test
# make includes && make install
+# Copyright (C) 2006 Glenn Randers-Pehrson
# Copyright (C) 2002 Patrick R.L. Welche
# For conditions of distribution and use, see copyright notice in png.h
@@ -13,25 +14,41 @@
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.0beta3
+SHLIB_MINOR= 1.4.0beta4
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
INCS= png.h pngconf.h
MAN= libpng.3 libpngpf.3 png.5
-CPPFLAGS+=-I${.CURDIR} -DPNG_USE_PNGGCCRD
-
-# something like this for mmx assembler, but it core dumps for me at the moment
-# .if ${MACHINE_ARCH} == "i386"
-# CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK
-# MKLINT= no
-# .else
- CPPFLAGS+=-DPNG_NO_MMX_CODE
-# .endif
+CPPFLAGS+=-I${.CURDIR}
CLEANFILES+=pngtest.o pngtest
+pngconf.h.in:
+ cat pngconf.h > pngconf.h.in
+
+pngconf.h: pngconf.h.in
+ sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
+
+ /* if you don't want to use the intel MMX code, uncomment this */
+ # echo "#define PNG_NO_MMX_CODE" >> pngconf.h
+
+ /* if you don't need thread safety you can uncomment this */
+ # echo "#define PNG_THREAD_UNSAFE_OK" >> pngconf.h
+
+# We should be able to do something like this instead of the manual
+# uncommenting, but it core dumps for me at the moment:
+# .if ${MACHINE_ARCH} == "i386"
+# echo "#define PNG_THREAD_UNSAFE_OK" >> pngconf.h
+# MKLINT= no
+# .else
+# echo "#define PNG_NO_MMX_CODE" >> pngconf.h
+# .endif
+
+ sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h
+
+
pngtest.o: pngtest.c
${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index c191cfb..d1f1fa7 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,25 +13,40 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.4.0beta3
+SHLIB_MINOR= 1.4.0beta4
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
INCS= png.h pngconf.h
MAN= libpng.3 libpngpf.3 png.5
-CPPFLAGS+=-I${.CURDIR} -DPNG_USE_PNGGCCRD
-
-# something like this for mmx assembler, but it core dumps for me at the moment
-# .if ${MACHINE_ARCH} == "i386"
-# CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK
-# MKLINT= no
-# .else
- CPPFLAGS+=-DPNG_NO_MMX_CODE
-# .endif
+CPPFLAGS+=-I${.CURDIR}
CLEANFILES+=pngtest.o pngtest
+pngconf.h.in:
+ cat pngconf.h > pngconf.h.in
+
+pngconf.h: pngconf.h.in
+ sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
+
+ /* if you don't want to use the intel MMX code, uncomment this */
+ # echo "#define PNG_NO_MMX_CODE" >> pngconf.h
+
+ /* if you don't need thread safety you can uncomment this */
+ # echo "#define PNG_THREAD_UNSAFE_OK" >> pngconf.h
+
+# We should be able to do something like this instead of the manual
+# uncommenting, but it core dumps for me at the moment:
+# .if ${MACHINE_ARCH} == "i386"
+# echo "#define PNG_THREAD_UNSAFE_OK" >> pngconf.h
+# MKLINT= no
+# .else
+# echo "#define PNG_NO_MMX_CODE" >> pngconf.h
+# .endif
+
+ sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h
+
pngtest.o: pngtest.c
${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index ec46b20..cf72f78 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -1,5 +1,6 @@
# makefile for libpng
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
+# Copyright (C) 2006 Glenn Randers-Pehrson
# For conditions of distribution and use, see copyright notice in png.h
PREFIX?= /usr/local
@@ -7,7 +8,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.0beta3
+SHLIB_MINOR= 1.4.0beta4
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
@@ -17,7 +18,23 @@
HDRS= png.h pngconf.h
CFLAGS+= -Wall
-CPPFLAGS+= -I${.CURDIR} -DPNG_NO_MMX_CODE -DPNG_USE_PNGGCCRD
+CPPFLAGS+= -I${.CURDIR}
+
+pngconf.h.in:
+ cat pngconf.h > pngconf.h.in
+
+pngconf.h: pngconf.h.in
+ sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
+
+ /* if you want to use the intel assembler code, remove this */
+ echo "#define PNG_NO_MMX_CODE" >> pngconf.h
+ /* if you want to use the intel MMX code, also remove this */
+ echo "#define PNG_NO_ASSEMBLER_CODE" >> pngconf.h
+
+ /* if you don't need thread safety you can uncomment this */
+ # echo "#define PNG_THREAD_UNSAFE_OK" >> pngconf.h
+
+ sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h
NOPROFILE= Yes
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index d7a7c76..7ac8918 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index ad50381..55d447d 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 6f6c517..efac8e1 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@@ -43,9 +43,8 @@
WARNMORE=-fullwarn
# Note: -KPIC is the default anyhow
-#CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC -DPNG_USE_PNGGCCRD # -g -DPNG_DEBUG=5
-CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -DPNG_USE_PNGGCCRD \
- -DPNG_NO_MMX_CODE
+#CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5
+CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE)
LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng14 -lz -lm
LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \
@@ -79,6 +78,20 @@
all: libpng.a pngtest shared libpng.pc libpng-config
+pngconf.h.in:
+ cat pngconf.h > pngconf.h.in
+
+pngconf.h: pngconf.h.in
+ sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
+
+ /* if you don't want to use the intel MMX code, uncomment this */
+ # echo "#define PNG_NO_MMX_CODE" >> pngconf.h
+
+ /* if you don't need thread safety you can uncomment this */
+ # echo "#define PNG_THREAD_UNSAFE_OK" >> pngconf.h
+
+ sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h
+
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
@@ -215,6 +228,7 @@
pngmem.o: png.h pngconf.h pngintrn.h
pngset.o: png.h pngconf.h pngintrn.h
pngget.o: png.h pngconf.h pngintrn.h
+pnggccrd.o: png.h pngconf.h pngintrn.h
pngread.o: png.h pngconf.h pngintrn.h
pngrtran.o: png.h pngconf.h pngintrn.h
pngrutil.o: png.h pngconf.h pngintrn.h
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index f9d0e80..ef69009 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index e12c03e..550f769 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
-PNGMIN = 1.4.0beta3
+PNGMIN = 1.4.0beta4
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@@ -78,6 +78,14 @@
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
+pngconf.h.in:
+ cat pngconf.h > pngconf.h.in
+
+pngconf.h: pngconf.h.in
+ sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
+ echo "#define PNG_NO_MMX_CODE" >> pngconf.h
+ sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h
+
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
@@ -89,7 +97,7 @@
( cat scripts/libpng-config-head.in; \
echo prefix=\"$(prefix)\"; \
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo cppflags=\"-DPNG_USE_PNGGCCRD -DPNG_NO_MMX_CODE\"; \
+ echo cppflags=\"\"; \
echo L_opts=\"-L$(LIBPATH)\"; \
echo R_opts=\"-R$(LIBPATH)\"; \
echo libs=\"-lpng14 -lz -lm\"; \
@@ -218,7 +226,9 @@
pngwio.o pngwio.pic.o: png.h pngconf.h pngintrn.h
pngmem.o pngmem.pic.o: png.h pngconf.h pngintrn.h
pngset.o pngset.pic.o: png.h pngconf.h pngintrn.h
+pnggccrd.o pnggccrd.pic.o: png.h pngconf.h pngintrn.h
pngget.o pngget.pic.o: png.h pngconf.h pngintrn.h
+pnggccrd.o pngget.pic.o: png.h pngconf.h pngintrn.h
pngread.o pngread.pic.o: png.h pngconf.h pngintrn.h
pngrtran.o pngrtran.pic.o: png.h pngconf.h pngintrn.h
pngrutil.o pngrutil.pic.o: png.h pngconf.h pngintrn.h
diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos
index 9309c5b..5cf7299 100644
--- a/scripts/makefile.sunos
+++ b/scripts/makefile.sunos
@@ -41,7 +41,7 @@
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
+ pngwtran.o pngmem.o pngerror.o pngpread.o pnggccrd.o
all: libpng.a pngtest
diff --git a/scripts/makefile.vcawin32 b/scripts/makefile.vcawin32
index c586c2c..d19085d 100644
--- a/scripts/makefile.vcawin32
+++ b/scripts/makefile.vcawin32
@@ -1,5 +1,6 @@
# makefile for libpng
# Copyright (C) 1998 Tim Wegner
+# Copyright (C) 2006 Glenn Randers-Pehrson
# For conditions of distribution and use, see copyright notice in png.h
# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
# To use, do "nmake /f scripts\makefile.vcawin32"
@@ -11,7 +12,7 @@
CC = cl
LD = link
AR = lib
-CFLAGS = -DPNG_USE_PNGVCRD -nologo -MD -O2 -W3 -I..\zlib
+CFLAGS = -nologo -MD -O2 -W3 -I..\zlib
LDFLAGS = -nologo
ARFLAGS = -nologo
RM = del
@@ -32,6 +33,14 @@
# Targets
all: libpng.lib
+pngconf.h.in:
+ cat pngconf.h > pngconf.h.in
+
+pngconf.h: pngconf.h.in
+ sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
+ echo "#define PNG_USE_PNGVCRD" >> pngconf.h
+ sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h
+
png$(O): png.h pngconf.h pngintrn.h
$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32
index 71fabcc..1001049 100644
--- a/scripts/makefile.vcwin32
+++ b/scripts/makefile.vcwin32
@@ -1,5 +1,6 @@
# makefile for libpng
# Copyright (C) 1998 Tim Wegner
+# Copyright (C) 2006 Glenn Randers-Pehrson
# For conditions of distribution and use, see copyright notice in png.h
# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
# To use, do "nmake /f scripts\makefile.vcwin32"
@@ -31,12 +32,23 @@
# Targets
all: libpng.lib
+pngconf.h.in:
+ cat pngconf.h > pngconf.h.in
+
+pngconf.h: pngconf.h.in
+ sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
+ echo "#define PNG_NO_MMX_CODE" >> pngconf.h
+ sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h
+
png$(O): png.h pngconf.h pngintrn.h
$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
pngset$(O): png.h pngconf.h pngintrn.h
$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
+pnggccrd$(O): png.h pngconf.h pngintrn.h
+ $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
+
pngget$(O): png.h pngconf.h pngintrn.h
$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 173100a..d7acc23 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.4.0beta3
+; Version 1.4.0beta4
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index e9d389c..685b8cb 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.4.0beta3
+;Version 1.4.0beta4
png_build_grayscale_palette @1
png_chunk_error @3
png_chunk_warning @4
