Imported from libpng-1.2.9beta10.tar

Imported from libpng-1.2.9beta9.tar
Imported from libpng-1.2.9beta8.tar
2025-07-10 18:04:09 +02:00 · 2009-04-06 16:08:44 -05:00 · 2009-04-06 16:08:42 -05:00 · 2009-04-06 16:08:39 -05:00
60 changed files with 836 additions and 331 deletions
--- a/44
+++ b/44
@@ -1,5 +1,5 @@

-Libpng 1.2.9beta7 - March 7, 2006
+Libpng 1.2.9beta10 - March 20, 2006

 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -9,26 +9,26 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script

-   1.2.9beta7.tar.gz
-   1.2.9beta7.tar.bz2
+   1.2.9beta10.tar.gz
+   1.2.9beta10.tar.bz2

 Source files with CRLF line endings (for Windows), without the
 "configure" script

-   lp129b07.zip
-   lp129b07.tar.bz2
+   lp129b10.zip
+   lp129b10.tar.bz2

 Project files

-   1.2.9beta7-project-netware.zip
-   1.2.9beta7-project-wince.zip
+   1.2.9beta10-project-netware.zip
+   1.2.9beta10-project-wince.zip

 Other information:

-   1.2.9beta7-README.txt
-   1.2.9beta7-KNOWNBUGS.txt
-   1.2.9beta7-LICENSE.txt
-   1.2.9beta7-Y2K-compliance.txt
+   1.2.9beta10-README.txt
+   1.2.9beta10-KNOWNBUGS.txt
+   1.2.9beta10-LICENSE.txt
+   1.2.9beta10-Y2K-compliance.txt

 Changes since the last public release (1.2.8):

@@ -43,7 +43,6 @@ version 1.2.9beta1 [February 21, 2006]
  Make sure num_palette is <= 256 before copying data in png_set_PLTE().
  Interchanged order of write_swap_alpha and write_invert_alpha transforms.
  Added parentheses in the definition of PNG_LIBPNG_BUILD_TYPE (Cosmin).
-  Fixed inconsistency in definition of png_default_read_data()
  Exported 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 (Cosmin).
  Added parentheses in the definition of PNG_LIBPNG_BUILD_TYPE (Cosmin).
@@ -112,6 +111,27 @@ version 1.2.9beta7 [March 7, 2006]
  Made cosmetic changes to some makefiles, adding LN_SF and other macros.
  Made some makefiles accept "exec_prefix".

+version 1.2.9beta8 [March 9, 2006]
+  Fixed some "#ifdef defined (..." which should be "#ifdef defined(..."
+    Bug introduced in libpng-1.2.8.
+  Fixed inconsistency in definition of png_default_read_data()
+  Restored blank that was lost from makefile.sggcc "clean" target in beta7.
+  Revised calculation of "current" and "major" for irix in ltmain.sh
+  Changed "mkdir" to "MKDIR_P" in some makefiles.
+  Separated PNG_EXPAND and PNG_EXPAND_tRNS.
+  Added png_set_expand_gray_1_2_4_to_8() and deprecated
+    png_set_gray_1_2_4_to_8() which also expands tRNS to alpha.
+
+version 1.2.9beta9 [March 10, 2006]
+  Include "config.h" in pngconf.h when available.
+  Added some checks for NULL png_ptr or NULL info_ptr (timeless)
+
+version 1.2.9beta10 [March 20, 2006]
+  Removed extra CR from contrib/visualpng/VisualPng.dsw (Cosmin)
+  Made pnggccrd.c PIC-compliant (Christian Aichinger).
+  Added makefile.mingw (Wolfgang Glas)
+  Revised pngconf.h MMX checking.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit 
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
--- a/25
+++ b/25
@@ -1430,7 +1430,6 @@ version 1.2.9beta1 [February 21, 2006]
  Added parentheses in the definition of PNG_LIBPNG_BUILD_TYPE (Cosmin).
  Optimized zlib window flag (CINFO) in contrib/pngsuite/*.png (Cosmin).
  Updated scripts/makefile.bc32 for Borland C++ 5.6 (Cosmin).
-  Fixed inconsistency in definition of png_default_read_data()
  Exported 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 (Cosmin).
  Added type cast (png_byte) in png_write_sCAL() (Cosmin).
@@ -1491,10 +1490,32 @@ version 1.2.9beta7 [March 7, 2006]
  Made cosmetic changes to some makefiles, adding LN_SF and other macros.
  Made some makefiles accept "exec_prefix".

+version 1.2.9beta8 [March 9, 2006]
+  Fixed some "#if defined (..." which should be "#if defined(..."
+    Bug introduced in libpng-1.2.8.
+  Fixed inconsistency in definition of png_default_read_data()
+  Restored blank that was lost from makefile.sggcc "clean" target in beta7.
+  Revised calculation of "current" and "major" for irix in ltmain.sh
+  Changed "mkdir" to "MKDIR_P" in some makefiles.
+  Separated PNG_EXPAND and PNG_EXPAND_tRNS.
+  Added png_set_expand_gray_1_2_4_to_8() and deprecated
+    png_set_gray_1_2_4_to_8() which also expands tRNS to alpha.
+
+version 1.2.9beta9 [March 10, 2006]
+  Include "config.h" in pngconf.h when available.
+  Added some checks for NULL png_ptr or NULL info_ptr (timeless)
+
+version 1.2.9beta10 [March 20, 2006]
+  Removed extra CR from contrib/visualpng/VisualPng.dsw (Cosmin)
+  Made pnggccrd.c PIC-compliant (Christian Aichinger).
+  Added makefile.mingw (Wolfgang Glas).
+  Revised pngconf.h MMX checking.
+
 version 1.4.0beta1 [future]
  Enabled iTXt support (changes png_struct, thus requires so-number change).
  Removed deprecated functions png_read_init, png_write_init, png_info_init,
-    png_permit_empty_plte and deprecated macro PNG_MAX_UINT.
+    png_permit_empty_plte, png_set_gray_1_2_4_to_8, and removed the
+    deprecated macro PNG_MAX_UINT.

 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
--- a/16
+++ b/16
@@ -1,5 +1,5 @@

-Installing libpng version 1.2.9beta7 - March 7, 2006
+Installing libpng version 1.2.9beta10 - March 20, 2006

 On Unix/Linux and similar systems, you can simply type

@@ -29,7 +29,7 @@ to have access to the zlib.h and zconf.h include files that
 correspond to the version of zlib that's installed.

 You can rename the directories that you downloaded (they
-might be called "libpng-1.2.9beta7" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.9beta10" or "lpng109" and "zlib-1.2.1"
 or "zlib121") so that you have directories called "zlib" and "libpng".

 Your directory structure should look like this:
@@ -85,11 +85,11 @@ include

 makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
 makefile.elf      =>  Linux/ELF makefile symbol versioning,
-                       gcc, creates libpng12.so.0.1.2.9beta7)
+                       gcc, creates libpng12.so.0.1.2.9beta10)
 makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng12.so.0.1.2.9beta7)
+                       (gcc, creates libpng12.so.0.1.2.9beta10)
 makefile.gcmmx    =>  Linux/ELF makefile
-                       (gcc, creates libpng12.so.0.1.2.9beta7,
+                       (gcc, creates libpng12.so.0.1.2.9beta10,
                       uses assembler code tuned for Intel MMX platform)
 makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)
 makefile.knr      =>  Archaic UNIX Makefile that converts files with
@@ -112,12 +112,12 @@ include
 makefile.openbsd  =>  OpenBSD makefile
 makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
 makefile.sggcc    =>  Silicon Graphics (gcc,
-                       creates libpng12.so.0.1.2.9beta7)
+                       creates libpng12.so.0.1.2.9beta10)
 makefile.sunos    =>  Sun makefile
 makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng12.so.0.1.2.9beta7)
+                       creates libpng12.so.0.1.2.9beta10)
 makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng12.so.0.1.2.9beta7)
+                       creates libpng12.so.0.1.2.9beta10)
 makefile.32sunu   =>  Sun Ultra 32-bit makefile
 makefile.64sunu   =>  Sun Ultra 64-bit makefile
 makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
--- a/9
+++ b/9
@@ -1,5 +1,5 @@

-Known bugs in libpng version 1.2.9beta7
+Known bugs in libpng version 1.2.9beta10

 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when
   reading interlaced PNG files, when assembler code is enabled but running
@@ -14,12 +14,7 @@ Known bugs in libpng version 1.2.9beta7
   STATUS: This is a subject of debate. The change will probably be made
   as a part of a major overhaul of the makefiles in libpng version 1.3.0.

-3. February 23, 2006: The custom makefiles don't support --exec-prefix.
-
-   STATUS: For now, use "configure".  This will probably be fixed in
-   libpng-1.3.0.
-
-4. February 24, 2006: The Makefile generated by the "configure" script
+3. February 24, 2006: The Makefile generated by the "configure" script
   fails to install symbolic links
   libpng12.so => libpng12.so.0.1.2.9betaN
   that are generated by the custom makefiles.
--- a/4
+++ b/4
@@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
 If you modify libpng you may insert additional notices immediately following
 this sentence.

-libpng versions 1.2.6, August 15, 2004, through 1.2.9beta7, March 7, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.9beta10, March 20, 2006, are
 Copyright (c) 2004, 2006 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
@@ -106,4 +106,4 @@ certification mark of the Open Source Initiative.

 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-March 7, 2006
+March 20, 2006
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ lib_LTLIBRARIES=libpng12.la @compatlib@
 EXTRA_LTLIBRARIES= libpng.la
 libpng12_la_SOURCES = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
-	pngwtran.c pngmem.c pngerror.c pngpread.c \
+	pngwtran.c pngmem.c pngerror.c pngpread.c pnggccrd.c \
 	png.h pngconf.h
 libpng_la_SOURCES = $(libpng12_la_SOURCES)
 # MAJOR UPGRADE: the version-number settings below must be changed.
@@ -79,7 +79,7 @@ EXTRA_DIST= \
 	${srcdir}/contrib/pngsuite/* \
 	${srcdir}/contrib/visupng/* \
 	$(TESTS) \
-	example.c libpng.txt pnggccrd.c pngvcrd.c 
+	example.c libpng.txt pngvcrd.c 

 CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers libpng.sym

@@ -100,7 +100,7 @@ libpng.sym: png.h pngconf.h
 libpng.vers: libpng.sym
 	rm -f $@ $@.new
 	$(ECHO) PNG@PNGLIB_MAJOR@_0 '{global:' > $@.new
-	$(SED) s/$$/\;/ $< >> $@.new
+	$(SED) s/$$/\;/ libpng.sym >> $@.new
 	$(ECHO) 'local: *; };' >> $@.new
 	mv $@.new $@

--- a/Makefile.in
+++ b/Makefile.in
@@ -81,14 +81,15 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
 libpng_la_LIBADD =
 am__objects_1 = png.lo pngset.lo pngget.lo pngrutil.lo pngtrans.lo \
 	pngwutil.lo pngread.lo pngrio.lo pngwio.lo pngwrite.lo \
-	pngrtran.lo pngwtran.lo pngmem.lo pngerror.lo pngpread.lo
+	pngrtran.lo pngwtran.lo pngmem.lo pngerror.lo pngpread.lo \
+	pnggccrd.lo
 am_libpng_la_OBJECTS = $(am__objects_1)
 libpng_la_OBJECTS = $(am_libpng_la_OBJECTS)
 libpng12_la_LIBADD =
 am_libpng12_la_OBJECTS = png.lo pngset.lo pngget.lo pngrutil.lo \
 	pngtrans.lo pngwutil.lo pngread.lo pngrio.lo pngwio.lo \
 	pngwrite.lo pngrtran.lo pngwtran.lo pngmem.lo pngerror.lo \
-	pngpread.lo
+	pngpread.lo pnggccrd.lo
 libpng12_la_OBJECTS = $(am_libpng12_la_OBJECTS)
 am_pngtest_OBJECTS = pngtest.$(OBJEXT)
 pngtest_OBJECTS = $(am_pngtest_OBJECTS)
@@ -268,7 +269,7 @@ lib_LTLIBRARIES = libpng12.la @compatlib@
 EXTRA_LTLIBRARIES = libpng.la
 libpng12_la_SOURCES = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
-	pngwtran.c pngmem.c pngerror.c pngpread.c \
+	pngwtran.c pngmem.c pngerror.c pngpread.c pnggccrd.c \
 	png.h pngconf.h

 libpng_la_SOURCES = $(libpng12_la_SOURCES)
@@ -301,7 +302,7 @@ EXTRA_DIST = \
 	${srcdir}/contrib/pngsuite/* \
 	${srcdir}/contrib/visupng/* \
 	$(TESTS) \
-	example.c libpng.txt pnggccrd.c pngvcrd.c 
+	example.c libpng.txt pngvcrd.c 

 CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers libpng.sym
 all: config.h
@@ -432,6 +433,7 @@ distclean-compile:

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/png.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngerror.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pnggccrd.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngget.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngmem.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngpread.Plo@am__quote@
@@ -991,7 +993,7 @@ libpng.sym: png.h pngconf.h
 libpng.vers: libpng.sym
 	rm -f $@ $@.new
 	$(ECHO) PNG@PNGLIB_MAJOR@_0 '{global:' > $@.new
-	$(SED) s/$$/\;/ $< >> $@.new
+	$(SED) s/$$/\;/ libpng.sym >> $@.new
 	$(ECHO) 'local: *; };' >> $@.new
 	mv $@.new $@

--- a/14
+++ b/14
@@ -1,4 +1,4 @@
-README for libpng version 1.2.9beta7 - March 7, 2006 (shared library 12.0)
+README for libpng version 1.2.9beta10 - March 20, 2006 (shared library 12.0)
 See the note about version numbers near the top of png.h

 See INSTALL for instructions on how to install libpng.
@@ -190,11 +190,11 @@ Files in this distribution:
       descrip.mms      =>  VMS makefile for MMS or MMK
       makefile.std     =>  Generic UNIX makefile (cc, creates static libpng.a)
       makefile.elf     =>  Linux/ELF makefile symbol versioning,
-                            gcc, creates libpng12.so.0.1.2.9beta7)
+                            gcc, creates libpng12.so.0.1.2.9beta10)
       makefile.linux   =>  Linux/ELF makefile
-                            (gcc, creates libpng12.so.0.1.2.9beta7)
+                            (gcc, creates libpng12.so.0.1.2.9beta10)
       makefile.gcmmx   =>  Linux/ELF makefile
-                            (gcc, creates libpng12.so.0.1.2.9beta7,
+                            (gcc, creates libpng12.so.0.1.2.9beta10,
                            uses assembler code tuned for Intel MMX platform)
       makefile.gcc     =>  Generic makefile (gcc, creates static libpng.a)
       makefile.knr     =>  Archaic UNIX Makefile that converts files with
@@ -216,12 +216,12 @@ Files in this distribution:
       makefile.openbsd =>  OpenBSD makefile
       makefile.sgi     =>  Silicon Graphics IRIX (cc, creates static lib)
       makefile.sggcc   =>  Silicon Graphics
-                            (gcc, creates libpng12.so.0.1.2.9beta7)
+                            (gcc, creates libpng12.so.0.1.2.9beta10)
       makefile.sunos   =>  Sun makefile
       makefile.solaris =>  Solaris 2.X makefile
-                            (gcc, creates libpng12.so.0.1.2.9beta7)
+                            (gcc, creates libpng12.so.0.1.2.9beta10)
       makefile.so9     =>  Solaris 9 makefile
-                            (gcc, creates libpng12.so.0.1.2.9beta7)
+                            (gcc, creates libpng12.so.0.1.2.9beta10)
       makefile.32sunu  =>  Sun Ultra 32-bit makefile
       makefile.64sunu  =>  Sun Ultra 64-bit makefile
       makefile.sco     =>  For SCO OSr5  ELF and Unixware 7 with Native cc
--- a/4
+++ b/4
@@ -1,13 +1,13 @@
   Y2K compliance in libpng:
   =========================

-      March 7, 2006
+      March 20, 2006

      Since the PNG Development group is an ad-hoc body, we can't make
      an official declaration.

      This is your unofficial assurance that libpng from version 0.71 and
-      upward through 1.2.9beta7 are Y2K compliant.  It is my belief that earlier
+      upward through 1.2.9beta10 are Y2K compliant.  It is my belief that earlier
      versions were also Y2K compliant.

      Libpng only has three year fields.  One is a 2-byte unsigned integer
--- a/28
+++ b/28
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libpng 1.2.9beta7.
+# Generated by GNU Autoconf 2.59 for libpng 1.2.9beta10.
 #
 # Report bugs to <png-mng-implement@lists.sourceforge.net>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libpng'
 PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.2.9beta7'
-PACKAGE_STRING='libpng 1.2.9beta7'
+PACKAGE_VERSION='1.2.9beta10'
+PACKAGE_STRING='libpng 1.2.9beta10'
 PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'

 ac_unique_file="pngget.c"
@@ -875,13 +875,13 @@ echo X"$0" |
  	  /^X\(\/\).*/{ s//\1/; q; }
  	  s/.*/./; q'`
  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
+  if test ! -r "$srcdir/$ac_unique_file"; then
    srcdir=..
  fi
 else
  ac_srcdir_defaulted=no
 fi
-if test ! -r $srcdir/$ac_unique_file; then
+if test ! -r "$srcdir/$ac_unique_file"; then
  if test "$ac_srcdir_defaulted" = yes; then
    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
   { (exit 1); exit 1; }; }
@@ -890,7 +890,7 @@ if test ! -r $srcdir/$ac_unique_file; then
   { (exit 1); exit 1; }; }
  fi
 fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
   { (exit 1); exit 1; }; }
 srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
@@ -954,7 +954,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures libpng 1.2.9beta7 to adapt to many kinds of systems.
+\`configure' configures libpng 1.2.9beta10 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1020,7 +1020,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of libpng 1.2.9beta7:";;
+     short | recursive ) echo "Configuration of libpng 1.2.9beta10:";;
   esac
  cat <<\_ACEOF

@@ -1167,7 +1167,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
  cat <<\_ACEOF
-libpng configure 1.2.9beta7
+libpng configure 1.2.9beta10
 generated by GNU Autoconf 2.59

 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1181,7 +1181,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by libpng $as_me 1.2.9beta7, which was
+It was created by libpng $as_me 1.2.9beta10, which was
 generated by GNU Autoconf 2.59.  Invocation command line was

  $ $0 $@
@@ -1824,7 +1824,7 @@ fi

 # Define the identity of the package.
 PACKAGE='libpng'
- VERSION='1.2.9beta7'
+ VERSION='1.2.9beta10'


 cat >>confdefs.h <<_ACEOF
@@ -1979,7 +1979,7 @@ fi



-PNGLIB_VERSION=1.2.9beta7
+PNGLIB_VERSION=1.2.9beta10
 PNGLIB_MAJOR=12
 PNGLIB_MINOR=9

@@ -20833,7 +20833,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF

-This file was extended by libpng $as_me 1.2.9beta7, which was
+This file was extended by libpng $as_me 1.2.9beta10, which was
 generated by GNU Autoconf 2.59.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -20896,7 +20896,7 @@ _ACEOF

 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libpng config.status 1.2.9beta7
+libpng config.status 1.2.9beta10
 configured by $0, generated by GNU Autoconf 2.59,
  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@ AC_PREREQ(2.59)

 dnl Version number stuff here:

-AC_INIT([libpng], [1.2.9beta7], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.9beta10], [png-mng-implement@lists.sourceforge.net])
 AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE

-PNGLIB_VERSION=1.2.9beta7
+PNGLIB_VERSION=1.2.9beta10
 PNGLIB_MAJOR=12
 PNGLIB_MINOR=9

--- a/contrib/visupng/VisualPng.dsw
+++ b/contrib/visupng/VisualPng.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-
-
-###############################################################################
-
-
-
-Project: "VisualPng"=.\VisualPng.dsp - Package Owner=<4>
-
-
-
-Package=<5>
-
-{{{
-
-}}}
-
-
-
-Package=<4>
-
-{{{
-
-}}}
-
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "VisualPng"=.\VisualPng.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "March 7, 2006"
+.TH LIBPNG 3 "March 20, 2006"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta7
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta10
 .SH SYNOPSIS
 \fI\fB

@@ -502,6 +502,10 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta7

 \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
@@ -817,7 +821,7 @@ Following is a copy of the libpng.txt file that accompanies libpng.
 .SH LIBPNG.TXT
 libpng.txt - A description on how to use and modify libpng

- libpng version 1.2.9beta7 - March 7, 2006
+ libpng version 1.2.9beta10 - March 20, 2006
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp at users.sourceforge.net>
 Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -1604,7 +1608,7 @@ viewing application that wishes to treat all images in the same way.
        png_set_palette_to_rgb(png_ptr);

    if (color_type == PNG_COLOR_TYPE_GRAY &&
-        bit_depth < 8) png_set_gray_1_2_4_to_8(png_ptr);
+        bit_depth < 8) png_set_expand_gray_1_2_4_to_8(png_ptr);

    if (png_get_valid(png_ptr, info_ptr,
        PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr);
@@ -1614,6 +1618,11 @@ in libpng version 1.0.4, with the function names expanded to improve code
 readability.  In some future version they may actually do different
 things.

+As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
+added.  It expands the sample depth without changing tRNS to alpha.
+At the same time, png_set_gray_1_2_4_to_8() was deprecated, and it
+will be removed from a future version.
+
 PNG can have files with 16 bits per channel.  If you only can handle
 8 bits per channel, this will strip the pixels down to 8 bit.

@@ -3721,13 +3730,13 @@ application:

 .SH IX. Y2K Compliance in libpng

-March 7, 2006
+March 20, 2006

 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.

 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.9beta7 are Y2K compliant.  It is my belief that earlier
+upward through 1.2.9beta10 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.

 Libpng only has three year fields.  One is a 2-byte unsigned integer that
@@ -3881,7 +3890,7 @@ the first widely used release:
 1.0.18              10    10018  12.so.0.1.0.18
 1.2.8               13    10208  12.so.0.1.2.8
 1.2.9beta1-3        13    10209  12.so.0.1.2.9beta1-3
- 1.2.9beta4-7        13    10209  12.so.0.9[.0]
+ 1.2.9beta4-10       13    10209  12.so.0.9[.0]

 Henceforth the source version will match the shared-library minor
 and patch numbers; the shared-library major version number will be
@@ -3937,7 +3946,7 @@ possible without all of you.

 Thanks to Frank J. T. Wojcik for helping with the documentation.

-Libpng version 1.2.9beta7 - March 7, 2006:
+Libpng version 1.2.9beta10 - March 20, 2006:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).

@@ -3958,7 +3967,7 @@ included in the libpng distribution, the latter shall prevail.)
 If you modify libpng you may insert additional notices immediately following
 this sentence.

-libpng versions 1.2.6, August 15, 2004, through 1.2.9beta7, March 7, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.9beta10, March 20, 2006, are
 Copyright (c) 2004-2006 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
@@ -4057,7 +4066,7 @@ certification mark of the Open Source Initiative.

 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-March 7, 2006
+March 20, 2006

 .\" end of man page

--- a/libpng.txt
+++ b/libpng.txt
@@ -1,6 +1,6 @@
 libpng.txt - A description on how to use and modify libpng

- libpng version 1.2.9beta7 - March 7, 2006
+ libpng version 1.2.9beta10 - March 20, 2006
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp at users.sourceforge.net>
 Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -787,7 +787,7 @@ viewing application that wishes to treat all images in the same way.
        png_set_palette_to_rgb(png_ptr);

    if (color_type == PNG_COLOR_TYPE_GRAY &&
-        bit_depth < 8) png_set_gray_1_2_4_to_8(png_ptr);
+        bit_depth < 8) png_set_expand_gray_1_2_4_to_8(png_ptr);

    if (png_get_valid(png_ptr, info_ptr,
        PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr);
@@ -797,6 +797,11 @@ in libpng version 1.0.4, with the function names expanded to improve code
 readability.  In some future version they may actually do different
 things.

+As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
+added.  It expands the sample depth without changing tRNS to alpha.
+At the same time, png_set_gray_1_2_4_to_8() was deprecated, and it
+will be removed from a future version.
+
 PNG can have files with 16 bits per channel.  If you only can handle
 8 bits per channel, this will strip the pixels down to 8 bit.

@@ -2904,13 +2909,13 @@ application:

 IX. Y2K Compliance in libpng

-March 7, 2006
+March 20, 2006

 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.

 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.9beta7 are Y2K compliant.  It is my belief that earlier
+upward through 1.2.9beta10 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.

 Libpng only has three year fields.  One is a 2-byte unsigned integer that
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "March 7, 2006"
+.TH LIBPNGPF 3 "March 20, 2006"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta7
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta10
 (private functions)
 .SH SYNOPSIS
 \fB#include <png.h>\fP
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -3245,7 +3245,7 @@ EOF
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
+	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_minor"
 	    ;;
@@ -3320,7 +3320,7 @@ EOF
 	  ;;

 	irix | nonstopux)
-	  major=`expr $current - $age + 1`
+	  major=`expr $current - $age`

 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "March 7, 2006"
+.TH PNG 5 "March 20, 2006"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@

 /* png.c - location for general purpose libpng functions
 *
- * Last changed in libpng 1.2.9 March 7, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2006 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -13,7 +13,7 @@
 #include "png.h"

 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_9beta7 Your_png_h_is_not_version_1_2_9beta7;
+typedef version_1_2_9beta10 Your_png_h_is_not_version_1_2_9beta10;

 /* Version information for C files.  This had better match the version
 * string defined in png.h.  */
@@ -289,7 +289,7 @@ png_destroy_info_struct(png_structp png_ptr, png_infopp info_ptr_ptr)
 * and applications using it are urged to use png_create_info_struct()
 * instead.
 */
-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
 #undef png_info_init
 void PNGAPI
 png_info_init(png_infop info_ptr)
@@ -693,7 +693,7 @@ png_charp PNGAPI
 png_get_copyright(png_structp png_ptr)
 {
   if (&png_ptr != NULL)  /* silence compiler warning about unused png_ptr */
-   return ((png_charp) "\n libpng version 1.2.9beta7 - March 7, 2006\n\
+   return ((png_charp) "\n libpng version 1.2.9beta10 - March 20, 2006\n\
   Copyright (c) 1998-2006 Glenn Randers-Pehrson\n\
   Copyright (c) 1996-1997 Andreas Dilger\n\
   Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@

 /* png.h - header file for PNG reference library
 *
- * libpng version 1.2.9beta7 - March 7, 2006
+ * libpng version 1.2.9beta10 - March 20, 2006
 * Copyright (c) 1998-2006 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -9,7 +9,7 @@
 * Authors and maintainers:
 *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
 *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *  libpng versions 0.97, January 1998, through 1.2.9beta7 - March 7, 2006: Glenn
+ *  libpng versions 0.97, January 1998, through 1.2.9beta10 - March 20, 2006: Glenn
 *  See also "Contributing Authors", below.
 *
 * Note about libpng version numbers:
@@ -113,7 +113,7 @@
 *    1.0.18                  10    10018  12.so.0.1.0.18
 *    1.2.8                   13    10208  12.so.0.1.2.8
 *    1.2.9beta1-3            13    10209  12.so.0.1.2.9beta1-3
- *    1.2.9beta4-7            13    10209  12.so.0.9[.0]
+ *    1.2.9beta4-10           13    10209  12.so.0.9[.0]
 *
 *    Henceforth the source version will match the shared-library major
 *    and minor numbers; the shared-library major version number will be
@@ -143,7 +143,7 @@
 * If you modify libpng you may insert additional notices immediately following
 * this sentence.
 *
- * libpng versions 1.2.6, August 15, 2004, through 1.2.9beta7, March 7, 2006, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.9beta10, March 20, 2006, are
 * Copyright (c) 2004, 2006 Glenn Randers-Pehrson, and are
 * distributed according to the same disclaimer and license as libpng-1.2.5
 * with the following individual added to the list of Contributing Authors:
@@ -255,13 +255,13 @@
 * Y2K compliance in libpng:
 * =========================
 *
- *    March 7, 2006
+ *    March 20, 2006
 *
 *    Since the PNG Development group is an ad-hoc body, we can't make
 *    an official declaration.
 *
 *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.2.9beta7 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.2.9beta10 are Y2K compliant.  It is my belief that earlier
 *    versions were also Y2K compliant.
 *
 *    Libpng only has three year fields.  One is a 2-byte unsigned integer
@@ -317,9 +317,9 @@
 */

 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.9beta7"
+#define PNG_LIBPNG_VER_STRING "1.2.9beta10"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.2.9beta7 - March 7, 2006 (header)\n"
+   " libpng version 1.2.9beta10 - March 20, 2006 (header)\n"

 #define PNG_LIBPNG_VER_SONUM   0
 #define PNG_LIBPNG_VER_DLLNUM  13
@@ -331,7 +331,7 @@
 /* This should match the numeric part of the final component of
 * PNG_LIBPNG_VER_STRING, omitting any leading zero: */

-#define PNG_LIBPNG_VER_BUILD  7
+#define PNG_LIBPNG_VER_BUILD  10

 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -1361,7 +1361,7 @@ struct png_struct_def
 /* This triggers a compiler error in png.c, if png.c and png.h
 * do not agree upon the version number.
 */
-typedef png_structp version_1_2_9beta7;
+typedef png_structp version_1_2_9beta10;

 typedef png_struct FAR * FAR * png_structpp;

@@ -1491,9 +1491,16 @@ extern PNG_EXPORT(void,png_convert_from_time_t) PNGARG((png_timep ptime,
 #if defined(PNG_READ_EXPAND_SUPPORTED)
 /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
 extern PNG_EXPORT(void,png_set_expand) PNGARG((png_structp png_ptr));
-extern PNG_EXPORT(void,png_set_gray_1_2_4_to_8) PNGARG((png_structp png_ptr));
+#if !defined(PNG_1_0_X)
+extern PNG_EXPORT(void,png_set_expand_gray_1_2_4_to_8) PNGARG((png_structp
+  png_ptr));
+#endif
 extern PNG_EXPORT(void,png_set_palette_to_rgb) PNGARG((png_structp png_ptr));
 extern PNG_EXPORT(void,png_set_tRNS_to_alpha) PNGARG((png_structp png_ptr));
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Deprecated */
+extern PNG_EXPORT(void,png_set_gray_1_2_4_to_8) PNGARG((png_structp png_ptr));
+#endif
 #endif

 #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
@@ -2675,7 +2682,7 @@ extern PNG_EXPORT(void,png_save_uint_16)
 #define PNG_RGB_TO_GRAY      0x600000L  /* two bits, RGB_TO_GRAY_ERR|WARN */
                       /*    0x800000L     Unused */
 #define PNG_ADD_ALPHA       0x1000000L  /* Added to libpng-1.2.7 */
-                       /*   0x2000000L  unused */
+#define PNG_EXPAND_tRNS     0x2000000L  /* Added to libpng-1.2.9 */
                       /*   0x4000000L  unused */
                       /*   0x8000000L  unused */
                       /*  0x10000000L  unused */
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,10 +1,7 @@

 /* pngconf.h - machine configurable file for libpng
 *
-#if defined(PNG_1_0_X)
-#endif
-#if defined (PNG_1_2_X)
- * libpng version 1.2.9beta7 - March 7, 2006
+ * libpng version 1.2.9beta10 - March 20, 2006
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2005 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -30,6 +27,10 @@
 #include "pngusr.h"
 #endif

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /*
 * Added at libpng-1.2.8
 *  
@@ -719,9 +720,14 @@
 #  ifndef PNG_ASSEMBLER_CODE_SUPPORTED
 #    define PNG_ASSEMBLER_CODE_SUPPORTED
 #  endif
-#  if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+#  if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE) && \
+     defined(__MMX__)
 #    define PNG_MMX_CODE_SUPPORTED
 #  endif
+#  if !defined(PNG_USE_PNGGCCRD) && !defined(PNG_NO_MMX_CODE) && \
+     defined(__MMX__)
+#    define PNG_USE_PNGGCCRD
+#  endif
 #endif

 /* If you are sure that you don't need thread safety and you are compiling
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,7 +1,7 @@

 /* pngerror.c - stub functions for i/o and memory allocation
 *
- * Last changed in libpng 1.2.9 March 7, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2006 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -34,33 +34,37 @@ png_error(png_structp png_ptr, png_const_charp error_message)
 {
 #ifdef PNG_ERROR_NUMBERS_SUPPORTED
   char msg[16];
-   if (png_ptr->flags&(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
+   if (png_ptr != NULL)
   {
-     if (*error_message == '#')
+     if (png_ptr->flags&
+       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
     {
-         int offset;
-         for (offset=1; offset<15; offset++)
-            if (*(error_message+offset) == ' ')
-                break;
-         if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
-         {
-            int i;
-            for (i=0; i<offset-1; i++)
-               msg[i]=error_message[i+1];
-            msg[i]='\0';
-            error_message=msg;
-         }
-         else
-            error_message+=offset;
-     }
-     else
-     {
-         if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
-         {
-            msg[0]='0';
-            msg[1]='\0';
-            error_message=msg;
-         }
+       if (*error_message == '#')
+       {
+           int offset;
+           for (offset=1; offset<15; offset++)
+              if (*(error_message+offset) == ' ')
+                  break;
+           if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
+           {
+              int i;
+              for (i=0; i<offset-1; i++)
+                 msg[i]=error_message[i+1];
+              msg[i]='\0';
+              error_message=msg;
+           }
+           else
+              error_message+=offset;
+       }
+       else
+       {
+           if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
+           {
+              msg[0]='0';
+              msg[1]='\0';
+              error_message=msg;
+           }
+       }
     }
   }
 #endif
@@ -81,19 +85,23 @@ void PNGAPI
 png_warning(png_structp png_ptr, png_const_charp warning_message)
 {
   int offset = 0;
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   if (png_ptr->flags&(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
-#endif
+   if (png_ptr != NULL)
   {
-     if (*warning_message == '#')
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   if (png_ptr->flags&
+     (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
+#endif
     {
-         for (offset=1; offset<15; offset++)
-            if (*(warning_message+offset) == ' ')
-                break;
+       if (*warning_message == '#')
+       {
+           for (offset=1; offset<15; offset++)
+              if (*(warning_message+offset) == ' ')
+                  break;
+       }
     }
+     if (png_ptr != NULL && png_ptr->warning_fn != NULL)
+        (*(png_ptr->warning_fn))(png_ptr, warning_message+offset);
   }
-   if (png_ptr != NULL && png_ptr->warning_fn != NULL)
-      (*(png_ptr->warning_fn))(png_ptr, warning_message+offset);
   else
      png_default_warning(png_ptr, warning_message+offset);
 }
@@ -147,6 +155,8 @@ void PNGAPI
 png_chunk_error(png_structp png_ptr, png_const_charp error_message)
 {
   char msg[18+64];
+   if (png_ptr == NULL)
+     png_error(png_ptr, error_message);
   png_format_buffer(png_ptr, msg, error_message);
   png_error(png_ptr, msg);
 }
@@ -155,6 +165,8 @@ void PNGAPI
 png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)
 {
   char msg[18+64];
+   if (png_ptr == NULL)
+     png_warning(png_ptr, warning_message);
   png_format_buffer(png_ptr, msg, warning_message);
   png_warning(png_ptr, msg);
 }
@@ -266,6 +278,8 @@ void PNGAPI
 png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
   png_error_ptr error_fn, png_error_ptr warning_fn)
 {
+   if (png_ptr == NULL)
+      return;
   png_ptr->error_ptr = error_ptr;
   png_ptr->error_fn = error_fn;
   png_ptr->warning_fn = warning_fn;
@@ -279,6 +293,8 @@ png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
 png_voidp PNGAPI
 png_get_error_ptr(png_structp png_ptr)
 {
+   if (png_ptr == NULL)
+      return NULL;
   return ((png_voidp)png_ptr->error_ptr);
 }

--- a/pnggccrd.c
+++ b/pnggccrd.c
@@ -7,7 +7,7 @@
 *     and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm
 *     for Intel's performance analysis of the MMX vs. non-MMX code.
 *
- * Last changed in libpng 1.2.9 March 7, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2006 Glenn Randers-Pehrson
 * Copyright (c) 1998, Intel Corporation
@@ -1739,6 +1739,7 @@ png_do_read_interlace(png_structp png_ptr)
                     int dummy_value_c;   // fix 'forbidden register spilled'
                     int dummy_value_S;
                     int dummy_value_D;
+                     int dummy_value_a;

                     __asm__ __volatile__ (
                        "subl $21, %%edi         \n\t"
@@ -1746,7 +1747,7 @@ png_do_read_interlace(png_structp png_ptr)

                     ".loop3_pass0:              \n\t"
                        "movd (%%esi), %%mm0     \n\t" // x x x x x 2 1 0
-                        "pand _const4, %%mm0     \n\t" // z z z z z 2 1 0
+                        "pand (%3), %%mm0        \n\t" // z z z z z 2 1 0
                        "movq %%mm0, %%mm1       \n\t" // z z z z z 2 1 0
                        "psllq $16, %%mm0        \n\t" // z z z 2 1 0 z z
                        "movq %%mm0, %%mm2       \n\t" // z z z 2 1 0 z z
@@ -1771,12 +1772,14 @@ png_do_read_interlace(png_structp png_ptr)

                        : "=c" (dummy_value_c),        // output regs (dummy)
                          "=S" (dummy_value_S),
-                          "=D" (dummy_value_D)
+                          "=D" (dummy_value_D),
+                          "=a" (dummy_value_a)
+

                        : "1" (sptr),      // esi      // input regs
                          "2" (dp),        // edi
                          "0" (width),     // ecx
-                          "rim" (_const4)  // %1(?)  (0x0000000000FFFFFFLL)
+                          "3" (&_const4)  // %1(?)  (0x0000000000FFFFFFLL)

 #if 0  /* %mm0, ..., %mm4 not supported by gcc 2.7.2.3 or egcs 1.1 */
                        : "%mm0", "%mm1", "%mm2"       // clobber list
@@ -1789,6 +1792,7 @@ png_do_read_interlace(png_structp png_ptr)
                     int dummy_value_c;   // fix 'forbidden register spilled'
                     int dummy_value_S;
                     int dummy_value_D;
+                     int dummy_value_a;

                     __asm__ __volatile__ (
                        "subl $9, %%edi          \n\t"
@@ -1796,7 +1800,7 @@ png_do_read_interlace(png_structp png_ptr)

                     ".loop3_pass2:              \n\t"
                        "movd (%%esi), %%mm0     \n\t" // x x x x x 2 1 0
-                        "pand _const4, %%mm0     \n\t" // z z z z z 2 1 0
+                        "pand (%3), %%mm0     \n\t" // z z z z z 2 1 0
                        "movq %%mm0, %%mm1       \n\t" // z z z z z 2 1 0
                        "psllq $16, %%mm0        \n\t" // z z z 2 1 0 z z
                        "movq %%mm0, %%mm2       \n\t" // z z z 2 1 0 z z
@@ -1815,12 +1819,13 @@ png_do_read_interlace(png_structp png_ptr)

                        : "=c" (dummy_value_c),        // output regs (dummy)
                          "=S" (dummy_value_S),
-                          "=D" (dummy_value_D)
+                          "=D" (dummy_value_D),
+                          "=a" (dummy_value_a)

                        : "1" (sptr),      // esi      // input regs
                          "2" (dp),        // edi
                          "0" (width),     // ecx
-                          "rim" (_const4)  // (0x0000000000FFFFFFLL)
+                          "3" (&_const4)  // (0x0000000000FFFFFFLL)

 #if 0  /* %mm0, ..., %mm2 not supported by gcc 2.7.2.3 or egcs 1.1 */
                        : "%mm0", "%mm1", "%mm2"       // clobber list
@@ -1841,6 +1846,8 @@ png_do_read_interlace(png_structp png_ptr)
                        int dummy_value_c;  // fix 'forbidden register spilled'
                        int dummy_value_S;
                        int dummy_value_D;
+                        int dummy_value_a;
+                        int dummy_value_d;

                        __asm__ __volatile__ (
                           "subl $3, %%esi          \n\t"
@@ -1852,14 +1859,14 @@ png_do_read_interlace(png_structp png_ptr)
                           "movq %%mm0, %%mm1       \n\t" // x x 5 4 3 2 1 0
                           "movq %%mm0, %%mm2       \n\t" // x x 5 4 3 2 1 0
                           "psllq $24, %%mm0        \n\t" // 4 3 2 1 0 z z z
-                           "pand _const4, %%mm1     \n\t" // z z z z z 2 1 0
+                           "pand (%3), %%mm1          \n\t" // z z z z z 2 1 0
                           "psrlq $24, %%mm2        \n\t" // z z z x x 5 4 3
                           "por %%mm1, %%mm0        \n\t" // 4 3 2 1 0 2 1 0
                           "movq %%mm2, %%mm3       \n\t" // z z z x x 5 4 3
                           "psllq $8, %%mm2         \n\t" // z z x x 5 4 3 z
                           "movq %%mm0, (%%edi)     \n\t"
                           "psrlq $16, %%mm3        \n\t" // z z z z z x x 5
-                           "pand _const6, %%mm3     \n\t" // z z z z z z z 5
+                           "pand (%4), %%mm3     \n\t" // z z z z z z z 5
                           "por %%mm3, %%mm2        \n\t" // z z x x 5 4 3 5
                           "subl $6, %%esi          \n\t"
                           "movd %%mm2, 8(%%edi)    \n\t"
@@ -1870,13 +1877,15 @@ png_do_read_interlace(png_structp png_ptr)

                           : "=c" (dummy_value_c),        // output regs (dummy)
                             "=S" (dummy_value_S),
-                             "=D" (dummy_value_D)
+                             "=D" (dummy_value_D),
+                             "=a" (dummy_value_a),
+                             "=d" (dummy_value_d)

                           : "1" (sptr),      // esi      // input regs
                             "2" (dp),        // edi
                             "0" (width_mmx), // ecx
-                             "rim" (_const4), // 0x0000000000FFFFFFLL
-                             "rim" (_const6)  // 0x00000000000000FFLL
+                             "3" (&_const4), // 0x0000000000FFFFFFLL
+                             "4" (&_const6)  // 0x00000000000000FFLL

 #if 0  /* %mm0, ..., %mm3 not supported by gcc 2.7.2.3 or egcs 1.1 */
                           : "%mm0", "%mm1"               // clobber list
@@ -5341,6 +5350,7 @@ int PNGAPI
 png_mmx_support(void)
 {
 #if defined(PNG_MMX_CODE_SUPPORTED)
+    int result;
    __asm__ __volatile__ (
        "pushl %%ebx          \n\t"  // ebx gets clobbered by CPUID instruction
        "pushl %%ecx          \n\t"  // so does ecx...
@@ -5382,7 +5392,6 @@ png_mmx_support(void)
    "0:                       \n\t"  // .NOT_SUPPORTED: target label for jump instructions
        "movl $0, %%eax       \n\t"  // set return value to 0
    "1:                       \n\t"  // .RETURN: target label for jump instructions
-        "movl %%eax, _mmx_supported \n\t" // save in global static variable, too
        "popl %%edx           \n\t"  // restore edx
        "popl %%ecx           \n\t"  // restore ecx
        "popl %%ebx           \n\t"  // restore ebx
@@ -5390,15 +5399,16 @@ png_mmx_support(void)
 //      "ret                  \n\t"  // DONE:  no MMX support
                                     // (fall through to standard C "ret")

-        :                            // output list (none)
+        : "=a" (result)              // output list

        :                            // any variables used on input (none)

-        : "%eax"                     // clobber list
+                                     // no clobber list
 //      , "%ebx", "%ecx", "%edx"     // GRR:  we handle these manually
 //      , "memory"   // if write to a variable gcc thought was in a reg
 //      , "cc"       // "condition codes" (flag bits)
    );
+    _mmx_supported = result;
 #else
    _mmx_supported = 0;
 #endif /* PNG_MMX_CODE_SUPPORTED */
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@

 /* pngget.c - retrieval of values from info struct
 *
- * Last changed in libpng 1.2.9 March 7, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2006 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -918,6 +918,7 @@ png_get_mmx_rowbytes_threshold (png_structp png_ptr)
    return (png_uint_32)(png_ptr? png_ptr->mmx_rowbytes_threshold : 0L);
 }
 #endif /* ?PNG_ASSEMBLER_CODE_SUPPORTED */
+#endif /* ?PNG_1_0_X */

 #ifdef PNG_SET_USER_LIMITS_SUPPORTED
 /* these functions were added to libpng 1.2.6 */
@@ -933,5 +934,4 @@ png_get_user_height_max (png_structp png_ptr)
 }
 #endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */

-#endif /* ?PNG_1_0_X */
 #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@

 /* pngmem.c - stub functions for memory allocation
 *
- * Last changed in libpng 1.2.9 March 7, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2006 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@

 /* pngread.c - read a PNG file
 *
- * Last changed in libpng 1.2.9 March 7, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2006 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -171,7 +171,7 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
   return (png_ptr);
 }

-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
 /* Initialize PNG structure for reading, and allocate any memory needed.
   This interface is deprecated in favour of the png_create_read_struct(),
   and it will disappear as of libpng-1.3.0. */
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,7 +1,7 @@

 /* pngrio.c - functions for data input
 *
- * Last changed in libpng 1.2.9 March 7, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2006 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -69,7 +69,7 @@ png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
 #define NEAR_BUF_SIZE 1024
 #define MIN(a,b) (a <= b ? a : b)

-static void /* PRIVATE */
+static void PNGAPI
 png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
 {
   int check;
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,7 +1,7 @@

 /* pngrtran.c - transforms the data in a row for PNG readers
 *
- * Last changed in libpng 1.2.9 March 7, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2006 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -551,7 +551,7 @@ void PNGAPI
 png_set_expand(png_structp png_ptr)
 {
   png_debug(1, "in png_set_expand\n");
-   png_ptr->transformations |= PNG_EXPAND;
+   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
 }

 /* GRR 19990627:  the following three functions currently are identical
@@ -566,30 +566,47 @@ png_set_expand(png_structp png_ptr)
 *
 *  More to the point, these functions make it obvious what libpng will be
 *  doing, whereas "expand" can (and does) mean any number of things.
+ *
+ *  GRP 20060307: In libpng-1.4.0, png_set_gray_1_2_4_to_8() was modified
+ *  to expand only the sample depth but not to expand the tRNS to alpha.
 */

 /* Expand paletted images to RGB. */
 void PNGAPI
 png_set_palette_to_rgb(png_structp png_ptr)
 {
-   png_debug(1, "in png_set_expand\n");
-   png_ptr->transformations |= PNG_EXPAND;
+   png_debug(1, "in png_set_palette_to_rgb\n");
+   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
 }

+#if !defined(PNG_1_0_X)
 /* Expand grayscale images of less than 8-bit depth to 8 bits. */
 void PNGAPI
+png_set_expand_gray_1_2_4_to_8(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_expand_gray_1_2_4_to_8\n");
+   png_ptr->transformations |= PNG_EXPAND_tRNS;
+}
+#endif
+
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* Expand grayscale images of less than 8-bit depth to 8 bits. */
+/* Deprecated as of libpng-1.2.9 */
+void PNGAPI
 png_set_gray_1_2_4_to_8(png_structp png_ptr)
 {
-   png_debug(1, "in png_set_expand\n");
-   png_ptr->transformations |= PNG_EXPAND;
+   png_debug(1, "in png_set_gray_1_2_4_to_8\n");
+   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
 }
+#endif
+

 /* Expand tRNS chunks to alpha channels. */
 void PNGAPI
 png_set_tRNS_to_alpha(png_structp png_ptr)
 {
   png_debug(1, "in png_set_expand\n");
-   png_ptr->transformations |= PNG_EXPAND;
+   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
 }
 #endif /* defined(PNG_READ_EXPAND_SUPPORTED) */

@@ -707,23 +724,41 @@ png_init_read_transformations(png_structp png_ptr)
   {
      if (!(color_type & PNG_COLOR_MASK_COLOR))  /* i.e., GRAY or GRAY_ALPHA */
      {
-         /* expand background chunk. */
+         /* expand background and tRNS chunks */
         switch (png_ptr->bit_depth)
         {
            case 1:
               png_ptr->background.gray *= (png_uint_16)0xff;
               png_ptr->background.red = png_ptr->background.green
                 =  png_ptr->background.blue = png_ptr->background.gray;
+               if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+               {
+                 png_ptr->trans_values.gray *= (png_uint_16)0xff;
+                 png_ptr->trans_values.red = png_ptr->trans_values.green
+                   = png_ptr->trans_values.blue = png_ptr->trans_values.gray;
+               }
               break;
            case 2:
               png_ptr->background.gray *= (png_uint_16)0x55;
               png_ptr->background.red = png_ptr->background.green
                 = png_ptr->background.blue = png_ptr->background.gray;
+               if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+               {
+                 png_ptr->trans_values.gray *= (png_uint_16)0x55;
+                 png_ptr->trans_values.red = png_ptr->trans_values.green
+                   = png_ptr->trans_values.blue = png_ptr->trans_values.gray;
+               }
               break;
            case 4:
               png_ptr->background.gray *= (png_uint_16)0x11;
               png_ptr->background.red = png_ptr->background.green
                 = png_ptr->background.blue = png_ptr->background.gray;
+               if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+               {
+                 png_ptr->trans_values.gray *= (png_uint_16)0x11;
+                 png_ptr->trans_values.red = png_ptr->trans_values.green
+                   = png_ptr->trans_values.blue = png_ptr->trans_values.gray;
+               }
               break;
            case 8:
            case 16:
@@ -745,7 +780,7 @@ png_init_read_transformations(png_structp png_ptr)
        if (png_ptr->transformations & PNG_INVERT_ALPHA)
        {
 #if defined(PNG_READ_EXPAND_SUPPORTED)
-           if (!(png_ptr->transformations & PNG_EXPAND))
+           if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
 #endif
           {
           /* invert the alpha channel (in tRNS) unless the pixels are
@@ -1045,7 +1080,7 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
   {
      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
      {
-         if (png_ptr->num_trans)
+         if (png_ptr->num_trans && (png_ptr->transformations & PNG_EXPAND_tRNS))
            info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
         else
            info_ptr->color_type = PNG_COLOR_TYPE_RGB;
@@ -1055,7 +1090,12 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
      else
      {
         if (png_ptr->num_trans)
-            info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
+         {
+            if (png_ptr->transformations & PNG_EXPAND_tRNS)
+              info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
+            else
+              info_ptr->color_type |= PNG_COLOR_MASK_COLOR;
+         }
         if (info_ptr->bit_depth < 8)
            info_ptr->bit_depth = 8;
         info_ptr->num_trans = 0;
@@ -1201,7 +1241,7 @@ png_do_read_transformations(png_structp png_ptr)
      }
      else
      {
-         if (png_ptr->num_trans)
+         if (png_ptr->num_trans && (png_ptr->transformations & PNG_EXPAND_tRNS))
            png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1,
               &(png_ptr->trans_values));
         else
@@ -3604,8 +3644,8 @@ png_do_expand_palette(png_row_infop row_info, png_bytep row,
   }
 }

-/* If the bit depth < 8, it is expanded to 8.  Also, if the
- * transparency value is supplied, an alpha channel is built.
+/* If the bit depth < 8, it is expanded to 8.  Also, if the already
+ * expanded transparency value is supplied, an alpha channel is built.
 */
 void /* PRIVATE */
 png_do_expand(png_row_infop row_info, png_bytep row,
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@

 /* pngrutil.c - utilities to read a PNG file
 *
- * Last changed in libpng 1.2.9 March 7, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2006 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -620,7 +620,7 @@ png_handle_gAMA(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
      }

 #if defined(PNG_READ_sRGB_SUPPORTED)
-   if (info_ptr->valid & PNG_INFO_sRGB)
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
      if (PNG_OUT_OF_RANGE(igamma, 45500L, 500))
      {
         png_warning(png_ptr,
@@ -829,7 +829,7 @@ png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 #endif

 #if defined(PNG_READ_sRGB_SUPPORTED)
-   if (info_ptr->valid & PNG_INFO_sRGB)
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
      {
      if (PNG_OUT_OF_RANGE(int_x_white, 31270,  1000) ||
          PNG_OUT_OF_RANGE(int_y_white, 32900,  1000) ||
@@ -924,7 +924,7 @@ png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
   }

 #if defined(PNG_READ_gAMA_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
-   if ((info_ptr->valid & PNG_INFO_gAMA))
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA))
   {
   png_fixed_point igamma;
 #ifdef PNG_FIXED_POINT_SUPPORTED
@@ -953,7 +953,7 @@ png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)

 #ifdef PNG_READ_cHRM_SUPPORTED
 #ifdef PNG_FIXED_POINT_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_cHRM)
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
      if (PNG_OUT_OF_RANGE(info_ptr->int_x_white, 31270,  1000) ||
          PNG_OUT_OF_RANGE(info_ptr->int_y_white, 32900,  1000) ||
          PNG_OUT_OF_RANGE(info_ptr->int_x_red,   64000L, 1000) ||
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@

 /* pngset.c - storage of image information into info struct
 *
- * Last changed in libpng 1.2.9 March 7, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2006 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -950,6 +950,9 @@ png_set_sPLT(png_structp png_ptr,
    png_sPLT_tp np;
    int i;

+    if (png_ptr == NULL || info_ptr == NULL)
+       return;
+
    np = (png_sPLT_tp)png_malloc_warn(png_ptr,
        (info_ptr->splt_palettes_num + nentries) * png_sizeof(png_sPLT_t));
    if (np == NULL)
@@ -1052,7 +1055,7 @@ png_set_unknown_chunk_location(png_structp png_ptr, png_infop info_ptr,
 }
 #endif

-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
 #if defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
 void PNGAPI
@@ -1090,6 +1093,8 @@ png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_bytep
 {
    png_bytep new_list, p;
    int i, old_num_chunks;
+    if (png_ptr == NULL)
+       return;
    if (num_chunks == 0)
    {
      if(keep == PNG_HANDLE_CHUNK_ALWAYS || keep == PNG_HANDLE_CHUNK_IF_SAFE)
@@ -1133,6 +1138,8 @@ png_set_read_user_chunk_fn(png_structp png_ptr, png_voidp user_chunk_ptr,
   png_user_chunk_ptr read_user_chunk_fn)
 {
   png_debug(1, "in png_set_read_user_chunk_fn\n");
+   if (png_ptr == NULL)
+      return;
   png_ptr->read_user_chunk_fn = read_user_chunk_fn;
   png_ptr->user_chunk_ptr = user_chunk_ptr;
 }
@@ -1159,6 +1166,8 @@ png_set_rows(png_structp png_ptr, png_infop info_ptr, png_bytepp row_pointers)
 void PNGAPI
 png_set_compression_buffer_size(png_structp png_ptr, png_uint_32 size)
 {
+    if (png_ptr == NULL)
+       return;
    if(png_ptr->zbuf)
       png_free(png_ptr, png_ptr->zbuf);
    png_ptr->zbuf_size = (png_size_t)size;
@@ -1185,6 +1194,9 @@ png_set_asm_flags (png_structp png_ptr, png_uint_32 asm_flags)
    png_uint_32 settable_asm_flags;
    png_uint_32 settable_mmx_flags;

+    if (png_ptr == NULL)
+       return;
+
    settable_mmx_flags =
 #ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW
                         PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  |
@@ -1227,6 +1239,8 @@ png_set_mmx_thresholds (png_structp png_ptr,
                        png_byte mmx_bitdepth_threshold,
                        png_uint_32 mmx_rowbytes_threshold)
 {
+    if (png_ptr == NULL)
+       return;
    png_ptr->mmx_bitdepth_threshold = mmx_bitdepth_threshold;
    png_ptr->mmx_rowbytes_threshold = mmx_rowbytes_threshold;
 }
--- a/pngtest.c
+++ b/pngtest.c
@@ -1551,4 +1551,4 @@ main(int argc, char *argv[])
 }

 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_9beta7 your_png_h_is_not_version_1_2_9beta7;
+typedef version_1_2_9beta10 your_png_h_is_not_version_1_2_9beta10;
--- a/pngtrans.c
+++ b/pngtrans.c
@@ -1,7 +1,7 @@

 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
 *
- * Last changed in libpng 1.2.9 March 7, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2006 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@

 /* pngwrite.c - general routines to write a PNG file
 *
- * Last changed in libpng 1.2.9 March 7, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2006 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -26,6 +26,8 @@ void PNGAPI
 png_write_info_before_PLTE(png_structp png_ptr, png_infop info_ptr)
 {
   png_debug(1, "in png_write_info_before_PLTE\n");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
   if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
   {
   png_write_sig(png_ptr); /* write PNG signature */
@@ -128,6 +130,9 @@ png_write_info(png_structp png_ptr, png_infop info_ptr)

   png_debug(1, "in png_write_info\n");

+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
   png_write_info_before_PLTE(png_ptr, info_ptr);

   if (info_ptr->valid & PNG_INFO_PLTE)
@@ -290,6 +295,8 @@ void PNGAPI
 png_write_end(png_structp png_ptr, png_infop info_ptr)
 {
   png_debug(1, "in png_write_end\n");
+   if (png_ptr == NULL)
+      return;
   if (!(png_ptr->mode & PNG_HAVE_IDAT))
      png_error(png_ptr, "No IDATs written into file");

@@ -554,7 +561,7 @@ png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
 }

 /* Initialize png_ptr structure, and allocate any memory needed */
-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
 /* Deprecated. */
 #undef png_write_init
 void PNGAPI
@@ -617,6 +624,10 @@ png_write_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver,
 #ifdef PNG_SETJMP_SUPPORTED
   jmp_buf tmp_jmp; /* to save current jump buffer */
 #endif
+
+   if (png_ptr == NULL)
+      return;
+
   int i = 0;
   do
   {
@@ -694,6 +705,10 @@ png_write_rows(png_structp png_ptr, png_bytepp row,
   png_bytepp rp; /* row pointer */

   png_debug(1, "in png_write_rows\n");
+
+   if (png_ptr == NULL)
+      return;
+
   /* loop through the rows */
   for (i = 0, rp = row; i < num_rows; i++, rp++)
   {
@@ -711,6 +726,9 @@ png_write_image(png_structp png_ptr, png_bytepp image)
   int pass, num_pass; /* pass variables */
   png_bytepp rp; /* points to current row */

+   if (png_ptr == NULL)
+      return;
+
   png_debug(1, "in png_write_image\n");
 #if defined(PNG_WRITE_INTERLACING_SUPPORTED)
   /* intialize interlace handling.  If image is not interlaced,
@@ -734,8 +752,11 @@ png_write_image(png_structp png_ptr, png_bytepp image)
 void PNGAPI
 png_write_row(png_structp png_ptr, png_bytep row)
 {
+   if (png_ptr == NULL)
+      return;
   png_debug2(1, "in png_write_row (row %ld, pass %d)\n",
      png_ptr->row_number, png_ptr->pass);
+
   /* initialize transformations and other stuff if first time */
   if (png_ptr->row_number == 0 && png_ptr->pass == 0)
   {
@@ -909,6 +930,8 @@ void PNGAPI
 png_set_flush(png_structp png_ptr, int nrows)
 {
   png_debug(1, "in png_set_flush\n");
+   if (png_ptr == NULL)
+      return;
   png_ptr->flush_dist = (nrows < 0 ? 0 : nrows);
 }

@@ -919,6 +942,8 @@ png_write_flush(png_structp png_ptr)
   int wrote_IDAT;

   png_debug(1, "in png_write_flush\n");
+   if (png_ptr == NULL)
+      return;
   /* We have already written out all of the data */
   if (png_ptr->row_number >= png_ptr->num_rows)
     return;
@@ -1095,6 +1120,8 @@ void PNGAPI
 png_set_filter(png_structp png_ptr, int method, int filters)
 {
   png_debug(1, "in png_set_filter\n");
+   if (png_ptr == NULL)
+      return;
 #if defined(PNG_MNG_FEATURES_SUPPORTED)
   if((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
      (method == PNG_INTRAPIXEL_DIFFERENCING))
@@ -1203,6 +1230,8 @@ png_set_filter_heuristics(png_structp png_ptr, int heuristic_method,
   int i;

   png_debug(1, "in png_set_filter_heuristics\n");
+   if (png_ptr == NULL)
+      return;
   if (heuristic_method >= PNG_FILTER_HEURISTIC_LAST)
   {
      png_warning(png_ptr, "Unknown filter heuristic method");
@@ -1315,6 +1344,8 @@ void PNGAPI
 png_set_compression_level(png_structp png_ptr, int level)
 {
   png_debug(1, "in png_set_compression_level\n");
+   if (png_ptr == NULL)
+      return;
   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_LEVEL;
   png_ptr->zlib_level = level;
 }
@@ -1323,6 +1354,8 @@ void PNGAPI
 png_set_compression_mem_level(png_structp png_ptr, int mem_level)
 {
   png_debug(1, "in png_set_compression_mem_level\n");
+   if (png_ptr == NULL)
+      return;
   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL;
   png_ptr->zlib_mem_level = mem_level;
 }
@@ -1331,6 +1364,8 @@ void PNGAPI
 png_set_compression_strategy(png_structp png_ptr, int strategy)
 {
   png_debug(1, "in png_set_compression_strategy\n");
+   if (png_ptr == NULL)
+      return;
   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_STRATEGY;
   png_ptr->zlib_strategy = strategy;
 }
@@ -1338,6 +1373,8 @@ png_set_compression_strategy(png_structp png_ptr, int strategy)
 void PNGAPI
 png_set_compression_window_bits(png_structp png_ptr, int window_bits)
 {
+   if (png_ptr == NULL)
+      return;
   if (window_bits > 15)
      png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");
   else if (window_bits < 8)
@@ -1358,6 +1395,8 @@ void PNGAPI
 png_set_compression_method(png_structp png_ptr, int method)
 {
   png_debug(1, "in png_set_compression_method\n");
+   if (png_ptr == NULL)
+      return;
   if (method != 8)
      png_warning(png_ptr, "Only compression method 8 is supported by PNG");
   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_METHOD;
@@ -1367,6 +1406,8 @@ png_set_compression_method(png_structp png_ptr, int method)
 void PNGAPI
 png_set_write_status_fn(png_structp png_ptr, png_write_status_ptr write_row_fn)
 {
+   if (png_ptr == NULL)
+      return;
   png_ptr->write_row_fn = write_row_fn;
 }

@@ -1376,6 +1417,8 @@ png_set_write_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
   write_user_transform_fn)
 {
   png_debug(1, "in png_set_write_user_transform_fn\n");
+   if (png_ptr == NULL)
+      return;
   png_ptr->transformations |= PNG_USER_TRANSFORM;
   png_ptr->write_user_transform_fn = write_user_transform_fn;
 }
@@ -1387,6 +1430,8 @@ void PNGAPI
 png_write_png(png_structp png_ptr, png_infop info_ptr,
              int transforms, voidp params)
 {
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
 #if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
   /* invert the alpha channel from opacity to transparency */
   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
--- a/pngwtran.c
+++ b/pngwtran.c
@@ -1,7 +1,7 @@

 /* pngwtran.c - transforms the data in a row for PNG writers
 *
- * Last changed in libpng 1.2.9 March 7, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2006 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@

 /* pngwutil.c - utilities to write a PNG file
 *
- * Last changed in libpng 1.2.9 March 7, 2006
+ * Last changed in libpng 1.2.9 March 20, 2006
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2006 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@

 # Modeled after libxml-config.

-version=1.2.9beta7
+version=1.2.9beta10
 prefix=""
 libdir=""
 libs=""
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -7,7 +7,7 @@

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)

 CC=cc
@@ -126,8 +126,8 @@ test: pngtest
 	./pngtest

 install-headers: png.h pngconf.h
-	-@if [ ! -d $(DI) ]; then mkdir $(DI); fi
-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi
+	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
+	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
 	cp png.h pngconf.h $(DI)/$(LIBNAME)
 	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h
 	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h
@@ -135,7 +135,7 @@ install-headers: png.h pngconf.h
 	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)

 install-static: install-headers libpng.a
-	-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	cp libpng.a $(DL)/$(LIBNAME).a
 	chmod 644 $(DL)/$(LIBNAME).a
 	-@$(RM_F) $(DL)/libpng.a
@@ -143,7 +143,7 @@ install-static: install-headers libpng.a

 install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	libpng.so.0.$(PNGMIN)
-	-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	-@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
 	-@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGMAJ)
 	-@$(RM_F) $(DL)/$(LIBNAME).so
@@ -159,7 +159,7 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	$(LN_SF) libpng.so.0 libpng.so; \
 	$(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
 	$(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-	-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
+	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
 	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
 	-@$(RM_F) $(DL)/pkgconfig/libpng.pc
 	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
@@ -167,18 +167,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(DM) ]; then mkdir $(DM); fi
-	-@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi
+	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
+	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
 	-@$(RM_F) $(DM)/man3/libpng.3
 	-@$(RM_F) $(DM)/man3/libpngpf.3
 	cp libpng.3 $(DM)/man3
 	cp libpngpf.3 $(DM)/man3
-	-@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi
+	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
 	-@$(RM_F) $(DM)/man5/png.5
 	cp png.5 $(DM)/man5

 install-config: libpng-config
-	-@if [ ! -d $(DB) ]; then mkdir $(DB); fi
+	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
 	-@$(RM_F) $(DB)/libpng-config
 	-@$(RM_F) $(DB)/$(LIBNAME)-config
 	cp libpng-config $(DB)/$(LIBNAME)-config
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -7,7 +7,7 @@

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)

 CC=cc
@@ -126,8 +126,8 @@ test: pngtest
 	./pngtest

 install-headers: png.h pngconf.h
-	-@if [ ! -d $(DI) ]; then mkdir $(DI); fi
-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi
+	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
+	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
 	cp png.h pngconf.h $(DI)/$(LIBNAME)
 	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h
 	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h
@@ -135,7 +135,7 @@ install-headers: png.h pngconf.h
 	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)

 install-static: install-headers libpng.a
-	-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	cp libpng.a $(DL)/$(LIBNAME).a
 	chmod 644 $(DL)/$(LIBNAME).a
 	-@$(RM_F) $(DL)/libpng.a
@@ -143,7 +143,7 @@ install-static: install-headers libpng.a

 install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	libpng.so.0.$(PNGMIN)
-	-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	-@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
 	-@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGMAJ)
 	-@$(RM_F) $(DL)/$(LIBNAME).so
@@ -159,7 +159,7 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	$(LN_SF) libpng.so.0 libpng.so; \
 	$(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
 	$(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-	-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
+	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
 	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
 	-@$(RM_F) $(DL)/pkgconfig/libpng.pc
 	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
@@ -167,18 +167,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(DM) ]; then mkdir $(DM); fi
-	-@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi
+	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
+	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
 	-@$(RM_F) $(DM)/man3/libpng.3
 	-@$(RM_F) $(DM)/man3/libpngpf.3
 	cp libpng.3 $(DM)/man3
 	cp libpngpf.3 $(DM)/man3
-	-@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi
+	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
 	-@$(RM_F) $(DM)/man5/png.5
 	cp png.5 $(DM)/man5

 install-config: libpng-config
-	-@if [ ! -d $(DB) ]; then mkdir $(DB); fi
+	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
 	-@$(RM_F) $(DB)/libpng-config
 	-@$(RM_F) $(DB)/$(LIBNAME)-config
 	cp libpng-config $(DB)/$(LIBNAME)-config
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -13,13 +13,14 @@ ZLIBLIB = ../zlib
 CC = gcc
 LD = $(CC)
 AR_RC = ar rcs
+MKDIR_P = mkdir -p
 RANLIB = ranlib
 RM_F = rm -f
 LN_SF = ln -f -s

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)

 prefix=/usr/local
@@ -71,9 +72,9 @@ pngtest$(E): pngtest$(O) $(LIBNAME)$(A)
 	$(LD) -o $@ pngtest$(O) $(LDFLAGS)

 install: $(LIBNAME)$(A)
-	-@if [ ! -d $(DI)  ]; then mkdir $(DI); fi
-	-@if [ ! -d $(DI)/$(LIBNAME)  ]; then mkdir $(DI)/$(LIBNAME); fi
-	-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+	-@if [ ! -d $(DI)  ]; then $(MKDIR_P) $(DI); fi
+	-@if [ ! -d $(DI)/$(LIBNAME)  ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	-@$(RM_F) $(DI)/$(LIBNAME)/png.h
 	-@$(RM_F) $(DI)/$(LIBNAME)/pngconf.h
 	-@$(RM_F) $(DI)/png.h
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -7,7 +7,7 @@

 CC=gcc
 AR_RC=ar rc
-MKDIR_P=mkdir
+MKDIR_P=mkdir -p
 LN_SF=ln -sf
 RANLIB=ranlib
 RM_F=/bin/rm -f
@@ -17,7 +17,7 @@ ZLIBLIB=/usr/local/lib
 ZLIBINC=/usr/local/include

 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)

 ALIGN=
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -3,8 +3,8 @@
 #   of the library, and builds two copies of pngtest: one
 #   statically linked and one dynamically linked.
 #
-# Copyright (C) 2002 Soren Anderson, Charles Wilson, and Glenn Randers-Pehrson
-#   based on makefile for linux-elf w/mmx by:
+# Copyright (C) 2002, 2006 Soren Anderson, Charles Wilson,
+#    and Glenn Randers-Pehrson, based on makefile for linux-elf w/mmx by:
 # Copyright (C) 1998-2000 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 # For conditions of distribution and use, see copyright notice in png.h
@@ -80,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng12
 PNGMAJ = 0
 CYGDLL = 12
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)

 SHAREDLIB=cygpng$(CYGDLL).dll
@@ -94,7 +94,7 @@ LDFLAGS=$(strip -L. $(MINGW_LDFLAGS) -lpng $(addprefix -L,$(ZLIBLIB)) -lz)
 LDSFLAGS=$(strip -shared -L.  $(MINGW_LDFLAGS) -Wl,--export-all)
 LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz

-MKDIR=/bin/mkdir -pv
+MKDIR_P=/bin/mkdir -pv
 RANLIB=ranlib
 #RANLIB=echo

@@ -205,15 +205,15 @@ test-shared: pngtest$(EXE)
 	./pngtest $(S)/pngtest.png

 install-static: $(STATLIB) install-headers install-man
-	-@if [ ! -d $(DL) ]; then $(MKDIR) $(DL); fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	install -m 644 $(STATLIB) $(DL)/$(LIBNAME).a
 	-@rm -f $(DL)/$(STATLIB)
 	(cd $(DL); ln -sf $(LIBNAME).a $(STATLIB))

 install-shared: $(SHAREDLIB) libpng.pc libpng-config install-headers install-man
-	-@if [ ! -d $(DL) ]; then $(MKDIR) $(DL); fi
-	-@if [ ! -d $(DB) ]; then $(MKDIR) $(DB); fi
-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR) $(DL)/pkgconfig; fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
+	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
+	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
 	-@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DL)/pkgconfig/libpng.pc
 	install -m 644 $(IMPLIB) $(DL)/$(LIBNAME).dll.a
@@ -224,8 +224,8 @@ install-shared: $(SHAREDLIB) libpng.pc libpng-config install-headers install-man
 	(cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)

 install-headers:
-	-@if [ ! -d $(DI) ]; then $(MKDIR) $(DI); fi
-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR) $(DI)/$(LIBNAME); fi
+	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
+	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
 	-@rm -f $(DI)/png.h
 	-@rm -f $(DI)/pngconf.h
 	install -m 644 $(S)/png.h $(S)/pngconf.h $(DI)/$(LIBNAME)
@@ -233,13 +233,13 @@ install-headers:
 	(cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)

 install-man:
-	-@if [ ! -d $(D)$(MAN3PATH) ]; then $(MKDIR) $(D)$(MAN3PATH); fi
-	-@if [ ! -d $(D)$(MAN5PATH) ]; then $(MKDIR) $(D)$(MAN5PATH); fi
+	-@if [ ! -d $(D)$(MAN3PATH) ]; then $(MKDIR_P) $(D)$(MAN3PATH); fi
+	-@if [ ! -d $(D)$(MAN5PATH) ]; then $(MKDIR_P) $(D)$(MAN5PATH); fi
 	install -m 644 $(S)/libpngpf.3 $(S)/libpng.3 $(D)$(MAN3PATH)
 	install -m 644 $(S)/png.5 $(D)$(MAN5PATH)

 install-config: libpng-config
-	-@if [ ! -d $(DB) ]; then mkdir $(DB); fi
+	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
 	-@/bin/rm -f $(DB)/libpng-config
 	-@/bin/rm -f $(DB)/$(LIBNAME)-config
 	cp libpng-config $(DB)/$(LIBNAME)-config
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -18,7 +18,7 @@ ZLIBINC=../zlib

 CC=cc
 AR_RC=ar rc
-MKDIR_P=mkdir
+MKDIR_P=mkdir -p
 LN_SF=ln -sf
 RANLIB=ranlib
 RM_F=/bin/rm -f
@@ -27,7 +27,7 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz

 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -108,8 +108,8 @@ test: pngtest
 	./pngtest

 install-headers: png.h pngconf.h
-	-@if [ ! -d $(DI) ]; then mkdir $(DI); fi
-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi
+	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
+	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
 	cp png.h pngconf.h $(DI)/$(LIBNAME)
 	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h
 	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h
@@ -117,7 +117,7 @@ install-headers: png.h pngconf.h
 	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)

 install-static: install-headers libpng.a
-	-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	cp libpng.a $(DL)/$(LIBNAME).a
 	chmod 644 $(DL)/$(LIBNAME).a
 	$(RANLIB) $(DL)/$(LIBNAME).a
@@ -126,7 +126,7 @@ install-static: install-headers libpng.a

 install-shared: install-headers $(LIBNAME).dylib libpng.pc \
 	libpng.3.$(PNGMIN).dylib
-	-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	-@$(RM_F) $(DL)/$(LIBNAME).$(PNGVER)*.dylib
 	-@$(RM_F) $(DL)/$(LIBNAME).$(PNGMAJ)*.dylib
 	-@$(RM_F) $(DL)/$(LIBNAME).dylib
@@ -142,7 +142,7 @@ install-shared: install-headers $(LIBNAME).dylib libpng.pc \
 	$(LN_SF) libpng.3.dylib libpng.dylib; \
 	$(LN_SF) $(LIBNAME).$(PNGVER).dylib $(LIBNAME).$(PNGMAJ).dylib; \
 	$(LN_SF) $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib)
-	-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
+	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
 	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
 	-@$(RM_F) $(DL)/pkgconfig/libpng.pc
 	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
@@ -150,18 +150,18 @@ install-shared: install-headers $(LIBNAME).dylib libpng.pc \
 	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(DM) ]; then mkdir $(DM); fi
-	-@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi
+	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
+	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
 	-@$(RM_F) $(DM)/man3/libpng.3
 	-@$(RM_F) $(DM)/man3/libpngpf.3
 	cp libpng.3 $(DM)/man3
 	cp libpngpf.3 $(DM)/man3
-	-@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi
+	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
 	-@$(RM_F) $(DM)/man5/png.5
 	cp png.5 $(DM)/man5

 install-config: libpng-config
-	-@if [ ! -d $(DB) ]; then mkdir $(DB); fi
+	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
 	-@$(RM_F) $(DB)/libpng-config
 	-@$(RM_F) $(DB)/$(LIBNAME)-config
 	cp libpng-config $(DB)/$(LIBNAME)-config
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -33,7 +33,7 @@ ZLIBLIB=../zlib
 ZLIBINC=../zlib

 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -91,8 +91,8 @@ test: pngtest
 	./pngtest

 install-headers: png.h pngconf.h
-	-@if [ ! -d $(DI) ]; then mkdir $(DI); fi
-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi
+	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
+	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
 	cp png.h pngconf.h $(DI)/$(LIBNAME)
 	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h
 	-@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h
@@ -100,7 +100,7 @@ install-headers: png.h pngconf.h
 	(cd $(DI); $(LN_SF)(LIBNAME) libpng; $(LN_SF)(LIBNAME)/* .)

 install-static: install-headers libpng.a
-	-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	cp libpng.a $(DL)/$(LIBNAME).a
 	chmod 644 $(DL)/$(LIBNAME).a
 	-@/bin/rm -f $(DL)/libpng.a
@@ -108,7 +108,7 @@ install-static: install-headers libpng.a

 install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	libpng.so.0.$(PNGMIN)
-	-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
 	-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
 	-@/bin/rm -f $(DL)/libpng.so
@@ -123,7 +123,7 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	$(LN_SF) libpng.so.0 libpng.so; \
 	$(LN_SF)(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
 	$(LN_SF)(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-	-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
+	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
 	-@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DL)/pkgconfig/libpng.pc
 	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
@@ -131,18 +131,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	(cd $(DL)/pkgconfig; $(LN_SF)(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(DM) ]; then mkdir $(DM); fi
-	-@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi
+	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
+	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
 	-@/bin/rm -f $(DM)/man3/libpng.3
 	-@/bin/rm -f $(DM)/man3/libpngpf.3
 	cp libpng.3 $(DM)/man3
 	cp libpngpf.3 $(DM)/man3
-	-@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi
+	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
 	-@/bin/rm -f $(DM)/man5/png.5
 	cp png.5 $(DM)/man5

 install-config: libpng-config
-	-@if [ ! -d $(DB) ]; then mkdir $(DB); fi
+	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
 	-@/bin/rm -f $(DB)/libpng-config
 	-@/bin/rm -f $(DB)/$(LIBNAME)-config
 	cp libpng-config $(DB)/$(LIBNAME)-config
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -11,7 +11,7 @@

 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)

 AR_RC=ar rc
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -15,7 +15,7 @@

 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Compiler, linker, lib and other tools
@@ -23,7 +23,7 @@ CC = gcc
 LD = $(CC)
 AR_RC = ar rc
 LN_SF = ln -sf
-MKDIR_P = mkdir
+MKDIR_P = mkdir -p
 RANLIB = ranlib
 RM_F = /bin/rm -f

--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -17,7 +17,7 @@ ZLIBINC=/opt/zlib/include

 AR_RC=ar rc
 CC=cc
-MKDIR_P=mkdir
+MKDIR_P=mkdir -p
 LN_SF=ln -sf
 RANLIB=ranlib
 RM_F=/bin/rm -f
@@ -32,7 +32,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm


 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
 CC=gcc
 LD=ld
 AR_RC=ar rc
-MKDIR_P=mkdir
+MKDIR_P=mkdir -p
 LN_SF=ln -sf
 RANLIB=ranlib
 RM_F=/bin/rm -f
@@ -44,7 +44,7 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm

 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -17,7 +17,7 @@ ZLIBINC=/opt/zlib/include

 AR_RC=ar rc
 CC=cc
-MKDIR_P=mkdir
+MKDIR_P=mkdir -p
 LN_SF=ln -sf
 RANLIB=ranlib
 RM_F=/bin/rm -f
@@ -28,7 +28,7 @@ CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm

 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -5,7 +5,7 @@

 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)

 AR_RC=ar rc
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -0,0 +1,312 @@
+# makefile for mingw on x86
+#   Builds both dll (with import lib) and static lib versions
+#   of the library, and builds two copies of pngtest: one
+#   statically linked and one dynamically linked.
+#
+# Built from makefile.cygwin
+# Copyright (C) 2002, 2006 Soren Anderson, Charles Wilson,
+#    and Glenn Randers-Pehrson, based on makefile for linux-elf w/mmx by:
+# Copyright (C) 1998-2000 Greg Roelofs
+# Copyright (C) 1996, 1997 Andreas Dilger
+# For conditions of distribution and use, see copyright notice in png.h
+
+# This makefile intends to support building outside the src directory
+# if desired. When invoking it, specify an argument to SRCDIR on the
+# command line that points to the top of the directory where your source
+# is located.
+
+ifdef SRCDIR
+VPATH = $(SRCDIR)
+else
+SRCDIR = .
+endif
+
+# Override DESTDIR= on the make install command line to easily support
+# installing into a temporary location.  Example:
+#
+#    make install DESTDIR=/tmp/build/libpng
+#
+# If you're going to install into a temporary location
+# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
+# you execute make install.
+
+DESTDIR=
+
+# To enable assembler optimizations, add '-DPNG_USE_PNGGCCRD' to
+# $CFLAGS, and include pnggccrd.o in $OBJS, below, and in the dependency
+# list at the bottom of this makefile.
+
+CC=gcc
+
+
+# Where "make install" puts libpng*.a, *png*.dll, png.h, and pngconf.h
+ifndef prefix
+prefix=/usr
+$(warning You haven't specified a 'prefix=' location. Defaulting to "/usr")
+endif
+exec_prefix=$prefix
+
+# Where the zlib library and include files are located
+ZLIBLIB= /usr/lib
+ZLIBINC=
+
+ALIGN=
+# for i386:
+#ALIGN=-malign-loops=2 -malign-functions=2
+
+WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
+	-Wmissing-declarations -Wtraditional -Wcast-align \
+	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
+
+### if you use the asm, add pnggccrd.o to the OBJS list
+###
+### if you don't need thread safety, but want the asm accel
+#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD \
+#	$(addprefix -I,$(ZLIBINC)) -Wall -O3 $(ALIGN) -funroll-loops \
+#	-fomit-frame-pointer)  # $(WARNMORE) -g -DPNG_DEBUG=5
+### if you need thread safety and want (minimal) asm accel
+#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_USE_PNGGCCRD $(addprefix -I,$(ZLIBINC)) \
+#	-Wall -O3 $(ALIGN) -funroll-loops \
+#	-fomit-frame-pointer)  # $(WARNMORE) -g -DPNG_DEBUG=5
+### Normal (non-asm) compilation
+CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
+        -Wall -O3 $(ALIGN) -funroll-loops \
+	-fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
+
+LIBNAME = libpng12
+PNGMAJ = 0
+MINGDLL = 12
+PNGMIN = 1.2.9beta10
+PNGVER = $(PNGMAJ).$(PNGMIN)
+
+SHAREDLIB=libpng$(MINGDLL).dll
+STATLIB=libpng.a
+IMPLIB=libpng.dll.a
+SHAREDDEF=libpng.def
+LIBS=$(SHAREDLIB) $(STATLIB)
+EXE=.exe
+
+LDFLAGS=$(strip -L. $(MINGW_LDFLAGS) -lpng $(addprefix -L,$(ZLIBLIB)) -lz)
+LDSFLAGS=$(strip -shared -L.  $(MINGW_LDFLAGS))
+LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz
+
+MKDIR_P=/bin/mkdir -pv
+RANLIB=ranlib
+#RANLIB=echo
+
+INCPATH=$(prefix)/include
+LIBPATH=$(exec_prefix)/lib
+
+BINPATH=$(exec_prefix)/bin
+MANPATH=$(prefix)/man
+MAN3PATH=$(MANPATH)/man3
+MAN5PATH=$(MANPATH)/man5
+
+# cosmetic: shortened strings:
+S =$(SRCDIR)
+D =$(DESTDIR)
+DB =$(D)$(BINPATH)
+DI =$(D)$(INCPATH)
+DL =$(D)$(LIBPATH)
+
+OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
+	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
+	pngwtran.o pngmem.o pngerror.o pngpread.o # pnggccrd.o
+
+OBJSDLL = $(OBJS:.o=.pic.o)
+
+.SUFFIXES: .c .o .pic.o
+
+%.o : %.c
+	$(CC) -c $(CFLAGS) -o $@ $<
+%.pic.o : CFLAGS += -DPNG_BUILD_DLL
+%.pic.o : %.c
+	$(CC) -c $(CFLAGS) -o $@ $<
+
+all: all-static all-shared libpng.pc libpng-config libpng.pc libpng-config
+
+# Make this to verify that "make [...] install" will do what you want.
+buildsetup-tell:
+	@echo  VPATH is set to: \"$(VPATH)\"
+	@echo  prefix is set to: \"$(prefix)\"
+	@echo -e INCPATH,LIBPATH, etc. are set to:'\n' \
+ $(addprefix $(D),$(INCPATH)'\n' $(LIBPATH)'\n' $(BINPATH)'\n' \
+   $(MANPATH)'\n' $(MAN3PATH)'\n' $(MAN5PATH)'\n')'\n'
+
+libpng.pc: scripts/libpng.pc.in
+	@echo -e Making pkg-config file for this libpng installation..'\n' \
+           using PREFIX=\"$(prefix)\"'\n'
+	cat $(S)/scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! | \
+	   sed -e s/-lm// > libpng.pc
+
+libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in
+	@echo -e Making $(LIBNAME) libpng-config file for this libpng \
+ installation..'\n' using PREFIX=\"$(prefix)\"'\n'
+	( cat $(S)/scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+	echo L_opts=\"-L$(LIBPATH)\"; \
+	echo libs=\"-lpng$(MINGDLL) -lz\"; \
+	cat $(S)/scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config
+
+static: all-static
+shared: all-shared
+all-static: $(STATLIB) pngtest-stat$(EXE)
+all-shared: $(SHAREDLIB) pngtest$(EXE)
+
+pnggccrd.o: pnggccrd.c png.h pngconf.h
+	@echo ""
+	@echo '    You can ignore the "control reaches end of non-void function"'
+	@echo '    warning and "<variable> defined but not used" warnings:'
+	@echo ""
+	$(CC) -c $(CFLAGS) -o $@ $<
+
+pnggccrd.pic.o:	pnggccrd.c png.h pngconf.h
+	@echo ""
+	@echo '    You can ignore the "control reaches end of non-void function"'
+	@echo '    warning and "<variable> defined but not used" warnings:'
+	@echo ""
+	$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
+
+$(STATLIB): $(OBJS)
+	ar rc $@ $(OBJS)
+	$(RANLIB) $@
+
+$(SHAREDDEF): scripts/pngw32.def
+	cat $< | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' | \
+	sed -e 's/\([^;]*\);/;/' > $@
+
+$(SHAREDLIB): $(OBJSDLL) $(SHAREDDEF)
+	$(CC) $(LDSFLAGS) -o $@ $(OBJSDLL) -L. $(LDEXTRA)
+
+pngtest$(EXE): pngtest.pic.o $(SHAREDLIB)
+	$(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
+
+pngtest-stat$(EXE): pngtest.o $(STATLIB)
+	$(CC) -static $(CFLAGS) $< $(LDFLAGS) -o $@
+
+pngtest.pic.o: pngtest.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+pngtest.o: pngtest.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+test: test-static test-shared
+
+test-static: pngtest-stat$(EXE)
+	./pngtest-stat $(S)/pngtest.png
+
+test-shared: pngtest$(EXE)
+	./pngtest $(S)/pngtest.png
+
+install-static: $(STATLIB) install-headers install-man
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
+	install -m 644 $(STATLIB) $(DL)/$(LIBNAME).a
+	-@rm -f $(DL)/$(STATLIB)
+	(cd $(DL); ln -sf $(LIBNAME).a $(STATLIB))
+
+install-shared: $(SHAREDLIB) libpng.pc libpng-config install-headers install-man
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
+	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
+	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
+	-@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc
+	-@/bin/rm -f $(DL)/pkgconfig/libpng.pc
+	install -m 644 $(IMPLIB) $(DL)/$(LIBNAME).dll.a
+	-@rm -f $(DL)/$(IMPLIB)
+	(cd $(DL); ln -sf $(LIBNAME).dll.a $(IMPLIB))
+	install -s -m 755 $(SHAREDLIB) $(DB)
+	install -m 644 libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
+	(cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)
+
+install-headers:
+	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
+	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
+	-@rm -f $(DI)/png.h
+	-@rm -f $(DI)/pngconf.h
+	install -m 644 $(S)/png.h $(S)/pngconf.h $(DI)/$(LIBNAME)
+	-@rm -f $(DI)/libpng
+	(cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
+
+install-man:
+	-@if [ ! -d $(D)$(MAN3PATH) ]; then $(MKDIR_P) $(D)$(MAN3PATH); fi
+	-@if [ ! -d $(D)$(MAN5PATH) ]; then $(MKDIR_P) $(D)$(MAN5PATH); fi
+	install -m 644 $(S)/libpngpf.3 $(S)/libpng.3 $(D)$(MAN3PATH)
+	install -m 644 $(S)/png.5 $(D)$(MAN5PATH)
+
+install-config: libpng-config
+	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
+	-@/bin/rm -f $(DB)/libpng-config
+	-@/bin/rm -f $(DB)/$(LIBNAME)-config
+	cp libpng-config $(DB)/$(LIBNAME)-config
+	chmod 755 $(DB)/$(LIBNAME)-config
+	(cd $(DB); ln -sf $(LIBNAME)-config libpng-config)
+
+# Run this to verify that a future `configure' run will pick up the settings
+# you want.
+test-config-install: SHELL=/bin/bash
+test-config-install: $(DB)/libpng-config
+	@echo -e Testing libpng-config functions...'\n'
+	@ for TYRA in LDFLAGS CPPFLAGS CFLAGS LIBS VERSION; \
+   do \
+    printf "(%d)\t %10s =%s\n" $$(($$gytiu + 1)) $$TYRA \
+    "$$($(DB)/libpng-config `echo --$$TYRA |tr '[:upper:]' '[:lower:]'`)"; \
+    gytiu=$$(( $$gytiu + 1 )); \
+   done
+
+install: install-static install-shared install-man install-config
+
+# If you installed in $(DESTDIR), test-installed won't work until you
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+	echo
+	echo Testing installed dynamic shared library in $(DL).
+	$(CC) -I$(DI) $(CFLAGS) \
+	   `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+	   -L$(DL) -L$(ZLIBLIB) \
+	   -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
+	./pngtestd pngtest.png
+
+test-installed:
+	$(CC) $(CFLAGS) \
+	   `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+	   -L$(ZLIBLIB) \
+	   -o pngtesti$(EXE) `$(BINPATH)/libpng12-config --ldflags`
+	./pngtesti$(EXE) pngtest.png
+
+clean:
+	/bin/rm -f *.pic.o *.o $(STATLIB) $(IMPLIB) $(SHAREDLIB) \
+	pngtest-stat$(EXE) pngtest$(EXE) pngout.png $(SHAREDDEF) \
+	libpng-config libpng.pc pngtesti$(EXE)
+
+DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
+writelock:
+	chmod a-w *.[ch35] $(DOCS) scripts/*
+
+.PHONY: buildsetup-tell libpng.pc libpng-config test-config-install clean
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+png.o png.pic.o:		png.h pngconf.h png.c
+pngerror.o pngerror.pic.o:	png.h pngconf.h pngerror.c
+pngrio.o pngrio.pic.o:		png.h pngconf.h pngrio.c
+pngwio.o pngwio.pic.o:		png.h pngconf.h pngwio.c
+pngmem.o pngmem.pic.o:		png.h pngconf.h pngmem.c
+pngset.o pngset.pic.o:		png.h pngconf.h pngset.c
+pngget.o pngget.pic.o:		png.h pngconf.h pngget.c
+pngread.o pngread.pic.o:	png.h pngconf.h pngread.c
+pngrtran.o pngrtran.pic.o:	png.h pngconf.h pngrtran.c
+pngrutil.o pngrutil.pic.o:	png.h pngconf.h pngrutil.c
+pngtrans.o pngtrans.pic.o:	png.h pngconf.h pngtrans.c
+pngwrite.o pngwrite.pic.o:	png.h pngconf.h pngwrite.c
+pngwtran.o pngwtran.pic.o:	png.h pngconf.h pngwtran.c
+pngwutil.o pngwutil.pic.o:	png.h pngconf.h pngwutil.c
+pngpread.o pngpread.pic.o:	png.h pngconf.h pngpread.c
+
+pngtest.o:			png.h pngconf.h pngtest.c
+pngtest-stat.o:			png.h pngconf.h pngtest.c
+
+
+
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12

 LIB=	png12
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.9beta7
+SHLIB_MINOR=	1.2.9beta10
 SRCS=	pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 		pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 		pngwtran.c pngmem.c pngerror.c pngpread.c
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng

 LIB=	png
 SHLIB_MAJOR=	3
-SHLIB_MINOR=	1.2.9beta7
+SHLIB_MINOR=	1.2.9beta10
 SRCS=	pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 		pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 		pngwtran.c pngmem.c pngerror.c pngpread.c
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -7,7 +7,7 @@ LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat

 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.9beta7
+SHLIB_MINOR=	1.2.9beta10

 LIB=	png
 SRCS=	png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -27,7 +27,7 @@ CFLAGS= -dy -belf -I$(ZLIBINC) -O3
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm

 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -102,8 +102,8 @@ test: pngtest
 	./pngtest

 install-headers: png.h pngconf.h
-	-@if [ ! -d $(DI) ]; then mkdir $(DI); fi
-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi
+	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
+	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
 	-@$(RM_F) $(DI)/png.h
 	-@$(RM_F) $(DI)/pngconf.h
 	cp png.h pngconf.h $(DI)/$(LIBNAME)
@@ -113,7 +113,7 @@ install-headers: png.h pngconf.h
 	(cd $(DI); $(LN_FS) $(LIBNAME) libpng; $(LN_FS) $(LIBNAME)/* .)

 install-static: install-headers libpng.a
-	-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	cp libpng.a $(DL)/$(LIBNAME).a
 	chmod 644 $(DL)/$(LIBNAME).a
 	-@$(RM_F) $(DL)/libpng.a
@@ -121,7 +121,7 @@ install-static: install-headers libpng.a

 install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	libpng.so.0.$(PNGMIN)
-	-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	-@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
 	-@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGMAJ)
 	-@$(RM_F) $(DL)/libpng.so
@@ -136,7 +136,7 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	$(LN_FS) libpng.so.0 libpng.so; \
 	$(LN_FS) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
 	$(LN_FS) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-	-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
+	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
 	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
 	-@$(RM_F) $(DL)/pkgconfig/libpng.pc
 	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
@@ -144,18 +144,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	(cd $(DL)/pkgconfig; $(LN_FS) $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(DM) ]; then mkdir $(DM); fi
-	-@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi
+	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
+	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
 	-@$(RM_F) $(DM)/man3/libpng.3
 	-@$(RM_F) $(DM)/man3/libpngpf.3
 	cp libpng.3 $(DM)/man3
 	cp libpngpf.3 $(DM)/man3
-	-@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi
+	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
 	-@$(RM_F) $(DM)/man5/png.5
 	cp png.5 $(DM)/man5

 install-config: libpng-config
-	-@if [ ! -d $(DB) ]; then mkdir $(DB); fi
+	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
 	-@$(RM_F) $(DB)/libpng-config
 	-@$(RM_F) $(DB)/$(LIBNAME)-config
 	cp libpng-config $(DB)/$(LIBNAME)-config
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -19,7 +19,7 @@ ZLIBINC=../zlib

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)

 AR_RC=ar rc
@@ -115,8 +115,8 @@ test: pngtest
 	./pngtest

 install-headers: png.h pngconf.h
-	-@if [ ! -d $(DI) ]; then mkdir $(DI); fi
-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi
+	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
+	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
 	cp png.h pngconf.h $(DI)/$(LIBNAME)
 	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h
 	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h
@@ -124,7 +124,7 @@ install-headers: png.h pngconf.h
 	(cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)

 install-static: install-headers libpng.a
-	-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	cp libpng.a $(DL)/$(LIBNAME).a
 	chmod 644 $(DL)/$(LIBNAME).a
 	-@$(RM_F) $(DL)/libpng.a
@@ -132,7 +132,7 @@ install-static: install-headers libpng.a

 install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	libpng.so.0.$(PNGMIN)
-	-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	-@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
 	-@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGMAJ)
 	-@$(RM_F) $(DL)/libpng.so
@@ -147,7 +147,7 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	ln -sf libpng.so.0 libpng.so; \
 	ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
 	ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-	-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
+	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
 	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
 	-@$(RM_F) $(DL)/pkgconfig/libpng.pc
 	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
@@ -155,18 +155,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	(cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(DM) ]; then mkdir $(DM); fi
-	-@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi
+	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
+	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
 	-@$(RM_F) $(DM)/man3/libpng.3
 	-@$(RM_F) $(DM)/man3/libpngpf.3
 	cp libpng.3 $(DM)/man3
 	cp libpngpf.3 $(DM)/man3
-	-@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi
+	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
 	-@$(RM_F) $(DM)/man5/png.5
 	cp png.5 $(DM)/man5

 install-config: libpng-config
-	-@if [ ! -d $(DB) ]; then mkdir $(DB); fi
+	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
 	-@$(RM_F) $(DB)/libpng-config
 	-@$(RM_F) $(DB)/$(LIBNAME)-config
 	cp libpng-config $(DB)/$(LIBNAME)-config
@@ -200,7 +200,7 @@ test-installed:
 	./pngtesti pngtest.png

 clean:
-	$(RM_F)libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \
+	$(RM_F) libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \
 	$(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
 	libpng.so.0.$(PNGMIN) \
 	so_locations
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -5,7 +5,7 @@

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Where make install puts libpng.a, libpng12.so, and libpng12/png.h
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -9,7 +9,7 @@
 # gcc 2.95 doesn't work.
 CC=cc
 AR_RC=ar rc
-MKDIR_P=mkdir
+MKDIR_P=mkdir -p
 LN_SF=ln -f -s
 RANLIB=echo
 RM_F=/bin/rm -f
@@ -37,7 +37,7 @@ CFLAGS=-I$(ZLIBINC) -O3
 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm

 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -124,8 +124,8 @@ test: pngtest
 	./pngtest

 install-headers: png.h pngconf.h
-	-@if [ ! -d $(DI) ]; then mkdir $(DI); fi
-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi
+	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
+	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
 	cp png.h pngconf.h $(DI)/$(LIBNAME)
 	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h
 	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h
@@ -133,7 +133,7 @@ install-headers: png.h pngconf.h
 	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)

 install-static: install-headers libpng.a
-	-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	cp libpng.a $(DL)/$(LIBNAME).a
 	chmod 644 $(DL)/$(LIBNAME).a
 	-@$(RM_F) $(DL)/libpng.a
@@ -141,7 +141,7 @@ install-static: install-headers libpng.a

 install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	libpng.so.0.$(PNGMIN)
-	-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	-@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
 	-@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGMAJ)
 	-@$(RM_F) $(DL)/libpng.so
@@ -156,7 +156,7 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	$(LN_SF) libpng.so.0 libpng.so; \
 	$(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
 	$(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-	-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
+	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
 	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
 	-@$(RM_F) $(DL)/pkgconfig/libpng.pc
 	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
@@ -164,18 +164,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
 	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(DM) ]; then mkdir $(DM); fi
-	-@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi
+	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
+	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
 	-@$(RM_F) $(DM)/man3/libpng.3
 	-@$(RM_F) $(DM)/man3/libpngpf.3
 	cp libpng.3 $(DM)/man3
 	cp libpngpf.3 $(DM)/man3
-	-@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi
+	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
 	-@$(RM_F) $(DM)/man5/png.5
 	cp png.5 $(DM)/man5

 install-config: libpng-config
-	-@if [ ! -d $(DB) ]; then mkdir $(DB); fi
+	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
 	-@$(RM_F) $(DB)/libpng-config
 	-@$(RM_F) $(DB)/$(LIBNAME)-config
 	cp libpng-config $(DB)/$(LIBNAME)-config
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -7,7 +7,7 @@

 AR_RC=ar rc
 CC=gcc
-MKDIR_P=mkdir
+MKDIR_P=mkdir -p
 LN_SF=ln -f -s
 RANLIB=echo
 RM_F=/bin/rm -f
@@ -33,7 +33,7 @@ CFLAGS=-I$(ZLIBINC) -Wall -O \
 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm

 PNGMAJ = 0
-PNGMIN = 1.2.9beta7
+PNGMIN = 1.2.9beta10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

--- a/scripts/makefile.sunos
+++ b/scripts/makefile.sunos
@@ -31,7 +31,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow -Wconversion \

 CC=gcc
 AR_RC=ar rc
-MKDIR_P=mkdir
+MKDIR_P=mkdir -p
 LN_SF=ln -f -s
 RANLIB=ranlib
 RM_F=/bin/rm -f
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------

-; Version 1.2.9beta7
+; Version 1.2.9beta10

 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"
@@ -118,7 +118,7 @@ EXPORTS
  png_set_gAMA
  png_set_gAMA_fixed
  png_set_gamma
-  png_set_gray_1_2_4_to_8
+  png_set_gray_1_2_4_to_8 ; deprecated as of libpng-1.2.9
  png_set_gray_to_rgb
  png_set_hIST
  png_set_iCCP
@@ -221,6 +221,7 @@ EXPORTS
  png_get_int_32
  png_save_int_32
  png_get_uint_31
+  png_set_expand_gray_1_2_4_to_8

 ; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS
  png_libpng_ver
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
 LIBRARY

 EXPORTS
-;Version 1.2.9beta7
+;Version 1.2.9beta10
  png_build_grayscale_palette  @1
  png_check_sig        @2
  png_chunk_error      @3
@@ -114,7 +114,7 @@ EXPORTS
  png_set_gAMA    @104
  png_set_gAMA_fixed  @105
  png_set_gamma    @106
-  png_set_gray_1_2_4_to_8  @107
+  png_set_gray_1_2_4_to_8  @107 ; deprecated
  png_set_gray_to_rgb  @108
  png_set_hIST    @109
  png_set_iCCP    @110
@@ -232,3 +232,4 @@ EXPORTS
  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
Author	SHA1	Message	Date
Glenn Randers-Pehrson	26e47d9a71	Imported from libpng-1.2.9beta10.tar	2009-04-06 16:08:44 -05:00
Glenn Randers-Pehrson	170b70ce30	Imported from libpng-1.2.9beta9.tar	2009-04-06 16:08:42 -05:00
Glenn Randers-Pehrson	1ce0836b4a	Imported from libpng-1.2.9beta8.tar	2009-04-06 16:08:39 -05:00