Imported from libpng-1.4.0beta9.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 24d53e3..7639b99 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.4.0beta8 - June 22, 2006
+Libpng 1.4.0beta9 - July 3, 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.0beta8.tar.gz
-   1.4.0beta8.tar.bz2
+   1.4.0beta9.tar.gz
+   1.4.0beta9.tar.bz2
 
 Source files with LF line endings (for Unix/Linux) without the
 "configure" script
 
-   1.4.0beta8-no-config.tar.gz
-   1.4.0beta8-no-config.tar.bz2
+   1.4.0beta9-no-config.tar.gz
+   1.4.0beta9-no-config.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp140b08.zip
-   lp140b08.tar.bz2
+   lp140b09.zip
+   lp140b09.tar.bz2
 
 Project files
 
-   1.4.0beta8-project-netware.zip
-   1.4.0beta8-project-wince.zip
+   1.4.0beta9-project-netware.zip
+   1.4.0beta9-project-wince.zip
 
 Other information:
 
-   1.4.0beta8-README.txt
-   1.4.0beta8-KNOWNBUGS.txt
-   1.4.0beta8-LICENSE.txt
-   1.4.0beta8-Y2K-compliance.txt
+   1.4.0beta9-README.txt
+   1.4.0beta9-KNOWNBUGS.txt
+   1.4.0beta9-LICENSE.txt
+   1.4.0beta9-Y2K-compliance.txt
 
 Changes since the last public release (1.2.10):
 
@@ -111,7 +111,7 @@
   Revised configure.ac, Makefile.am, and many of the makefiles to write
     their defines in pngconf.h.
 
-version 1.4.0beta5 [June 22, 2006]
+version 1.4.0beta5 [May 15, 2006]
   Added a missing semicolon in Makefile.am and Makefile.in
   Deleted extraneous square brackets from configure.ac
 
@@ -141,11 +141,11 @@
   Revised INSTALL and autogen.sh
   Fixed typo in several makefiles (-W1 should be -Wl)
 
-version 1.2.11rc3 [June 22, 2006]
+version 1.2.11rc3 [June 15, 2006]
   Added one zero element to png_gamma_shift[] array in pngrtran.c to avoid
     reading out of bounds.
 
-version 1.4.0beta7 [June 22, 2006]
+version 1.4.0beta7 [June 16, 2006]
   Exported png_write_sig (Cosmin).
   Optimized buffer in png_handle_cHRM() (Cosmin).
   Set pHYs = 2835 x 2835 pixels per meter, and added
@@ -153,10 +153,18 @@
   Added png_set_benign_errors(), png_benign_error(), png_chunk_benign_error().
   Added typedef for png_int_32 and png_uint_32 on 64-bit systems.
 
-version 1.4.0beta8 [June 22, 2006]
+version 1.4.0beta8 [June 21, 2006]
   Added demonstration of user chunk support in pngtest.c, to support the
     public sTER chunk and a private vpAg chunk.
 
+version 1.4.0beta9 [July 3, 2006]
+  Removed ordinals from scripts/pngw32.def and removed png_info_int and
+    png_set_gray_1_2_4_to_8 entries.
+  Inline call of png_get_uint_32() in png_get_uint_31().
+  Use png_get_uint_31() to get vpAg width and heigh in pngtest.c
+  Removed WINCE and Netware projects.
+  Removed standalone Y2KINFO file.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit 
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/CHANGES b/CHANGES
index 917faf0..84ae282 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1593,7 +1593,7 @@
   Revised configure.ac, Makefile.am, and many of the makefiles to write
     their defines in pngconf.h.
 
-version 1.4.0beta5 [May 31, 2006]
+version 1.4.0beta5 [May 15, 2006]
   Added a missing semicolon in Makefile.am and Makefile.in
   Deleted extraneous square brackets from configure.ac
 
@@ -1651,10 +1651,16 @@
   Added demonstration of user chunk support in pngtest.c, to support the
     public sTER chunk and a private vpAg chunk.
 
+version 1.4.0beta9 [July 3, 2006]
+  Removed ordinals from scripts/pngw32.def and removed png_info_int and
+    png_set_gray_1_2_4_to_8 entries.
+  Inline call of png_get_uint_32() in png_get_uint_31().
+  Use png_get_uint_31() to get vpAg width and heigh in pngtest.c
+  Removed WINCE and Netware projects.
+  Removed standalone Y2KINFO file.
+
 version 1.4.0betaN [future]
   Cleaned up error and warning messages.
-  Implemented sTER chunk.
-  Cleaned up WINCE project.
   Build shared libraries with -lz and sometimes -lm.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
diff --git a/INSTALL b/INSTALL
index b000bfa..548bccf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
 
-Installing libpng version 1.4.0beta8 - June 22, 2006
+Installing libpng version 1.4.0beta9 - July 3, 2006
 
 On Unix/Linux and similar systems, you can simply type
 
@@ -37,7 +37,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.0beta8" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.4.0beta9" 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:
@@ -57,8 +57,6 @@
              beos
              c5builder (Borland)
              visualc6 (msvc)
-             netware.txt
-             wince.txt
           scripts
              makefile.*
           pngtest.png
@@ -93,11 +91,11 @@
 
  makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
  makefile.elf      =>  Linux/ELF makefile symbol versioning,
-                       gcc, creates libpng14.so.1.1.4.0beta8)
+                       gcc, creates libpng14.so.1.1.4.0beta9)
  makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng14.so.1.1.4.0beta8)
+                       (gcc, creates libpng14.so.1.1.4.0beta9)
  makefile.gcmmx    =>  Linux/ELF makefile
-                       (gcc, creates libpng14.so.1.1.4.0beta8,
+                       (gcc, creates libpng14.so.1.1.4.0beta9,
                        uses assembler code tuned for Intel MMX platform)
  makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)
  makefile.knr      =>  Archaic UNIX Makefile that converts files with
@@ -120,12 +118,12 @@
  makefile.openbsd  =>  OpenBSD makefile
  makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
  makefile.sggcc    =>  Silicon Graphics (gcc,
-                       creates libpng14.so.1.1.4.0beta8)
+                       creates libpng14.so.1.1.4.0beta9)
  makefile.sunos    =>  Sun makefile
  makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng14.so.1.1.4.0beta8)
+                       creates libpng14.so.1.1.4.0beta9)
  makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng14.so.1.1.4.0beta8)
+                       creates libpng14.so.1.1.4.0beta9)
  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 3d24640..dfde567 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
 
-Known bugs in libpng version 1.4.0beta8
+Known bugs in libpng version 1.4.0beta9
 
 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 2905fd2..42966d7 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.0beta8, June 22, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0beta9, July 3, 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
-June 22, 2006
+July 3, 2006
diff --git a/README b/README
index d8f7076..7edd333 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.0beta8 - June 22, 2006 (shared library 14.0)
+README for libpng version 1.4.0beta9 - July 3, 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.1.1.4.0beta8)
+                            gcc, creates libpng14.so.1.1.4.0beta9)
        makefile.linux   =>  Linux/ELF makefile
-                            (gcc, creates libpng14.so.1.1.4.0beta8)
+                            (gcc, creates libpng14.so.1.1.4.0beta9)
        makefile.gcmmx   =>  Linux/ELF makefile
-                            (gcc, creates libpng14.so.1.1.4.0beta8,
+                            (gcc, creates libpng14.so.1.1.4.0beta9,
                             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.1.1.4.0beta8)
+                            (gcc, creates libpng14.so.1.1.4.0beta9)
        makefile.sunos   =>  Sun makefile
        makefile.solaris =>  Solaris 2.X makefile
-                            (gcc, creates libpng14.so.1.1.4.0beta8)
+                            (gcc, creates libpng14.so.1.1.4.0beta9)
        makefile.so9     =>  Solaris 9 makefile
-                            (gcc, creates libpng14.so.1.1.4.0beta8)
+                            (gcc, creates libpng14.so.1.1.4.0beta9)
        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
deleted file mode 100644
index 902e444..0000000
--- a/Y2KINFO
+++ /dev/null
@@ -1,55 +0,0 @@
-   Y2K compliance in libpng:
-   =========================
-
-      June 22, 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.0beta8 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 will hold years up to 65535.  The other two hold the date in text
-      format, and will hold years up to 9999.
-
-      The integer is
-          "png_uint_16 year" in png_time_struct.
-
-      The strings are
-          "png_charp time_buffer" in png_struct and
-          "near_time_buffer", which is a local character string in png.c.
-
-      There are seven time-related functions:
-
-          png_convert_to_rfc_1123() in png.c
-            (formerly png_convert_to_rfc_1152() in error)
-          png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
-          png_convert_from_time_t() in pngwrite.c
-          png_get_tIME() in pngget.c
-          png_handle_tIME() in pngrutil.c, called in pngread.c
-          png_set_tIME() in pngset.c
-          png_write_tIME() in pngwutil.c, called in pngwrite.c
-
-      All appear to handle dates properly in a Y2K environment.  The
-      png_convert_from_time_t() function calls gmtime() to convert from system
-      clock time, which returns (year - 1900), which we properly convert to
-      the full 4-digit year.  There is a possibility that applications using
-      libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
-      function, or that they are incorrectly passing only a 2-digit year
-      instead of "year - 1900" into the png_convert_from_struct_tm() function,
-      but this is not under our control.  The libpng documentation has always
-      stated that it works with 4-digit years, and the APIs have been
-      documented as such.
-
-      The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned
-      integer to hold the year, and can hold years as large as 65535.
-
-      zlib, upon which libpng depends, is also Y2K compliant.  It contains
-      no date-related code.
-
-
-         Glenn Randers-Pehrson
-         libpng maintainer
-         PNG Development Group
diff --git a/configure b/configure
index 287ad98..7b089d6 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.0beta8.
+# Generated by GNU Autoconf 2.59 for libpng 1.4.0beta9.
 #
 # 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.0beta8'
-PACKAGE_STRING='libpng 1.4.0beta8'
+PACKAGE_VERSION='1.4.0beta9'
+PACKAGE_STRING='libpng 1.4.0beta9'
 PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
 
 ac_unique_file="pngget.c"
@@ -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.0beta8 to adapt to many kinds of systems.
+\`configure' configures libpng 1.4.0beta9 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.0beta8:";;
+     short | recursive ) echo "Configuration of libpng 1.4.0beta9:";;
    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.0beta8
+libpng configure 1.4.0beta9
 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.0beta8, which was
+It was created by libpng $as_me 1.4.0beta9, 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.0beta8'
+ VERSION='1.4.0beta9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1979,7 +1979,7 @@
 
 
 
-PNGLIB_VERSION=1.4.0beta8
+PNGLIB_VERSION=1.4.0beta9
 PNGLIB_MAJOR=14
 PNGLIB_MINOR=0
 
@@ -20683,7 +20683,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by libpng $as_me 1.4.0beta8, which was
+This file was extended by libpng $as_me 1.4.0beta9, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20746,7 +20746,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libpng config.status 1.4.0beta8
+libpng config.status 1.4.0beta9
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 9d92dd9..4fd937b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@
 
 dnl Version number stuff here:
 
-AC_INIT([libpng], [1.4.0beta8], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.4.0beta9], [png-mng-implement@lists.sourceforge.net])
 AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE
 
-PNGLIB_VERSION=1.4.0beta8
+PNGLIB_VERSION=1.4.0beta9
 PNGLIB_MAJOR=14
 PNGLIB_MINOR=0
 
diff --git a/libpng.3 b/libpng.3
index 26a30de..780772a 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "June 22, 2006"
+.TH LIBPNG 3 "July 3, 2006"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta8
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta9
 .SH SYNOPSIS
 \fI\fB
 
@@ -833,7 +833,7 @@
 .SH LIBPNG.TXT
 libpng.txt - A description on how to use and modify libpng
 
- libpng version 1.4.0beta8 - June 22, 2006
+ libpng version 1.4.0beta9 - July 3, 2006
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -3748,13 +3748,13 @@
 
 .SH IX. Y2K Compliance in libpng
 
-June 22, 2006
+July 3, 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.0beta8 are Y2K compliant.  It is my belief that earlier
+upward through 1.4.0beta9 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
@@ -3916,7 +3916,7 @@
  1.2.10              13    10210  12.so.0.10[.0]
  1.4.0beta1-6        14    10400  14.so.0.0[.0]
  1.2.11beta1-4       13    10210  12.so.0.10[.0]
- 1.4.0beta7-8        14    10400  14.so.0.0[.0]
+ 1.4.0beta7-9        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
@@ -3972,7 +3972,7 @@
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.4.0beta8 - June 22, 2006:
+Libpng version 1.4.0beta9 - July 3, 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).
 
@@ -3993,7 +3993,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.0beta8, June 22, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0beta9, July 3, 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
@@ -4092,7 +4092,7 @@
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-June 22, 2006
+July 3, 2006
 
 .\" end of man page
 
diff --git a/libpng.txt b/libpng.txt
index 9a9f928..4ce17c8 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.0beta8 - June 22, 2006
+ libpng version 1.4.0beta9 - July 3, 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
 
-June 22, 2006
+July 3, 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.0beta8 are Y2K compliant.  It is my belief that earlier
+upward through 1.4.0beta9 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 f22288d..d0ba1ab 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "June 22, 2006"
+.TH LIBPNGPF 3 "July 3, 2006"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta8
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta9
 (private functions)
 .SH SYNOPSIS
 \fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 6aaa734..0c501cd 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "June 22, 2006"
+.TH PNG 5 "July 3, 2006"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
diff --git a/png.c b/png.c
index 217b996..f9d5c31 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_0beta8 Your_png_h_is_not_version_1_4_0beta8;
+typedef version_1_4_0beta9 Your_png_h_is_not_version_1_4_0beta9;
 
 /* 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.0beta8 - June 22, 2006\n\
+   return ((png_charp) "\n libpng version 1.4.0beta9 - July 3, 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 8cfaa5b..23dc3e5 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.4.0beta8 - June 22, 2006
+ * libpng version 1.4.0beta9 - July 3, 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.0beta8 - June 22, 2006: Glenn
+ *  libpng versions 0.97, January 1998, through 1.4.0beta9 - July 3, 2006: Glenn
  *  See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -121,7 +121,7 @@
  *    1.2.10                  13    10210  12.so.0.10[.0]
  *    1.4.0beta1-5            14    10400  14.so.0.0[.0]
  *    1.2.11beta1-4           13    10210  12.so.0.10[.0]
- *    1.4.0beta7-8            14    10400  14.so.0.0[.0]
+ *    1.4.0beta7-9            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
@@ -151,7 +151,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.0beta8, June 22, 2006, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta9, July 3, 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:
@@ -263,13 +263,13 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    June 22, 2006
+ *    July 3, 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.0beta8 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.4.0beta9 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
@@ -325,9 +325,9 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.4.0beta8"
+#define PNG_LIBPNG_VER_STRING "1.4.0beta9"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.4.0beta8 - June 22, 2006 (header)\n"
+   " libpng version 1.4.0beta9 - July 3, 2006 (header)\n"
 
 #define PNG_LIBPNG_VER_SONUM   1
 #define PNG_LIBPNG_VER_DLLNUM  14
@@ -339,7 +339,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  8
+#define PNG_LIBPNG_VER_BUILD  9
 
 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -1363,7 +1363,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_0beta8;
+typedef png_structp version_1_4_0beta9;
 
 typedef png_struct FAR * FAR * png_structpp;
 
diff --git a/pngconf.h b/pngconf.h
index d419b34..30afee4 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.4.0beta8 - June 22, 2006
+ * libpng version 1.4.0beta9 - July 3, 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 9c5fedc..5280839 100644
--- a/pngintrn.h
+++ b/pngintrn.h
@@ -1,7 +1,7 @@
 
 /* pngintrn.h - internal header file for libpng
  *
- * libpng version 1.4.0beta8 - June 22, 2006
+ * libpng version 1.4.0beta9 - July 3, 2006
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2006 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrutil.c b/pngrutil.c
index 8a3fe0d..4a09c7f 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -19,7 +19,15 @@
 png_uint_32 PNGAPI
 png_get_uint_31(png_structp png_ptr, png_bytep buf)
 {
+#ifdef PNG_READ_BIG_ENDIAN_SUPPORTED
    png_uint_32 i = png_get_uint_32(buf);
+#else
+   /* Avoid an extra function call by inlining the result. */
+   png_uint_32 i = ((png_uint_32)(*buf) << 24) +
+      ((png_uint_32)(*(buf + 1)) << 16) +
+      ((png_uint_32)(*(buf + 2)) << 8) +
+      (png_uint_32)(*(buf + 3));
+#endif
    if (i > PNG_UINT_31_MAX)
      png_error(png_ptr, "PNG unsigned integer out of range.");
    return (i);
diff --git a/pngtest.c b/pngtest.c
index bbaa341..8acd9a6 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -561,10 +561,10 @@
 
 static png_uint_32 user_chunk_data[4];
 
-    /* 0: stereo mode + 1
-     * 1: vpag width
-     * 2: vpag height
-     * 3: vpag units
+    /* 0: sTER mode + 1
+     * 1: vpAg width
+     * 2: vpAg height
+     * 3: vpAg units
      */
 
 static int read_user_chunk_callback(png_struct *png_ptr,
@@ -587,7 +587,7 @@
    */
 
   if (chunk->name[0] == 115 && chunk->name[1] ==  84 &&     /* s  T */
-      chunk->name[2] == 69 && chunk-> name[3] ==  82)       /* E  R */
+      chunk->name[2] ==  69 && chunk->name[3] ==  82)       /* E  R */
      {
        /* Found sTER chunk */
        if (chunk->size != 1)
@@ -609,10 +609,8 @@
 
   user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);
 
-  user_chunk_data[1]=(unsigned long) ((chunk->data[0] << 24) |
-     (chunk->data[1] << 16) | (chunk->data[2] << 8) | chunk->data[3]);
-  user_chunk_data[2]=(unsigned long) ((chunk->data[4] << 24) |
-     (chunk->data[5] << 16) | (chunk->data[6] << 8) | chunk->data[7]);
+  user_chunk_data[1]=png_get_uint_31(png_ptr,chunk->data);
+  user_chunk_data[2]=png_get_uint_31(png_ptr,chunk->data + 4);
   user_chunk_data[3]=(unsigned long) chunk->data[8];
 
   return (1);
@@ -1611,4 +1609,4 @@
 }
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_0beta8 your_png_h_is_not_version_1_4_0beta8;
+typedef version_1_4_0beta9 your_png_h_is_not_version_1_4_0beta9;
diff --git a/projects/netware.txt b/projects/netware.txt
deleted file mode 100644
index 178361d..0000000
--- a/projects/netware.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-A set of project files is available for Netware.  Get
-libpng-1.2.5-project-netware.zip from a libpng distribution
-site such as http://libpng.sourceforge.net
-
-Put the zip file in this directory (projects) and then run
-"unzip -a libpng-1.2.5-project-netware.zip"
diff --git a/projects/wince.txt b/projects/wince.txt
deleted file mode 100644
index a1a26c0..0000000
--- a/projects/wince.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-A set of project files is available for WinCE.  Get
-libpng-1.2.5-project-wince.zip from a libpng distribution
-site such as http://libpng.sourceforge.net
-
-Put the zip file in this directory (projects) and then run
-"unzip -a libpng-1.2.5-project-wince.zip"
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index 25d884b..0cd621f 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
 
 # Modeled after libxml-config.
 
-version=1.4.0beta8
+version=1.4.0beta9
 prefix=""
 libdir=""
 libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 8e29993..8cb6555 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.0beta8
+Version: 1.4.0beta9
 Libs: -L${libdir} -lpng14
 Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index a8d8855..efb763b 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng14
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 8482a3c..3112bf5 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng14
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index d5350c0..2870cb6 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@
 
 LIBNAME=libpng14
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 9f5ec4f..e3d1ccb 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng14
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 173975d..2ab4685 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -65,7 +65,7 @@
 LIBNAME = libpng14
 PNGMAJ = 1
 CYGDLL = 14
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 5bb4b9d..870b677 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@
 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index d007c91..e92483a 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
 
 # Library name:
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng14
 
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index 7a1721d..eb852bb 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 4811c67..f52ae1b 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -16,7 +16,7 @@
 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 20ba216..092e720 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@
 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index 1f2ea25..948a924 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 2ec5e14..a3330dd 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@
 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index e115b9d..48f5a34 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index d99fea1..8e370d2 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -66,7 +66,7 @@
 LIBNAME = libpng14
 PNGMAJ = 1
 MINGDLL = 14
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index d853320..d802606 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -14,7 +14,7 @@
 
 LIB=	png12
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.4.0beta8
+SHLIB_MINOR=	1.4.0beta9
 SRCS=	pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 		pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 		pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index 658e850..66e1c37 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@
 
 LIB=	png
 SHLIB_MAJOR=	3
-SHLIB_MINOR=	1.4.0beta8
+SHLIB_MINOR=	1.4.0beta9
 SRCS=	pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 		pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 		pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index 138e055..f355d53 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -8,7 +8,7 @@
 MANDIR= ${PREFIX}/man/cat
 
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.4.0beta8
+SHLIB_MINOR=	1.4.0beta9
 
 LIB=	png
 SRCS=	png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 64d753f..35d1d5e 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index aeda081..23479a0 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME=libpng14
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 3a8d287..ec8a571 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME=libpng14
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -85,7 +85,7 @@
 	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
+	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
@@ -105,7 +105,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 ccopts=\"$(ABI)\"; \
 	echo ldopts=\"$(ABI)\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 4306906..ef7d6a8 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
 
 # Library name:
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng14
 
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 7a1f5cf..96dd0b8 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 1
-PNGMIN = 1.4.0beta8
+PNGMIN = 1.4.0beta9
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 2ae709d..af301a7 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------
 
-; Version 1.4.0beta8
+; Version 1.4.0beta9
 
 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index f1f488b..a40be99 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,224 +5,221 @@
 LIBRARY
 
 EXPORTS
-;Version 1.4.0beta8
-  png_build_grayscale_palette  @1
-  png_chunk_error      @3
-  png_chunk_warning      @4
-  png_convert_from_struct_tm   @5
-  png_convert_from_time_t    @6
-  png_create_info_struct     @7
-  png_create_read_struct     @8
-  png_create_write_struct    @9
-  png_data_freer    @10
-  png_destroy_info_struct  @11
-  png_destroy_read_struct  @12
-  png_destroy_write_struct  @13
-  png_error    @14
-  png_free      @15
-  png_free_data    @16
-  png_get_IHDR    @17
-  png_get_PLTE    @18
-  png_get_bKGD    @19
-  png_get_bit_depth    @20
-  png_get_cHRM    @21
-  png_get_cHRM_fixed  @22
-  png_get_channels    @23
-  png_get_color_type  @24
-  png_get_compression_buffer_size  @25
-  png_get_compression_type  @26
-  png_get_copyright    @27
-  png_get_error_ptr    @28
-  png_get_filter_type  @29
-  png_get_gAMA    @30
-  png_get_gAMA_fixed  @31
-  png_get_hIST    @32
-  png_get_header_ver  @33
-  png_get_header_version  @34
-  png_get_iCCP    @35
-  png_get_image_height  @36
-  png_get_image_width  @37
-  png_get_interlace_type  @38
-  png_get_io_ptr    @39
-  png_get_libpng_ver  @40
-  png_get_oFFs    @41
-  png_get_pCAL    @42
-  png_get_pHYs    @43
-  png_get_pixel_aspect_ratio  @44
-  png_get_pixels_per_meter  @45
-  png_get_progressive_ptr  @46
-  png_get_rgb_to_gray_status  @47
-  png_get_rowbytes    @48
-  png_get_rows    @49
-  png_get_sBIT    @50
-  png_get_sCAL    @51
-  png_get_sPLT    @52
-  png_get_sRGB    @53
-  png_get_signature    @54
-  png_get_tIME    @55
-  png_get_tRNS    @56
-  png_get_text    @57
-  png_get_unknown_chunks  @58
-  png_get_user_chunk_ptr  @59
-  png_get_user_transform_ptr  @60
-  png_get_valid    @61
-  png_get_x_offset_microns  @62
-  png_get_x_offset_pixels  @63
-  png_get_x_pixels_per_meter  @64
-  png_get_y_offset_microns  @65
-  png_get_y_offset_pixels  @66
-  png_get_y_pixels_per_meter  @67
-  png_malloc    @68
-  png_memcpy_check    @69
-  png_memset_check    @70
-  png_process_data    @72
-  png_progressive_combine_row  @73
-  png_read_end    @74
-  png_read_image    @75
-  png_read_info    @76
-  png_read_png    @78
-  png_read_row    @79
-  png_read_rows    @80
-  png_read_update_info  @81
-  png_reset_zstream    @82
-  png_set_IHDR    @83
-  png_set_PLTE    @84
-  png_set_bKGD    @85
-  png_set_background  @86
-  png_set_bgr    @87
-  png_set_cHRM    @88
-  png_set_cHRM_fixed  @89
-  png_set_compression_buffer_size  @90
-  png_set_compression_level  @91
-  png_set_compression_mem_level  @92
-  png_set_compression_method  @93
-  png_set_compression_strategy  @94
-  png_set_compression_window_bits  @95
-  png_set_crc_action  @96
-  png_set_dither    @97
-  png_set_error_fn    @98
-  png_set_expand    @99
-  png_set_filler    @100
-  png_set_filter    @101
-  png_set_filter_heuristics  @102
-  png_set_flush    @103
-  png_set_gAMA    @104
-  png_set_gAMA_fixed  @105
-  png_set_gamma    @106
-  png_set_gray_1_2_4_to_8  @107 ; deprecated
-  png_set_gray_to_rgb  @108
-  png_set_hIST    @109
-  png_set_iCCP    @110
-  png_set_interlace_handling  @111
-  png_set_invert_alpha  @112
-  png_set_invert_mono  @113
-  png_set_keep_unknown_chunks  @114
-  png_set_oFFs    @115
-  png_set_pCAL    @116
-  png_set_pHYs    @117
-  png_set_packing    @118
-  png_set_packswap    @119
-  png_set_palette_to_rgb  @120
-  png_set_progressive_read_fn  @121
-  png_set_read_fn    @122
-  png_set_read_status_fn  @123
-  png_set_read_user_chunk_fn  @124
-  png_set_read_user_transform_fn  @125
-  png_set_rgb_to_gray  @126
-  png_set_rgb_to_gray_fixed  @127
-  png_set_rows    @128
-  png_set_sBIT    @129
-  png_set_sCAL    @130
-  png_set_sPLT    @131
-  png_set_sRGB    @132
-  png_set_sRGB_gAMA_and_cHRM  @133
-  png_set_shift    @134
-  png_set_sig_bytes    @135
-  png_set_strip_16    @136
-  png_set_strip_alpha  @137
-  png_set_swap    @138
-  png_set_swap_alpha  @139
-  png_set_tIME    @140
-  png_set_tRNS    @141
-  png_set_tRNS_to_alpha  @142
-  png_set_text    @143
-  png_set_unknown_chunk_location  @144
-  png_set_unknown_chunks  @145
-  png_set_user_transform_info  @146
-  png_set_write_fn    @147
-  png_set_write_status_fn  @148
-  png_set_write_user_transform_fn  @149
-  png_sig_cmp    @150
-  png_start_read_image  @151
-  png_warning    @152
-  png_write_chunk    @153
-  png_write_chunk_data  @154
-  png_write_chunk_end  @155
-  png_write_chunk_start  @156
-  png_write_end    @157
-  png_write_flush    @158
-  png_write_image    @159
-  png_write_info    @160
-  png_write_info_before_PLTE  @161
-  png_write_png    @163
-  png_write_row    @164
-  png_write_rows    @165
-  png_access_version_number  @168
-  png_init_io    @171
-  png_convert_to_rfc1123     @172
-  png_set_invalid  @173
+;Version 1.4.0beta9
+  png_build_grayscale_palette
+  png_chunk_error
+  png_chunk_warning
+  png_convert_from_struct_tm
+  png_convert_from_time_t
+  png_create_info_struct
+  png_create_read_struct
+  png_create_write_struct
+  png_data_freer
+  png_destroy_info_struct
+  png_destroy_read_struct
+  png_destroy_write_struct
+  png_error
+  png_free
+  png_free_data
+  png_get_IHDR
+  png_get_PLTE
+  png_get_bKGD
+  png_get_bit_depth
+  png_get_cHRM
+  png_get_cHRM_fixed
+  png_get_channels
+  png_get_color_type
+  png_get_compression_buffer_size
+  png_get_compression_type
+  png_get_copyright
+  png_get_error_ptr
+  png_get_filter_type
+  png_get_gAMA
+  png_get_gAMA_fixed
+  png_get_hIST
+  png_get_header_ver
+  png_get_header_version
+  png_get_iCCP
+  png_get_image_height
+  png_get_image_width
+  png_get_interlace_type
+  png_get_io_ptr
+  png_get_libpng_ver
+  png_get_oFFs
+  png_get_pCAL
+  png_get_pHYs
+  png_get_pixel_aspect_ratio
+  png_get_pixels_per_meter
+  png_get_progressive_ptr
+  png_get_rgb_to_gray_status
+  png_get_rowbytes
+  png_get_rows
+  png_get_sBIT
+  png_get_sCAL
+  png_get_sPLT
+  png_get_sRGB
+  png_get_signature
+  png_get_tIME
+  png_get_tRNS
+  png_get_text
+  png_get_unknown_chunks
+  png_get_user_chunk_ptr
+  png_get_user_transform_ptr
+  png_get_valid
+  png_get_x_offset_microns
+  png_get_x_offset_pixels
+  png_get_x_pixels_per_meter
+  png_get_y_offset_microns
+  png_get_y_offset_pixels
+  png_get_y_pixels_per_meter
+  png_malloc
+  png_memcpy_check
+  png_memset_check
+  png_process_data
+  png_progressive_combine_row
+  png_read_end
+  png_read_image
+  png_read_info
+  png_read_png
+  png_read_row
+  png_read_rows
+  png_read_update_info
+  png_reset_zstream
+  png_set_IHDR
+  png_set_PLTE
+  png_set_bKGD
+  png_set_background
+  png_set_bgr
+  png_set_cHRM
+  png_set_cHRM_fixed
+  png_set_compression_buffer_size
+  png_set_compression_level
+  png_set_compression_mem_level
+  png_set_compression_method
+  png_set_compression_strategy
+  png_set_compression_window_bits
+  png_set_crc_action
+  png_set_dither
+  png_set_error_fn
+  png_set_expand
+  png_set_filler
+  png_set_filter
+  png_set_filter_heuristics
+  png_set_flush
+  png_set_gAMA
+  png_set_gAMA_fixed
+  png_set_gamma
+  png_set_gray_to_rgb
+  png_set_hIST
+  png_set_iCCP
+  png_set_interlace_handling
+  png_set_invert_alpha
+  png_set_invert_mono
+  png_set_keep_unknown_chunks
+  png_set_oFFs
+  png_set_pCAL
+  png_set_pHYs
+  png_set_packing
+  png_set_packswap
+  png_set_palette_to_rgb
+  png_set_progressive_read_fn
+  png_set_read_fn
+  png_set_read_status_fn
+  png_set_read_user_chunk_fn
+  png_set_read_user_transform_fn
+  png_set_rgb_to_gray
+  png_set_rgb_to_gray_fixed
+  png_set_rows
+  png_set_sBIT
+  png_set_sCAL
+  png_set_sPLT
+  png_set_sRGB
+  png_set_sRGB_gAMA_and_cHRM
+  png_set_shift
+  png_set_sig_bytes
+  png_set_strip_16
+  png_set_strip_alpha
+  png_set_swap
+  png_set_swap_alpha
+  png_set_tIME
+  png_set_tRNS
+  png_set_tRNS_to_alpha
+  png_set_text
+  png_set_unknown_chunk_location
+  png_set_unknown_chunks
+  png_set_user_transform_info
+  png_set_write_fn
+  png_set_write_status_fn
+  png_set_write_user_transform_fn
+  png_sig_cmp
+  png_start_read_image
+  png_warning
+  png_write_chunk
+  png_write_chunk_data
+  png_write_chunk_end
+  png_write_chunk_start
+  png_write_end
+  png_write_flush
+  png_write_image
+  png_write_info
+  png_write_info_before_PLTE
+  png_write_png
+  png_write_row
+  png_write_rows
+  png_access_version_number
+  png_init_io
+  png_convert_to_rfc1123
+  png_set_invalid
 ; Added at version 1.0.12
-; For compatibility with 1.0.7-1.0.11
-  png_info_init @174
-  png_read_init_3    @175
-  png_write_init_3    @176
-  png_info_init_3 @177
-  png_destroy_struct  @178
+  png_read_init_3
+  png_write_init_3
+  png_info_init_3
+  png_destroy_struct
 ; Added at version 1.2.0
 ; For use with PNG_USER_MEM_SUPPORTED
-  png_destroy_struct_2  @179
-  png_create_read_struct_2 @180
-  png_create_write_struct_2 @181
-  png_malloc_default @182
-  png_free_default @183
+  png_destroy_struct_2
+  png_create_read_struct_2
+  png_create_write_struct_2
+  png_malloc_default
+  png_free_default
 ; MNG features
-  png_permit_mng_features  @184
+  png_permit_mng_features
 ; MMX support
-; png_mmx_support  @185
-; png_get_mmx_flagmask  @186
-  png_get_asm_flagmask  @187
-  png_get_asm_flags  @188
-; png_get_mmx_bitdepth_threshold  @189
-; png_get_mmx_rowbytes_threshold  @190
-  png_set_asm_flags  @191
-; png_init_mmx_flags  @192
+; png_mmx_support
+; png_get_mmx_flagmask
+  png_get_asm_flagmask
+  png_get_asm_flags
+; png_get_mmx_bitdepth_threshold
+; png_get_mmx_rowbytes_threshold
+  png_set_asm_flags
+; png_init_mmx_flags
 ; Strip error numbers
-  png_set_strip_error_numbers @193
+  png_set_strip_error_numbers
 ; Added at version 1.2.2
-  png_handle_as_unknown @194
+  png_handle_as_unknown
 ; Added at version 1.2.2 and deleted from 1.2.3
-; png_zalloc @195
-; png_zfree @196
+; png_zalloc
+; png_zfree
 ; Added at version 1.2.4
-  png_malloc_warn @195
+  png_malloc_warn
 ; Added at version 1.2.6
-  png_malloc_warn @195
-  png_get_user_height_max @196
-  png_get_user_width_max @197
-  png_set_user_limits @198
+  png_malloc_warn
+  png_get_user_height_max
+  png_get_user_width_max
+  png_set_user_limits
 ; Added at version 1.2.7
-  png_set_add_alpha @199
+  png_set_add_alpha
 ; Added at version 1.2.9
-  png_get_uint_32 @200
-  png_save_uint_32 @201
-  png_get_uint_16 @202
-  png_save_uint_16 @203
-  png_get_int_32 @204
-  png_save_int_32 @205
-  png_get_uint_31 @206
-  png_set_expand_gray_1_2_4_to_8  @207
+  png_get_uint_32
+  png_save_uint_32
+  png_get_uint_16
+  png_save_uint_16
+  png_get_int_32
+  png_save_int_32
+  png_get_uint_31
+  png_set_expand_gray_1_2_4_to_8
 ; Added at version 1.4.0
-  png_write_sig @208
-; png_benign_error @209
-; png_benign_chunk_error @210
-; png_set_benign_error @211
+  png_write_sig
+; png_benign_error
+; png_benign_chunk_error
+; png_set_benign_error