[devel] Imported from libpng-1.4.0beta69.tar

[devel] Added a prototype for png_64bit_product()
in png.c (suggested by Peter Breitenlohner)
2025-07-10 18:04:09 +02:00 · 2009-07-25 09:26:53 -05:00 · 2009-07-23 12:53:06 -05:00 · 2009-07-19 19:33:22 -05:00 · 2009-07-19 19:24:58 -05:00 · 2009-07-19 15:10:36 -05:00
93 changed files with 767 additions and 265 deletions
--- a/45
+++ b/45
@@ -1,5 +1,5 @@

-Libpng 1.4.0beta65 - June 25, 2009
+Libpng 1.4.0beta69 - July 25, 2009

 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,27 +9,27 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script

-   1.4.0beta65.tar.gz
-   1.4.0beta65.tar.bz2
+   1.4.0beta69.tar.gz
+   1.4.0beta69.tar.bz2

 Source files with LF line endings (for Unix/Linux) without the
 "configure" script

-   1.4.0beta65-no-config.tar.gz
-   1.4.0beta65-no-config.tar.bz2
+   1.4.0beta69-no-config.tar.gz
+   1.4.0beta69-no-config.tar.bz2

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

-   lp140b65.zip
-   lp140b65.tar.bz2
+   lp140b69.zip
+   lp140b69.tar.bz2

 Other information:

-   1.4.0beta65-README.txt
-   1.4.0beta65-KNOWNBUGS.txt
-   1.4.0beta65-LICENSE.txt
-   1.4.0beta65-Y2K-compliance.txt
+   1.4.0beta69-README.txt
+   1.4.0beta69-KNOWNBUGS.txt
+   1.4.0beta69-LICENSE.txt
+   1.4.0beta69-Y2K-compliance.txt

 Changes since the last public release (1.2.10):

@@ -488,8 +488,27 @@ version 1.4.0beta64 [June 24, 2009]
  Moved the various unknown chunk macro definitions outside of the
     PNG_READ|WRITE_ANCILLARY_CHUNK_SUPPORTED blocks.

-version 1.4.0beta65 [June 25, 2009]
-  Added a reference to the zlib/libpng license in each file.
+version 1.4.0beta65 [June 26, 2009]
+  Added a reference to the libpng license in each file.
+
+version 1.4.0beta66 [June 27, 2009]
+  Refer to the libpng license instead of the libpng license in each file.
+
+version 1.4.0beta67 [July 6, 2009]
+  Relocated INVERT_ALPHA within png_read_png() and png_write_png().
+  Added high-level API transform PNG_TRANSFORM_GRAY_TO_RGB.
+  Added an "xcode" project to the projects directory (Alam Arias).
+
+version 1.4.0beta68 [July 19, 2009]
+  Avoid some tests in filter selection in pngwutil.c
+
+version 1.4.0beta69 [July 25, 2009]
+  Simplified the new filter-selection test.  This runs faster in the
+    common "PNG_ALL_FILTERS" and PNG_FILTER_NONE cases.
+  Removed extraneous declaration from the new call to png_read_gray_to_rgb()
+    (bug introduced in libpng-1.4.0beta67).
+  Fixed up xcode project (Alam Arias)
+  Declared internal png_64bit_product() static.

 version 1.4.0betaN [future]
  Build shared libraries with -lz and sometimes -lm.
--- a/37
+++ b/37
@@ -1,5 +1,5 @@
 #if 0
-changes(){ /*
+libpng_changes(){ /*
 CHANGES - changes for libpng

 version 0.2
@@ -540,7 +540,8 @@ version 1.0.5d [November 29, 1999]
  Eliminated pngtypes.h; use macros instead to declare PNG_CHNK arrays.
  Renamed "PNG_GLOBAL_ARRAYS" to "PNG_USE_GLOBAL_ARRAYS" and made available
    to applications a macro "PNG_USE_LOCAL_ARRAYS".
-  #ifdef out all the new declarations when PNG_USE_GLOBAL_ARRAYS is defined.
+  comment out (with #ifdef) all the new declarations when
+    PNG_USE_GLOBAL_ARRAYS is defined.
  Added PNG_EXPORT_VAR macro to accommodate making DLL's.
 version 1.0.5e [November 30, 1999]
  Added iCCP, iTXt, and sPLT support; added "lang" member to the png_text
@@ -1301,7 +1302,7 @@ version 1.2.6beta4 [July 28, 2004]
  Added PNG_NO_SEQUENTIAL_READ_SUPPORTED macro to conditionally remove
    sequential read support.
  Added some "#if PNG_WRITE_SUPPORTED" blocks.
-  #ifdef'ed out some redundancy in png_malloc_default().
+  Added #ifdef to remove some redundancy in png_malloc_default().
  Use png_malloc instead of png_zalloc to allocate the pallete.
 version 1.0.16rc1 and 1.2.6rc1 [August 4, 2004]
  Fixed buffer overflow vulnerability in png_handle_tRNS()
@@ -1371,7 +1372,8 @@ version 1.2.8beta1 [November 1, 2004]
  Fixed bug, introduced in libpng-1.2.7, that overruns a buffer during
    strip alpha operation in png_do_strip_filler().
  Added PNG_1_2_X definition in pngconf.h
-  #ifdef out png_info_init in png.c and png_read_init in pngread.c (as of 1.3.0)
+  Use #ifdef to comment out png_info_init in png.c and png_read_init in
+    pngread.c (as of 1.3.0)
 version 1.2.8beta2 [November 2, 2004]
  Reduce color_type to a nonalpha type after strip alpha operation in
    png_do_strip_filler().
@@ -1757,8 +1759,8 @@ version 1.2.19beta6 [May 22, 2007]
  Added a special "_MSC_VER" case that defines png_snprintf to _snprintf

 version 1.2.19beta7 [May 22, 2007]
-  Squelched png_squelch_warnings() in pnggccrd.c and added an
-    #ifdef PNG_MMX_CODE_SUPPORTED block around the declarations that caused
+  Squelched png_squelch_warnings() in pnggccrd.c and added
+    an #ifdef PNG_MMX_CODE_SUPPORTED block around the declarations that caused
    the warnings that png_squelch_warnings was squelching.

 version 1.2.19beta8 [May 22, 2007]
@@ -2165,8 +2167,27 @@ version 1.4.0beta64 [June 24, 2009]
  Moved the various unknown chunk macro definitions outside of the
     PNG_READ|WRITE_ANCILLARY_CHUNK_SUPPORTED blocks.

-version 1.4.0beta65 [June 25, 2009]
-  Added a reference to the zlib/libpng license in each file.
+version 1.4.0beta65 [June 26, 2009]
+  Added a reference to the libpng license in each file.
+
+version 1.4.0beta66 [June 27, 2009]
+  Refer to the libpng license instead of the libpng license in each file.
+
+version 1.4.0beta67 [July 6, 2009]
+  Relocated INVERT_ALPHA within png_read_png() and png_write_png().
+  Added high-level API transform PNG_TRANSFORM_GRAY_TO_RGB.
+  Added an "xcode" project to the projects directory (Alam Arias).
+
+version 1.4.0beta68 [July 19, 2009]
+  Avoid some tests in filter selection in pngwutil.c
+
+version 1.4.0beta69 [July 25, 2009]
+  Simplified the new filter-selection test.  This runs faster in the
+    common "PNG_ALL_FILTERS" and PNG_FILTER_NONE cases.
+  Removed extraneous declaration from the new call to png_read_gray_to_rgb()
+    (bug introduced in libpng-1.4.0beta67).
+  Fixed up xcode project (Alam Arias)
+  Added a prototype for png_64bit_product() in png.c

 version 1.4.0betaN [future]
  Build shared libraries with -lz and sometimes -lm.
--- a/18
+++ b/18
@@ -1,5 +1,5 @@

-Installing libpng version 1.4.0beta65 - June 25, 2009
+Installing libpng version 1.4.0beta69 - July 25, 2009

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

@@ -44,7 +44,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.4.0beta65" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.4.0beta69" 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:
@@ -95,14 +95,14 @@ include
 CMakeLists.txt    =>  "cmake" script
 makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
 makefile.elf      =>  Linux/ELF makefile symbol versioning,
-                       gcc, creates libpng14.so.14.1.4.0beta65)
+                       gcc, creates libpng14.so.14.1.4.0beta69)
 makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng14.so.14.1.4.0beta65)
+                       (gcc, creates libpng14.so.14.1.4.0beta69)
 makefile.gcmmx    =>  Linux/ELF makefile
-                       (gcc, creates libpng14.so.14.1.4.0beta65,
+                       (gcc, creates libpng14.so.14.1.4.0beta69,
                       uses assembler code tuned for Intel MMX platform)
 makefile.nommx    =>  Linux/ELF makefile
-                       (gcc, creates libpng14.so.14.1.4.0beta65
+                       (gcc, creates libpng14.so.14.1.4.0beta69
                       does not use Intel MMX assembler code)
 makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)
 makefile.knr      =>  Archaic UNIX Makefile that converts files with
@@ -125,12 +125,12 @@ include
 makefile.openbsd  =>  OpenBSD makefile
 makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
 makefile.sggcc    =>  Silicon Graphics (gcc,
-                       creates libpng14.so.14.1.4.0beta65)
+                       creates libpng14.so.14.1.4.0beta69)
 makefile.sunos    =>  Sun makefile
 makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng14.so.14.1.4.0beta65)
+                       creates libpng14.so.14.1.4.0beta69)
 makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng14.so.14.1.4.0beta65)
+                       creates libpng14.so.14.1.4.0beta69)
 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/2
+++ b/2
@@ -1,5 +1,5 @@

-Known bugs in libpng version 1.4.0beta65
+Known bugs in libpng version 1.4.0beta69

 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
--- a/6
+++ b/6
@@ -8,9 +8,9 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
 If you modify libpng you may insert additional notices immediately following
 this sentence.

-This code is released under the zlib/libpng license.
+This code is released under the libpng license.

-libpng versions 1.2.6, August 15, 2004, through 1.4.0beta65, June 25, 2009, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0beta69, July 25, 2009, are
 Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.

 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-June 25, 2009
+July 25, 2009
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ AUTOMAKE_OPTIONS = foreign
 # test programs - run on make check, make distcheck
 check_PROGRAMS= pngtest
 pngtest_SOURCES = pngtest.c
-pngtest_LDADD = libpng14.la
+pngtest_LDADD = libpng%NN%.la
 TESTS = test-pngtest.sh
 TESTS_ENVIRONMENT= srcdir=$(srcdir) 

@@ -24,39 +24,39 @@ TESTS_ENVIRONMENT= srcdir=$(srcdir)
 dist_man_MANS= libpng.3 libpngpf.3 png.5

 # generate the -config scripts if required
-binconfigs= libpng14-config 
-EXTRA_SCRIPTS= libpng-config libpng14-config
+binconfigs= libpng%NN%-config 
+EXTRA_SCRIPTS= libpng-config libpng%NN%-config
 bin_SCRIPTS= @binconfigs@

 # rules to build libpng, only build the old library on request
-lib_LTLIBRARIES=libpng14.la @compatlib@
+lib_LTLIBRARIES=libpng%NN%.la @compatlib@
 EXTRA_LTLIBRARIES= libpng.la
-libpng14_la_SOURCES = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
+libpng%NN%_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 \
 	png.h pngconf.h
-libpng_la_SOURCES = $(libpng14_la_SOURCES)
+libpng_la_SOURCES = $(libpng%NN%_la_SOURCES)

 libpng_la_CPPFLAGS = @LIBPNG_DEFINES@
-libpng14_la_CPPFLAGS = @LIBPNG_DEFINES@
+libpng%NN%_la_CPPFLAGS = @LIBPNG_DEFINES@

 # MAJOR UPGRADE: the version-number settings below must be changed.
-libpng14_la_LDFLAGS = -no-undefined -export-dynamic \
-	-version-number 14:@PNGLIB_RELEASE@:14
+libpng%NN%_la_LDFLAGS = -no-undefined -export-dynamic \
+	-version-number %NN%:@PNGLIB_RELEASE@:%NN%
 # -rpath is needed as automake doesn't know the directory
 libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-	-version-number 14:@PNGLIB_RELEASE@:14
+	-version-number 14:@PNGLIB_RELEASE@:%NN%

 if HAVE_LD_VERSION_SCRIPT
  # Versioned symbols and restricted exports
-  libpng14_la_LDFLAGS += -Wl,--version-script=libpng.vers
-  libpng14_la_DEPENDENCIES = libpng.vers
+  libpng%NN%_la_LDFLAGS += -Wl,--version-script=libpng.vers
+  libpng%NN%_la_DEPENDENCIES = libpng.vers
 else
  # Only restricted exports when possible
-  libpng14_la_LDFLAGS += -export-symbols libpng.sym
-  libpng14_la_DEPENDENCIES = libpng.sym
+  libpng%NN%_la_LDFLAGS += -export-symbols libpng.sym
+  libpng%NN%_la_DEPENDENCIES = libpng.sym
 endif
-libpng_la_DEPENDENCIES = $(libpng14_la_DEPENDENCIES)
+libpng_la_DEPENDENCIES = $(libpng%NN%_la_DEPENDENCIES)

 # Avoid depending upon Character Ranges.
 AN = '_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
@@ -68,7 +68,7 @@ pkginclude_HEADERS= png.h pngconf.h
 # pkg-config stuff, note that libpng.pc is always required in order
 # to get the correct library
 pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA = libpng14.pc
+pkgconfig_DATA = libpng%NN%.pc

 #extra source distribution files.
 EXTRA_DIST= \
@@ -86,9 +86,9 @@ EXTRA_DIST= \
 	${srcdir}/contrib/pngsuite/* \
 	${srcdir}/contrib/visupng/* \
 	$(TESTS) \
-	example.c libpng-1.4.0beta65.txt pngvcrd.c 
+	example.c libpng-1.4.0beta69.txt pngvcrd.c 

-CLEANFILES= pngout.png libpng14.pc libpng14-config libpng.vers \
+CLEANFILES= pngout.png libpng%NN%.pc libpng%NN%-config libpng.vers \
 libpng.sym

 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
@@ -127,7 +127,7 @@ install-data-hook:
 	cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
 	cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc

-# do evil things to libpng to cause libpng14 to be used
+# do evil things to libpng to cause libpng%NN% to be used
 install-exec-hook:
 	cd $(DESTDIR)$(bindir); rm -f libpng-config
 	cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
--- a/Makefile.in
+++ b/Makefile.in
@@ -332,7 +332,7 @@ EXTRA_DIST = \
 	${srcdir}/contrib/pngsuite/* \
 	${srcdir}/contrib/visupng/* \
 	$(TESTS) \
-	example.c libpng-1.4.0beta65.txt pngvcrd.c 
+	example.c libpng-1.4.0beta69.txt pngvcrd.c 

 CLEANFILES = pngout.png libpng14.pc libpng14-config libpng.vers \
 libpng.sym
--- a/14
+++ b/14
@@ -1,4 +1,4 @@
-README for libpng version 1.4.0beta65 - June 25, 2009 (shared library 14.0)
+README for libpng version 1.4.0beta69 - July 25, 2009 (shared library 14.0)
 See the note about version numbers near the top of png.h

 See INSTALL for instructions on how to install libpng.
@@ -184,11 +184,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 libpng14.so.14.1.4.0beta65)
+                            gcc, creates libpng14.so.14.1.4.0beta69)
       makefile.linux   =>  Linux/ELF makefile
-                            (gcc, creates libpng14.so.14.1.4.0beta65)
+                            (gcc, creates libpng14.so.14.1.4.0beta69)
       makefile.gcmmx   =>  Linux/ELF makefile
-                            (gcc, creates libpng14.so.14.1.4.0beta65,
+                            (gcc, creates libpng14.so.14.1.4.0beta69,
                            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
@@ -210,12 +210,12 @@ Files in this distribution:
       makefile.openbsd =>  OpenBSD makefile
       makefile.sgi     =>  Silicon Graphics IRIX (cc, creates static lib)
       makefile.sggcc   =>  Silicon Graphics
-                            (gcc, creates libpng14.so.14.1.4.0beta65)
+                            (gcc, creates libpng14.so.14.1.4.0beta69)
       makefile.sunos   =>  Sun makefile
       makefile.solaris =>  Solaris 2.X makefile
-                            (gcc, creates libpng14.so.14.1.4.0beta65)
+                            (gcc, creates libpng14.so.14.1.4.0beta69)
       makefile.so9     =>  Solaris 9 makefile
-                            (gcc, creates libpng14.so.14.1.4.0beta65)
+                            (gcc, creates libpng14.so.14.1.4.0beta69)
       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/5
+++ b/5
@@ -19,8 +19,13 @@ Better filter selection
 Histogram creation.
 Text conversion between different code pages (Latin-1 -> Mac and DOS).
 Build gamma tables using fixed point (and do away with floating point entirely).
+Avoid building gamma tables whenever possible.
 Use greater precision when changing to linear gamma for compositing against
  background and doing rgb-to-gray transformation.
 Investigate pre-incremented loop counters and other loop constructions.
 Add interpolated method of handling interlacing.
+Provide for conditional compilation of 16-bit support (except for the
+  initial stripping down to 8-bits when reading a 16-bit PNG datastream).
+Switch to the simpler zlib (zlib/libpng) license if legally possible.
+
 */
--- a/22
+++ b/22
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for libpng 1.4.0beta65.
+# Generated by GNU Autoconf 2.63 for libpng 1.4.0beta69.
 #
 # Report bugs to <png-mng-implement@lists.sourceforge.net>.
 #
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libpng'
 PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.4.0beta65'
-PACKAGE_STRING='libpng 1.4.0beta65'
+PACKAGE_VERSION='1.4.0beta69'
+PACKAGE_STRING='libpng 1.4.0beta69'
 PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'

 ac_unique_file="pngget.c"
@@ -1485,7 +1485,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.4.0beta65 to adapt to many kinds of systems.
+\`configure' configures libpng 1.4.0beta69 to adapt to many kinds of systems.

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

@@ -1555,7 +1555,7 @@ fi

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

@@ -1662,7 +1662,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-libpng configure 1.4.0beta65
+libpng configure 1.4.0beta69
 generated by GNU Autoconf 2.63

 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1676,7 +1676,7 @@ cat >config.log <<_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.4.0beta65, which was
+It was created by libpng $as_me 1.4.0beta69, which was
 generated by GNU Autoconf 2.63.  Invocation command line was

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

 # Define the identity of the package.
 PACKAGE='libpng'
- VERSION='1.4.0beta65'
+ VERSION='1.4.0beta69'


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



-PNGLIB_VERSION=1.4.0beta65
+PNGLIB_VERSION=1.4.0beta69
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=4
 PNGLIB_RELEASE=0
@@ -13353,7 +13353,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libpng $as_me 1.4.0beta65, which was
+This file was extended by libpng $as_me 1.4.0beta69, which was
 generated by GNU Autoconf 2.63.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -13416,7 +13416,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-libpng config.status 1.4.0beta65
+libpng config.status 1.4.0beta69
 configured by $0, generated by GNU Autoconf 2.63,
  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; 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.4.0beta65], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.4.0beta69], [png-mng-implement@lists.sourceforge.net])
 AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE

-PNGLIB_VERSION=1.4.0beta65
+PNGLIB_VERSION=1.4.0beta69
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=4
 PNGLIB_RELEASE=0
--- a/contrib/pngminim/decoder/pngusr.h
+++ b/contrib/pngminim/decoder/pngusr.h
@@ -2,8 +2,8 @@
 *
 * Copyright (c) 2007, 2009 Glenn Randers-Pehrson
 *
- * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
 * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
--- a/contrib/pngminim/encoder/pngusr.h
+++ b/contrib/pngminim/encoder/pngusr.h
@@ -2,8 +2,8 @@
 *
 * Copyright (c) 2007, 2009 Glenn Randers-Pehrson
 *
- * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
 * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
--- a/contrib/pngminim/preader/pngusr.h
+++ b/contrib/pngminim/preader/pngusr.h
@@ -1,16 +1,16 @@
 /* minrdpngconf.h: headers to make a minimal png-read-only library
 *
- * Copyright (c) 2007, 2009 Glenn Randers-Pehrson
+ * Copyright (c) 2009 Glenn Randers-Pehrson
 *
- * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
 * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
 */

-#ifndef MINRDPNGCONF_H
-#define MINRDPNGCONF_H
+#ifndef MINPRDPNGCONF_H
+#define MINPRDPNGCONF_H

 #define PNG_NO_GLOBAL_ARRAYS

@@ -65,4 +65,4 @@
 #define PNG_NO_ERROR_NUMBERS
 #define PNG_NO_EASY_ACCESS

-#endif /* MINRDPNGCONF_H */
+#endif /* MINPRDPNGCONF_H */
--- a/contrib/visupng/PngFile.c
+++ b/contrib/visupng/PngFile.c
@@ -4,9 +4,9 @@

 // Copyright 2000, Willem van Schaik.
 //
-// This code is released under the zlib/libpng license.
-// For conditions of distribution and use, see the
-// copyright/license/disclaimer notice in png.h
+// This code is released under the libpng license.
+// For conditions of distribution and use, see the disclaimer
+// and license in png.h

 #include <windows.h>
 #include <commdlg.h>
--- a/contrib/visupng/PngFile.h
+++ b/contrib/visupng/PngFile.h
@@ -3,10 +3,10 @@
 //------------------------------------------

 // Copyright 2000, Willem van Schaik.
-//
-// This code is released under the zlib/libpng license.
-// For conditions of distribution and use, see the
-// copyright/license/disclaimer notice in png.h
+
+// This code is released under the libpng license.
+// For conditions of distribution and use, see the disclaimer
+// and license in png.h

 #include <stdio.h>
 #include <stdlib.h>
--- a/contrib/visupng/README.txt
+++ b/contrib/visupng/README.txt
@@ -3,9 +3,9 @@ Microsoft Developer Studio Build File, Format Version 6.00 for VisualPng

 Copyright 2000, Willem van Schaik.

-This code is released under the zlib/libpng license.
-For conditions of distribution and use, see the
-copyright/license/disclaimer notice in png.h
+This code is released under the libpng license.
+For conditions of distribution and use, see the disclaimer
+and license in png.h

 As a PNG .dll demo VisualPng is finished. More features would only hinder
 the program's objective. However, further extensions (like support for other 
--- a/contrib/visupng/VisualPng.c
+++ b/contrib/visupng/VisualPng.c
@@ -3,10 +3,10 @@
 //------------------------------------

 // Copyright 2000, Willem van Schaik.
-//
-// This code is released under the zlib/libpng license.
-// For conditions of distribution and use, see the
-// copyright/license/disclaimer notice in png.h
+
+// This code is released under the libpng license.
+// For conditions of distribution and use, see the disclaimer
+// and license in png.h

 // switches

--- a/example.c
+++ b/example.c
@@ -2,7 +2,7 @@
 #if 0 /* in case someone actually tries to compile this */

 /* example.c - an example of using libpng
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * This file has been placed in the public domain by the authors.
 * Maintained 1998-2009 Glenn Randers-Pehrson
 * Maintained 1996, 1997 Andreas Dilger)
--- a/libpng-1.4.0beta69.txt
+++ b/libpng-1.4.0beta69.txt
@@ -1,17 +1,17 @@
 libpng.txt - A description on how to use and modify libpng

- libpng version 1.4.0beta65 - June 25, 2009
+ libpng version 1.4.0beta69 - July 25, 2009
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp at users.sourceforge.net>
 Copyright (c) 1998-2009 Glenn Randers-Pehrson

- This document is released under the zlib/libpng license.
+ This document is released under the libpng license.
 For conditions of distribution and use, see the disclaimer
 and license in png.h

 Based on:

- libpng versions 0.97, January 1998, through 1.4.0beta65 - June 25, 2009
+ libpng versions 0.97, January 1998, through 1.4.0beta69 - July 25, 2009
 Updated and distributed by Glenn Randers-Pehrson
 Copyright (c) 1998-2009 Glenn Randers-Pehrson

@@ -447,6 +447,8 @@ you want to do are limited to the following set:
    PNG_TRANSFORM_INVERT_ALPHA  Change alpha from opacity
                                to transparency
    PNG_TRANSFORM_SWAP_ENDIAN   Byte-swap 16-bit samples
+    PNG_TRANSFORM_GRAY_TO_RGB   Expand grayscale samples
+                                to RGB (or GA to RGBA)

 (This excludes setting a background color, doing gamma transformation,
 dithering, and setting filler.)  If this is the case, simply do this:
@@ -863,7 +865,7 @@ 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.

-As of libpng version 1.4.0beta65, not all possible expansions are supported.
+As of libpng version 1.4.0beta69, not all possible expansions are supported.

 In the following table, the 01 means grayscale with depth<8, 31 means
 indexed with depth<8, other numerals represent the color type, "T" means
@@ -2964,6 +2966,8 @@ Some obsolete/deprecated macros and functions have been removed.

 The PNG_1_0_X and PNG_1_2_X macros were eliminated.

+The PNG_LEGACY_SUPPORTED macro was eliminated.
+
 Many WIN32_WCE #ifdefs were removed.

 PNG_MAX_UINT was replaced with PNG_UINT_31_MAX.  It has been
@@ -3028,13 +3032,24 @@ The png_calloc() function was added.

 We removed the trailing '.' from the warning and error messages.

+We added PNG_TRANSFORM_GRAY_TO_RGB to the available high-level
+input transforms.
+
+The call to png_do_chop() in pngrtran.c, which reduces 16-bit input
+files to 8-bit bit depth, was relocated ahead of the building
+of gamma tables.  This allows us to build 8-bit tables instead
+of 16-bit tables, when only 8-bit tables are needed. This avoids 
+wasting some computing resources when the application has called
+the png_set_strip_16() function and encounters a 16-bit PNG file.

 X. Detecting libpng

 The png_get_io_ptr() function has been present since libpng-0.88, has never
 changed, and is unaffected by conditional compilation macros.  It is the
 best choice for use in configure scripts for detecting the presence of any
-libpng version since 0.88.
+libpng version since 0.88.  In an autoconf "configure.in" you could use
+
+    AC_CHECK_LIB(png, png_get_io_ptr, ...

 XI. Source code repository

@@ -3147,13 +3162,13 @@ source.

 XIII. Y2K Compliance in libpng

-June 25, 2009
+July 25, 2009

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

 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.4.0beta65 are Y2K compliant.  It is my belief that earlier
+upward through 1.4.0beta69 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/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "June 25, 2009"
+.TH LIBPNG 3 "July 25, 2009"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta65
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta69
 .SH SYNOPSIS
 \fI\fB

@@ -809,18 +809,18 @@ 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.4.0beta65 - June 25, 2009
+ libpng version 1.4.0beta69 - July 25, 2009
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp at users.sourceforge.net>
 Copyright (c) 1998-2009 Glenn Randers-Pehrson

- This document is released under the zlib/libpng license.
+ This document is released under the libpng license.
 For conditions of distribution and use, see the disclaimer
 and license in png.h

 Based on:

- libpng versions 0.97, January 1998, through 1.4.0beta65 - June 25, 2009
+ libpng versions 0.97, January 1998, through 1.4.0beta69 - July 25, 2009
 Updated and distributed by Glenn Randers-Pehrson
 Copyright (c) 1998-2009 Glenn Randers-Pehrson

@@ -1256,6 +1256,8 @@ you want to do are limited to the following set:
    PNG_TRANSFORM_INVERT_ALPHA  Change alpha from opacity
                                to transparency
    PNG_TRANSFORM_SWAP_ENDIAN   Byte-swap 16-bit samples
+    PNG_TRANSFORM_GRAY_TO_RGB   Expand grayscale samples
+                                to RGB (or GA to RGBA)

 (This excludes setting a background color, doing gamma transformation,
 dithering, and setting filler.)  If this is the case, simply do this:
@@ -1672,7 +1674,7 @@ 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.

-As of libpng version 1.4.0beta65, not all possible expansions are supported.
+As of libpng version 1.4.0beta69, not all possible expansions are supported.

 In the following table, the 01 means grayscale with depth<8, 31 means
 indexed with depth<8, other numerals represent the color type, "T" means
@@ -3773,6 +3775,8 @@ Some obsolete/deprecated macros and functions have been removed.

 The PNG_1_0_X and PNG_1_2_X macros were eliminated.

+The PNG_LEGACY_SUPPORTED macro was eliminated.
+
 Many WIN32_WCE #ifdefs were removed.

 PNG_MAX_UINT was replaced with PNG_UINT_31_MAX.  It has been
@@ -3837,13 +3841,24 @@ The png_calloc() function was added.

 We removed the trailing '.' from the warning and error messages.

+We added PNG_TRANSFORM_GRAY_TO_RGB to the available high-level
+input transforms.
+
+The call to png_do_chop() in pngrtran.c, which reduces 16-bit input
+files to 8-bit bit depth, was relocated ahead of the building
+of gamma tables.  This allows us to build 8-bit tables instead
+of 16-bit tables, when only 8-bit tables are needed. This avoids 
+wasting some computing resources when the application has called
+the png_set_strip_16() function and encounters a 16-bit PNG file.

 .SH X. Detecting libpng

 The png_get_io_ptr() function has been present since libpng-0.88, has never
 changed, and is unaffected by conditional compilation macros.  It is the
 best choice for use in configure scripts for detecting the presence of any
-libpng version since 0.88.
+libpng version since 0.88.  In an autoconf "configure.in" you could use
+
+    AC_CHECK_LIB(png, png_get_io_ptr, ...

 .SH XI. Source code repository

@@ -3956,13 +3971,13 @@ source.

 .SH XIII. Y2K Compliance in libpng

-June 25, 2009
+July 25, 2009

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

 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.4.0beta65 are Y2K compliant.  It is my belief that earlier
+upward through 1.4.0beta69 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
@@ -4130,7 +4145,7 @@ the first widely used release:
 1.4.0beta9-14       14    10400  14.so.0.0[.0]
 1.2.13              13    10213  12.so.0.13[.0]
 1.4.0beta15-36      14    10400  14.so.0.0[.0]
- 1.4.0beta37-65      14    10400  14.so.14.0[.0]
+ 1.4.0beta37-69      14    10400  14.so.14.0[.0]

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

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

-Libpng version 1.4.0beta65 - June 25, 2009:
+Libpng version 1.4.0beta69 - July 25, 2009:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).

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

-This code is released under the zlib/libpng license.
+This code is released under the libpng license.

-libpng versions 1.2.6, August 15, 2004, through 1.4.0beta65, June 25, 2009, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0beta69, July 25, 2009, are
 Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
@@ -4308,7 +4323,7 @@ certification mark of the Open Source Initiative.

 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-June 25, 2009
+July 25, 2009

 .\" end of man page

--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "June 25, 2009"
+.TH LIBPNGPF 3 "July 25, 2009"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta65
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta69
 (private functions)
 .SH SYNOPSIS
 \fB#include <png.h>\fP
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "June 25, 2009"
+.TH PNG 5 "July 25, 2009"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
--- a/png.c
+++ b/png.c
@@ -1,12 +1,12 @@

 /* png.c - location for general purpose libpng functions
 *
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */
@@ -16,7 +16,7 @@
 #include "pngpriv.h"

 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_0beta65 Your_png_h_is_not_version_1_4_0beta65;
+typedef version_1_4_0beta69 Your_png_h_is_not_version_1_4_0beta69;

 /* Version information for C files.  This had better match the version
 * string defined in png.h.  */
@@ -134,7 +134,7 @@ png_sig_cmp(png_bytep sig, png_size_t start, png_size_t num_to_check)

 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
 /* Function to allocate memory for zlib and clear it to 0. */
-voidpf /* private */
+voidpf /* PRIVATE */
 png_zalloc(voidpf png_ptr, uInt items, uInt size)
 {
   png_voidp ptr;
@@ -159,7 +159,7 @@ png_zalloc(voidpf png_ptr, uInt items, uInt size)
 }

 /* Function to free memory for zlib */
-void /* private */
+void /* PRIVATE */
 png_zfree(voidpf png_ptr, voidpf ptr)
 {
   png_free((png_structp)png_ptr, (png_voidp)ptr);
@@ -652,13 +652,13 @@ png_get_copyright(png_structp png_ptr)
 #else
 #ifdef __STDC__
   return ((png_charp) PNG_STRING_NEWLINE \
-     "libpng version x 1.4.0beta65 - June 25, 2009" PNG_STRING_NEWLINE \
+     "libpng version x 1.4.0beta69 - July 25, 2009" PNG_STRING_NEWLINE \
     "Copyright (c) 1998-2009 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
     "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
     "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
     PNG_STRING_NEWLINE);
 #else
-      return ((png_charp) "libpng version 1.4.0beta65 - June 25, 2009\
+      return ((png_charp) "libpng version 1.4.0beta69 - July 25, 2009\
      Copyright (c) 1998-2009 Glenn Randers-Pehrson\
      Copyright (c) 1996-1997 Andreas Dilger\
      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");
@@ -776,7 +776,11 @@ png_convert_size(size_t size)
 *    A and D, and X || Y is (X << 16) + Y.
 */

-void png_64bit_product (long v1, long v2, unsigned long *hi_product,
+void /* PRIVATE */
+png_64bit_product (long v1, long v2, unsigned long *hi_product,
+   unsigned long *lo_product);
+void /* PRIVATE */
+png_64bit_product (long v1, long v2, unsigned long *hi_product,
   unsigned long *lo_product)
 {
   int a, b, c, d;
@@ -800,7 +804,7 @@ void png_64bit_product (long v1, long v2, unsigned long *hi_product,
   *lo_product = (unsigned long)lo;
 }

-int /* private */
+int /* PRIVATE */
 png_check_cHRM_fixed(png_structp png_ptr,
   png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,
   png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
--- a/png.h
+++ b/png.h
@@ -1,17 +1,17 @@

 /* png.h - header file for PNG reference library
 *
- * libpng version 1.4.0beta65 - June 25, 2009
+ * libpng version 1.4.0beta69 - July 25, 2009
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license (See LICENSE, below)
+ * This code is released under the libpng license (See LICENSE, below)
 *
 * Authors and maintainers:
 *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
 *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *  libpng versions 0.97, January 1998, through 1.4.0beta65 - June 25, 2009: Glenn
+ *  libpng versions 0.97, January 1998, through 1.4.0beta69 - July 25, 2009: Glenn
 *  See also "Contributing Authors", below.
 *
 * Note about libpng version numbers:
@@ -129,7 +129,7 @@
 *    1.4.0beta9-14           14    10400  14.so.0.0[.0]
 *    1.2.13                  13    10213  12.so.0.13[.0]
 *    1.4.0beta15-36          14    10400  14.so.0.0[.0]
- *    1.4.0beta37-65          14    10400  14.so.14.0[.0]
+ *    1.4.0beta37-69          14    10400  14.so.14.0[.0]
 *
 *    Henceforth the source version will match the shared-library major
 *    and minor numbers; the shared-library major version number will be
@@ -159,7 +159,9 @@
 * If you modify libpng you may insert additional notices immediately following
 * this sentence.
 *
- * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta65, June 25, 2009, are
+ * This code is released under the libpng license.
+ *
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta69, July 25, 2009, are
 * Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
 * distributed according to the same disclaimer and license as libpng-1.2.5
 * with the following individual added to the list of Contributing Authors:
@@ -277,7 +279,7 @@
 *    an official declaration.
 *
 *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.4.0beta65 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.4.0beta69 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
@@ -333,9 +335,9 @@
 */

 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.4.0beta65"
+#define PNG_LIBPNG_VER_STRING "1.4.0beta69"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.4.0beta65 - June 25, 2009\n"
+   " libpng version 1.4.0beta69 - July 25, 2009\n"

 #define PNG_LIBPNG_VER_SONUM   14
 #define PNG_LIBPNG_VER_DLLNUM  14
@@ -348,7 +350,7 @@
 * PNG_LIBPNG_VER_STRING, omitting any leading zero:
 */

-#define PNG_LIBPNG_VER_BUILD  65
+#define PNG_LIBPNG_VER_BUILD  69

 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -1044,10 +1046,12 @@ typedef void (PNGAPI *png_unknown_chunk_ptr) PNGARG((png_structp));
 #define PNG_TRANSFORM_SWAP_ALPHA     0x0100    /* read and write */
 #define PNG_TRANSFORM_SWAP_ENDIAN    0x0200    /* read and write */
 #define PNG_TRANSFORM_INVERT_ALPHA   0x0400    /* read and write */
-#define PNG_TRANSFORM_STRIP_FILLER   0x0800    /* WRITE only */
+#define PNG_TRANSFORM_STRIP_FILLER   0x0800    /* write only */
 /* Added to libpng-1.2.34 */
 #define PNG_TRANSFORM_STRIP_FILLER_BEFORE PNG_TRANSFORM_STRIP_FILLER
-#define PNG_TRANSFORM_STRIP_FILLER_AFTER 0x1000 /* WRITE only */
+#define PNG_TRANSFORM_STRIP_FILLER_AFTER 0x1000 /* write only */
+/* Added to libpng-1.4.0 */
+#define PNG_TRANSFORM_GRAY_TO_RGB   0x2000      /* read only */

 /* Flags for MNG supported features */
 #define PNG_FLAG_MNG_EMPTY_PLTE     0x01
@@ -1357,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_4_0beta65;
+typedef png_structp version_1_4_0beta69;

 typedef png_struct FAR * FAR * png_structpp;

--- a/pngconf.h
+++ b/pngconf.h
@@ -1,13 +1,13 @@

 /* pngconf.h - machine configurable file for libpng
 *
- * libpng version 1.4.0beta65 - June 25, 2009
+ * libpng version 1.4.0beta69 - July 25, 2009
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,12 +1,12 @@

 /* pngerror.c - stub functions for i/o and memory allocation
 *
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
--- a/pngget.c
+++ b/pngget.c
@@ -1,12 +1,12 @@

 /* pngget.c - retrieval of values from info struct
 *
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,12 +1,12 @@

 /* pngmem.c - stub functions for memory allocation
 *
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,12 +1,12 @@

 /* pngpread.c - read a png file in push mode
 *
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1,13 +1,13 @@

 /* pngpriv.h - private declarations for use inside libpng
 *
- * libpng version 1.4.0beta65 - June 25, 2009
+ * libpng version 1.4.0beta69 - July 25, 2009
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */
--- a/pngread.c
+++ b/pngread.c
@@ -1,12 +1,12 @@

 /* pngread.c - read a PNG file
 *
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
@@ -1195,12 +1195,6 @@ png_read_png(png_structp png_ptr, png_infop info_ptr,

   if (png_ptr == NULL)
      return;
-#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
-   /* Invert the alpha channel from opacity to transparency
-    */
-   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
-       png_set_invert_alpha(png_ptr);
-#endif

   /* png_read_info() gives us all of the information from the
    * PNG file before the first IDAT (image data chunk).
@@ -1301,6 +1295,20 @@ png_read_png(png_structp png_ptr, png_infop info_ptr,
      png_set_swap(png_ptr);
 #endif

+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+   /* Invert the alpha channel from opacity to transparency
+    */
+   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+       png_set_invert_alpha(png_ptr);
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+   /* Expand grayscale image to RGB
+    */
+   if (transforms & PNG_TRANSFORM_GRAY_TO_RGB)
+       png_set_gray_to_rgb(png_ptr);
+#endif
+
   /* We don't handle adding filler bytes */

   /* Optional call to gamma correct and add the background to the palette
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,12 +1,12 @@

 /* pngrio.c - functions for data input
 *
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,12 +1,12 @@

 /* pngrtran.c - transforms the data in a row for PNG readers
 *
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
@@ -3952,6 +3952,35 @@ static PNG_CONST int png_gamma_shift[] =
 * tables, we don't make a full table if we are reducing to 8-bit in
 * the future.  Note also how the gamma_16 tables are segmented so that
 * we don't need to allocate > 64K chunks for a full 16-bit table.
+ *
+ * See the PNG extensions document for an integer algorithm for creating
+ * the gamma tables.  Maybe we will implement that here someday.
+ *
+ * We should only reach this point if
+ *
+ *      the file_gamma is known (i.e., the gAMA or sRGB chunk is present,
+ *      or the application has provided a file_gamma)
+ *
+ *   AND
+ *      {
+ *         the screen_gamma is known
+ *
+ *      OR
+ *
+ *         RGB_to_gray transformation is being performed
+ *      }
+ *
+ *   AND
+ *      {
+ *         the screen_gamma is different from the reciprocal of the
+ *         file_gamma by more than the specified threshold
+ *
+ *      OR
+ *
+ *         a background color has been specified and the file_gamma
+ *         and screen_gamma are not 1.0, within the specified threshold.
+ *      }
+ *
 */
 void /* PRIVATE */
 png_build_gamma_table(png_structp png_ptr)
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,12 +1,12 @@

 /* pngrutil.c - utilities to read a PNG file
 *
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
--- a/pngset.c
+++ b/pngset.c
@@ -1,12 +1,12 @@

 /* pngset.c - storage of image information into info struct
 *
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
--- a/pngtest.c
+++ b/pngtest.c
@@ -1,12 +1,12 @@

 /* pngtest.c - a simple test program to test libpng
 *
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
@@ -1619,4 +1619,4 @@ main(int argc, char *argv[])
 }

 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_0beta65 your_png_h_is_not_version_1_4_0beta65;
+typedef version_1_4_0beta69 your_png_h_is_not_version_1_4_0beta69;
--- a/pngtrans.c
+++ b/pngtrans.c
@@ -1,12 +1,12 @@

 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
 *
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */
--- a/pngwio.c
+++ b/pngwio.c
@@ -1,12 +1,12 @@

 /* pngwio.c - functions for data output
 *
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,12 +1,12 @@

 /* pngwrite.c - general routines to write a PNG file
 *
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */
@@ -1347,11 +1347,6 @@ png_write_png(png_structp png_ptr, png_infop info_ptr,
 {
   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)
-      png_set_invert_alpha(png_ptr);
-#endif

   /* Write the file header information. */
   png_write_info(png_ptr, info_ptr);
@@ -1411,6 +1406,18 @@ png_write_png(png_structp png_ptr, png_infop info_ptr,
      png_set_packswap(png_ptr);
 #endif

+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+   /* Invert the alpha channel from opacity to transparency */
+   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+      png_set_invert_alpha(png_ptr);
+#endif
+
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+   /* Invert the alpha channel from opacity to transparency */
+   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+      png_set_invert_alpha(png_ptr);
+#endif
+
   /* ----------------------- end of transformations ------------------- */

   /* Write the bits */
--- a/pngwtran.c
+++ b/pngwtran.c
@@ -1,12 +1,12 @@

 /* pngwtran.c - transforms the data in a row for PNG writers
 *
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,12 +1,12 @@

 /* pngwutil.c - utilities to write a PNG file
 *
- * Last changed in libpng 1.4.0 [June 25, 2009]
+ * Last changed in libpng 1.4.0 [July 25, 2009]
 * Copyright (c) 1998-2009 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.)
 *
- * This code is released under the zlib/libpng license.
+ * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */
@@ -2128,9 +2128,19 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
   png_uint_32 mins, bpp;
   png_byte filter_to_do = png_ptr->do_filter;
   png_uint_32 row_bytes = row_info->rowbytes;
-#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
   int num_p_filters = (int)png_ptr->num_prev_filters;
-#endif
+#endif 
+
+   png_debug(1, "in png_write_find_filter");
+
+#ifndef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+  if (png_ptr->row_number == 0 && filter_to_do == PNG_ALL_FILTERS)
+  {
+      /* These will never be selected so we need not test them. */
+      filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_PAETH);
+  }
+#endif 

   png_debug(1, "in png_write_find_filter");
   /* Find out how many bytes offset each pixel is */
--- a/projects/visualc6/README.txt
+++ b/projects/visualc6/README.txt
@@ -3,7 +3,7 @@ Microsoft Developer Studio Project File, Format Version 6.00 for libpng.
 Copyright (C) 2000-2004 Simon-Pierre Cadieux.
 Copyright (C) 2004 Cosmin Truta.

-This code is released under the zlib/libpng license.
+This code is released under the libpng license.
 For conditions of distribution and use, see copyright notice in png.h


--- a/projects/visualc71/README.txt
+++ b/projects/visualc71/README.txt
@@ -2,7 +2,7 @@ Microsoft Developer Studio Project File, Format Version 7.10 for libpng.

 Copyright (C) 2004 Simon-Pierre Cadieux.

-This code is released under the zlib/libpng license.
+This code is released under the libpng license.
 For conditions of distribution and use, see copyright notice in png.h

 Assumptions:
--- a/projects/visualc71/README_zlib.txt
+++ b/projects/visualc71/README_zlib.txt
@@ -7,7 +7,7 @@ Microsoft Developer Studio Project File, Format Version 7.10 for zlib.
 Copyright (C) 2004 Simon-Pierre Cadieux.
 Copyright (C) 2004 Cosmin Truta.

-This code is released under the zlib/libpng license.
+This code is released under the libpng license.
 For conditions of distribution and use, see copyright notice in zlib.h.


--- a/projects/xcode/Info.plist
+++ b/projects/xcode/Info.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>libpng</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.apple.carbonframeworktemplate</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+        <key>CFBundleShortVersionString</key>
+        <string>1.0</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+</dict>
+</plist>
--- a/projects/xcode/libpng.xcodeproj/project.pbxproj
+++ b/projects/xcode/libpng.xcodeproj/project.pbxproj
@@ -0,0 +1,339 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 44;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		14461C7109C3C37F005840C0 /* png.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C5D09C3C37F005840C0 /* png.c */; };
+		14461C7209C3C37F005840C0 /* png.h in Headers */ = {isa = PBXBuildFile; fileRef = 14461C5E09C3C37F005840C0 /* png.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		14461C7309C3C37F005840C0 /* pngconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 14461C5F09C3C37F005840C0 /* pngconf.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		14461C7409C3C37F005840C0 /* pngerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6009C3C37F005840C0 /* pngerror.c */; };
+		14461C7509C3C37F005840C0 /* pnggccrd.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6109C3C37F005840C0 /* pnggccrd.c */; };
+		14461C7609C3C37F005840C0 /* pngget.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6209C3C37F005840C0 /* pngget.c */; };
+		14461C7709C3C37F005840C0 /* pngmem.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6309C3C37F005840C0 /* pngmem.c */; };
+		14461C7809C3C37F005840C0 /* pngpread.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6409C3C37F005840C0 /* pngpread.c */; };
+		14461C7909C3C37F005840C0 /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6509C3C37F005840C0 /* pngread.c */; };
+		14461C7A09C3C37F005840C0 /* pngrio.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6609C3C37F005840C0 /* pngrio.c */; };
+		14461C7B09C3C37F005840C0 /* pngrtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6709C3C37F005840C0 /* pngrtran.c */; };
+		14461C7C09C3C37F005840C0 /* pngrutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6809C3C37F005840C0 /* pngrutil.c */; };
+		14461C7D09C3C37F005840C0 /* pngset.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6909C3C37F005840C0 /* pngset.c */; };
+		14461C7F09C3C37F005840C0 /* pngtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6B09C3C37F005840C0 /* pngtrans.c */; };
+		14461C8009C3C37F005840C0 /* pngvcrd.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6C09C3C37F005840C0 /* pngvcrd.c */; };
+		14461C8109C3C37F005840C0 /* pngwio.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6D09C3C37F005840C0 /* pngwio.c */; };
+		14461C8209C3C37F005840C0 /* pngwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6E09C3C37F005840C0 /* pngwrite.c */; };
+		14461C8309C3C37F005840C0 /* pngwtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6F09C3C37F005840C0 /* pngwtran.c */; };
+		14461C8409C3C37F005840C0 /* pngwutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C7009C3C37F005840C0 /* pngwutil.c */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		14461C5D09C3C37F005840C0 /* png.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = png.c; path = ../../png.c; sourceTree = SOURCE_ROOT; };
+		14461C5E09C3C37F005840C0 /* png.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = png.h; path = ../../png.h; sourceTree = SOURCE_ROOT; };
+		14461C5F09C3C37F005840C0 /* pngconf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pngconf.h; path = ../../pngconf.h; sourceTree = SOURCE_ROOT; };
+		14461C6009C3C37F005840C0 /* pngerror.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngerror.c; path = ../../pngerror.c; sourceTree = SOURCE_ROOT; };
+		14461C6109C3C37F005840C0 /* pnggccrd.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pnggccrd.c; path = ../../pnggccrd.c; sourceTree = SOURCE_ROOT; };
+		14461C6209C3C37F005840C0 /* pngget.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngget.c; path = ../../pngget.c; sourceTree = SOURCE_ROOT; };
+		14461C6309C3C37F005840C0 /* pngmem.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngmem.c; path = ../../pngmem.c; sourceTree = SOURCE_ROOT; };
+		14461C6409C3C37F005840C0 /* pngpread.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngpread.c; path = ../../pngpread.c; sourceTree = SOURCE_ROOT; };
+		14461C6509C3C37F005840C0 /* pngread.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngread.c; path = ../../pngread.c; sourceTree = SOURCE_ROOT; };
+		14461C6609C3C37F005840C0 /* pngrio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngrio.c; path = ../../pngrio.c; sourceTree = SOURCE_ROOT; };
+		14461C6709C3C37F005840C0 /* pngrtran.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngrtran.c; path = ../../pngrtran.c; sourceTree = SOURCE_ROOT; };
+		14461C6809C3C37F005840C0 /* pngrutil.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngrutil.c; path = ../../pngrutil.c; sourceTree = SOURCE_ROOT; };
+		14461C6909C3C37F005840C0 /* pngset.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngset.c; path = ../../pngset.c; sourceTree = SOURCE_ROOT; };
+		14461C6B09C3C37F005840C0 /* pngtrans.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngtrans.c; path = ../../pngtrans.c; sourceTree = SOURCE_ROOT; };
+		14461C6C09C3C37F005840C0 /* pngvcrd.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngvcrd.c; path = ../../pngvcrd.c; sourceTree = SOURCE_ROOT; };
+		14461C6D09C3C37F005840C0 /* pngwio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngwio.c; path = ../../pngwio.c; sourceTree = SOURCE_ROOT; };
+		14461C6E09C3C37F005840C0 /* pngwrite.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngwrite.c; path = ../../pngwrite.c; sourceTree = SOURCE_ROOT; };
+		14461C6F09C3C37F005840C0 /* pngwtran.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngwtran.c; path = ../../pngwtran.c; sourceTree = SOURCE_ROOT; };
+		14461C7009C3C37F005840C0 /* pngwutil.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngwutil.c; path = ../../pngwutil.c; sourceTree = SOURCE_ROOT; };
+		8D07F2C70486CC7A007CD1D0 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
+		8D07F2C80486CC7A007CD1D0 /* libpng.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libpng.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		8D07F2C30486CC7A007CD1D0 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		034768DDFF38A45A11DB9C8B /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8D07F2C80486CC7A007CD1D0 /* libpng.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		0867D691FE84028FC02AAC07 /* libpng */ = {
+			isa = PBXGroup;
+			children = (
+				08FB77ACFE841707C02AAC07 /* Source */,
+				089C1665FE841158C02AAC07 /* Resources */,
+				034768DDFF38A45A11DB9C8B /* Products */,
+			);
+			name = libpng;
+			sourceTree = "<group>";
+		};
+		089C1665FE841158C02AAC07 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				8D07F2C70486CC7A007CD1D0 /* Info.plist */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		08FB77ACFE841707C02AAC07 /* Source */ = {
+			isa = PBXGroup;
+			children = (
+				14461C5D09C3C37F005840C0 /* png.c */,
+				14461C5E09C3C37F005840C0 /* png.h */,
+				14461C5F09C3C37F005840C0 /* pngconf.h */,
+				14461C6009C3C37F005840C0 /* pngerror.c */,
+				14461C6109C3C37F005840C0 /* pnggccrd.c */,
+				14461C6209C3C37F005840C0 /* pngget.c */,
+				14461C6309C3C37F005840C0 /* pngmem.c */,
+				14461C6409C3C37F005840C0 /* pngpread.c */,
+				14461C6509C3C37F005840C0 /* pngread.c */,
+				14461C6609C3C37F005840C0 /* pngrio.c */,
+				14461C6709C3C37F005840C0 /* pngrtran.c */,
+				14461C6809C3C37F005840C0 /* pngrutil.c */,
+				14461C6909C3C37F005840C0 /* pngset.c */,
+				14461C6B09C3C37F005840C0 /* pngtrans.c */,
+				14461C6C09C3C37F005840C0 /* pngvcrd.c */,
+				14461C6D09C3C37F005840C0 /* pngwio.c */,
+				14461C6E09C3C37F005840C0 /* pngwrite.c */,
+				14461C6F09C3C37F005840C0 /* pngwtran.c */,
+				14461C7009C3C37F005840C0 /* pngwutil.c */,
+			);
+			name = Source;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		8D07F2BD0486CC7A007CD1D0 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				14461C7209C3C37F005840C0 /* png.h in Headers */,
+				14461C7309C3C37F005840C0 /* pngconf.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		8D07F2BC0486CC7A007CD1D0 /* libpng */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "libpng" */;
+			buildPhases = (
+				8D07F2BD0486CC7A007CD1D0 /* Headers */,
+				8D07F2BF0486CC7A007CD1D0 /* Resources */,
+				8D07F2C10486CC7A007CD1D0 /* Sources */,
+				8D07F2C30486CC7A007CD1D0 /* Frameworks */,
+				8D07F2C50486CC7A007CD1D0 /* Rez */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = libpng;
+			productInstallPath = "$(HOME)/Library/Frameworks";
+			productName = libpng;
+			productReference = 8D07F2C80486CC7A007CD1D0 /* libpng.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		0867D690FE84028FC02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "libpng" */;
+			compatibilityVersion = "Xcode 2.4";
+			hasScannedForEncodings = 1;
+			mainGroup = 0867D691FE84028FC02AAC07 /* libpng */;
+			productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */;
+			projectDirPath = "";
+			projectRoot = ../..;
+			targets = (
+				8D07F2BC0486CC7A007CD1D0 /* libpng */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		8D07F2BF0486CC7A007CD1D0 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXRezBuildPhase section */
+		8D07F2C50486CC7A007CD1D0 /* Rez */ = {
+			isa = PBXRezBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXRezBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		8D07F2C10486CC7A007CD1D0 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				14461C7109C3C37F005840C0 /* png.c in Sources */,
+				14461C7409C3C37F005840C0 /* pngerror.c in Sources */,
+				14461C7509C3C37F005840C0 /* pnggccrd.c in Sources */,
+				14461C7609C3C37F005840C0 /* pngget.c in Sources */,
+				14461C7709C3C37F005840C0 /* pngmem.c in Sources */,
+				14461C7809C3C37F005840C0 /* pngpread.c in Sources */,
+				14461C7909C3C37F005840C0 /* pngread.c in Sources */,
+				14461C7A09C3C37F005840C0 /* pngrio.c in Sources */,
+				14461C7B09C3C37F005840C0 /* pngrtran.c in Sources */,
+				14461C7C09C3C37F005840C0 /* pngrutil.c in Sources */,
+				14461C7D09C3C37F005840C0 /* pngset.c in Sources */,
+				14461C7F09C3C37F005840C0 /* pngtrans.c in Sources */,
+				14461C8009C3C37F005840C0 /* pngvcrd.c in Sources */,
+				14461C8109C3C37F005840C0 /* pngwio.c in Sources */,
+				14461C8209C3C37F005840C0 /* pngwrite.c in Sources */,
+				14461C8309C3C37F005840C0 /* pngwtran.c in Sources */,
+				14461C8409C3C37F005840C0 /* pngwutil.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		4FADC24308B4156D00ABE55E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				DYLIB_COMPATIBILITY_VERSION = 14;
+				DYLIB_CURRENT_VERSION = 14;
+				FRAMEWORK_VERSION = 1.4.0beta69;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = NO;
+				GCC_PREFIX_HEADER = "";
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(HOME)/Library/Frameworks";
+				LIBRARY_STYLE = DYNAMIC;
+				MACH_O_TYPE = mh_dylib;
+				OTHER_LDFLAGS = "-lz";
+				PRODUCT_NAME = libpng;
+				WRAPPER_EXTENSION = framework;
+				ZERO_LINK = YES;
+			};
+			name = Debug;
+		};
+		4FADC24408B4156D00ABE55E /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = (
+					ppc,
+					i386,
+				);
+				DYLIB_COMPATIBILITY_VERSION = 14;
+				DYLIB_CURRENT_VERSION = 14;
+				FRAMEWORK_VERSION = 1.4.0beta69;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_PRECOMPILE_PREFIX_HEADER = NO;
+				GCC_PREFIX_HEADER = "";
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(HOME)/Library/Frameworks";
+				LIBRARY_STYLE = DYNAMIC;
+				MACH_O_TYPE = mh_dylib;
+				OTHER_LDFLAGS = "-lz";
+				PRODUCT_NAME = libpng;
+				WRAPPER_EXTENSION = framework;
+			};
+			name = Release;
+		};
+		4FADC24708B4156D00ABE55E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = (
+					ppc,
+					i386,
+				);
+				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
+				GCC_VERSION_i386 = 4.0;
+				GCC_VERSION_ppc = 3.3;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				"MACOSX_DEPLOYMENT_TARGET[arch=i386]" = 10.4;
+				"MACOSX_DEPLOYMENT_TARGET[arch=ppc]" = 10.2;
+				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
+				MACOSX_DEPLOYMENT_TARGET_ppc = 10.2;
+				PREBINDING = NO;
+				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
+				"SDKROOT[arch=i386]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
+				"SDKROOT[arch=ppc]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.2.8.sdk";
+				SDKROOT_i386 = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
+				SDKROOT_ppc = "$(DEVELOPER_SDK_DIR)/MacOSX10.2.8.sdk";
+			};
+			name = Debug;
+		};
+		4FADC24808B4156D00ABE55E /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = (
+					ppc,
+					i386,
+				);
+				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
+				GCC_VERSION_i386 = 4.0;
+				GCC_VERSION_ppc = 3.3;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				"MACOSX_DEPLOYMENT_TARGET[arch=i386]" = 10.4;
+				"MACOSX_DEPLOYMENT_TARGET[arch=ppc]" = 10.2;
+				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
+				MACOSX_DEPLOYMENT_TARGET_ppc = 10.2;
+				PREBINDING = NO;
+				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
+				"SDKROOT[arch=i386]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
+				"SDKROOT[arch=ppc]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.2.8.sdk";
+				SDKROOT_i386 = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
+				SDKROOT_ppc = "$(DEVELOPER_SDK_DIR)/MacOSX10.2.8.sdk";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "libpng" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4FADC24308B4156D00ABE55E /* Debug */,
+				4FADC24408B4156D00ABE55E /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "libpng" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4FADC24708B4156D00ABE55E /* Debug */,
+				4FADC24808B4156D00ABE55E /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
+}
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -3,7 +3,7 @@ project(PNG)

 # Copyright (C) 2007 Glenn Randers-Pehrson

-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

@@ -170,7 +170,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in

 # SET UP LINKS
 set_target_properties(${PNG_LIB_NAME} PROPERTIES
-#    VERSION 14.${PNGLIB_RELEASE}.1.4.0beta65
+#    VERSION 14.${PNGLIB_RELEASE}.1.4.0beta69
     VERSION 14.${PNGLIB_RELEASE}.0
     SOVERSION 14
     CLEAN_DIRECT_OUTPUT 1)
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -5,13 +5,13 @@

 # Copyright (C) 2002 Glenn Randers-Pehrson

-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Modeled after libxml-config.

-version=1.4.0beta65
+version=1.4.0beta69
 prefix=""
 libdir=""
 libs=""
--- a/scripts/libpng-config.in
+++ b/scripts/libpng-config.in
@@ -5,7 +5,7 @@

 # Copyright (C) 2002, 2004, 2006, 2007 Glenn Randers-Pehrson

-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

--- a/scripts/libpng.icc
+++ b/scripts/libpng.icc
@@ -2,7 +2,7 @@
 // IBM VisualAge/C++ version 4.0 or later
 // Copyright (C) 2000 Cosmin Truta
 //
-// This code is released under the zlib/libpng license.
+// This code is released under the libpng license.
 // For conditions of distribution and use, see the disclaimer
 // and license in png.h
 //
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng14

 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.4.0beta65
+Version: 1.4.0beta69
 Libs: -L${libdir} -lpng14
 Cflags: -I${includedir}
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -4,14 +4,14 @@
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger

-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
 LIBNAME=libpng14
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -4,14 +4,14 @@
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger

-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
 LIBNAME=libpng14
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -4,7 +4,7 @@
 # Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc)
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

@@ -23,7 +23,7 @@ LN_SF = ln -f -s

 LIBNAME=libpng14
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 prefix=/usr/local
--- a/scripts/makefile.amiga
+++ b/scripts/makefile.amiga
@@ -2,7 +2,7 @@
 # makefile for libpng and SAS C V6.5x compiler
 # Copyright (C) 1995-2000 Wolf Faust
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
--- a/scripts/makefile.atari
+++ b/scripts/makefile.atari
@@ -2,7 +2,7 @@
 # Copyright (C) 2002 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -4,14 +4,14 @@
 # Copyright (C) 1999 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
 LIBNAME=libpng14
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -8,7 +8,7 @@
 # Copyright (C) 1998-2000 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

@@ -68,7 +68,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng14
 PNGMAJ = 14
 CYGDLL = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 SHAREDLIB=cygpng$(CYGDLL).dll
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -5,7 +5,7 @@
 #  Copyright (C) 1998, 1999 Greg Roelofs
 #  Copyright (C) 1996, 1997 Andreas Dilger
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

@@ -22,7 +22,7 @@ ZLIBINC=../zlib
 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -2,13 +2,13 @@
 # Copyright (C) 2000-2002, 2006 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng14

--- a/scripts/makefile.dj2
+++ b/scripts/makefile.dj2
@@ -2,7 +2,7 @@
 # Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -3,7 +3,7 @@
 # and Glenn Randers-Pehrson
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

@@ -16,7 +16,7 @@
 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.freebsd
+++ b/scripts/makefile.freebsd
@@ -1,7 +1,7 @@
 # makefile for libpng under FreeBSD
 # Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

--- a/scripts/makefile.gcc
+++ b/scripts/makefile.gcc
@@ -3,7 +3,7 @@
 # Copyright (C) 2000 Cosmin Truta
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -3,7 +3,7 @@
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42
 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

@@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include
 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -4,14 +4,14 @@
 # Copyright (C) 1998, 1999 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -3,7 +3,7 @@
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42
 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

@@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include
 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.ibmc
+++ b/scripts/makefile.ibmc
@@ -3,7 +3,7 @@
 # Copyright (C) 2006 Glenn Randers-Pehrson
 # Copyright (C) 2000 Cosmin Truta
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
--- a/scripts/makefile.intel
+++ b/scripts/makefile.intel
@@ -5,7 +5,7 @@
 # Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is
 # copyright 1995 Guy Eric Schalnat, Group 42, Inc.
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
--- a/scripts/makefile.knr
+++ b/scripts/makefile.knr
@@ -2,7 +2,7 @@
 # Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -3,14 +3,14 @@
 # Glenn Randers-Pehrson
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -8,7 +8,7 @@
 # Copyright (C) 1998-2000, 2007 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

@@ -68,7 +68,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng14
 PNGMAJ = 14
 MINGDLL = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 SHAREDLIB=libpng$(MINGDLL).dll
--- a/scripts/makefile.mips
+++ b/scripts/makefile.mips
@@ -2,7 +2,7 @@
 # Copyright (C) Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

--- a/scripts/makefile.msc
+++ b/scripts/makefile.msc
@@ -2,7 +2,7 @@
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 # Copyright (C) 2006, 2009 Glenn Randers-Pehrson
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -4,7 +4,7 @@
 # Copyright (C) 2002 Patrick R.L. Welche
 # Copyright (C) 2007, 2009 Glenn Randers-Pehrson
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng14

 LIB=	png14
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.4.0beta65
+SHLIB_MINOR=	1.4.0beta69
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -4,7 +4,7 @@
 # Copyright (C) 2002 Patrick R.L. Welche
 # Copyright (C) 2007, 2009 Glenn Randers-Pehrson
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng

 LIB=	png
 SHLIB_MAJOR=	3
-SHLIB_MINOR=	1.4.0beta65
+SHLIB_MINOR=	1.4.0beta69
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -3,14 +3,14 @@
 # Glenn Randers-Pehrson
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -2,7 +2,7 @@
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 # Copyright (C) 2007-2008 Glenn Randers-Pehrson
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

@@ -11,7 +11,7 @@ LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat

 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.4.0beta65
+SHLIB_MINOR=	1.4.0beta69

 LIB=	png
 SRCS=	png.c pngerror.c pngget.c pngmem.c pngpread.c \
--- a/scripts/makefile.os2
+++ b/scripts/makefile.os2
@@ -1,6 +1,6 @@
 # makefile for libpng on OS/2 with gcc
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -5,14 +5,14 @@
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -2,14 +2,14 @@
 # Copyright (C) 2001-2002, 2006 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
 LIBNAME=libpng14
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -2,14 +2,14 @@
 # Copyright (C) 2001-2002, 2006, 2007 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
 LIBNAME=libpng14
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -5,13 +5,13 @@
 # Copyright (C) 1998-2001 Greg Roelofs
 # Copyright (C) 1996-1997 Andreas Dilger
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng14

--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -4,14 +4,14 @@
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 14
-PNGMIN = 1.4.0beta65
+PNGMIN = 1.4.0beta69
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.std
+++ b/scripts/makefile.std
@@ -2,7 +2,7 @@
 # Copyright (C) 2002, 2006 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

--- a/scripts/makefile.sunos
+++ b/scripts/makefile.sunos
@@ -2,7 +2,7 @@
 # Copyright (C) 2002, 2006 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

--- a/scripts/makefile.vcawin32
+++ b/scripts/makefile.vcawin32
@@ -2,7 +2,7 @@
 # Copyright (C) 2006,2009 Glenn Randers-Pehrson
 # Copyright (C) 1998 Tim Wegner
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
--- a/scripts/makefile.vcwin32
+++ b/scripts/makefile.vcwin32
@@ -2,7 +2,7 @@
 # Copyright (C) 1998 Tim Wegner
 # Copyright (C) 2006,2009 Glenn Randers-Pehrson
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
--- a/scripts/makefile.watcom
+++ b/scripts/makefile.watcom
@@ -4,7 +4,7 @@
 # Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is
 # copyright 1995 Guy Eric Schalnat, Group 42, Inc.
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------

-; Version 1.4.0beta65
+; Version 1.4.0beta69

 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"
--- a/scripts/pngwin.def
+++ b/scripts/pngwin.def
@@ -5,7 +5,7 @@
 LIBRARY

 EXPORTS
-;Version 1.4.0beta65
+;Version 1.4.0beta69
  png_build_grayscale_palette
  png_chunk_error
  png_chunk_warning
--- a/scripts/smakefile.ppc
+++ b/scripts/smakefile.ppc
@@ -2,7 +2,7 @@
 # makefile for libpng and SAS C V6.58/7.00 PPC compiler
 # Copyright (C) 1998 by Andreas R. Kleinert
 #
-# This code is released under the zlib/libpng license.
+# This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
Author	SHA1	Message	Date
Glenn Randers-Pehrson	1cece74438	[devel] Imported from libpng-1.4.0beta69.tar	2009-07-25 09:26:53 -05:00
Glenn Randers-Pehrson	3f705ba9a5	[devel] Added a prototype for png_64bit_product() in png.c (suggested by Peter Breitenlohner)	2009-07-23 12:53:06 -05:00
Glenn Randers-Pehrson	8f075be1e2	[devel] Fixed up xcode project (Alam Arias)	2009-07-19 19:33:22 -05:00
Glenn Randers-Pehrson	8cb69f0f2b	[devel] Removed extraneous declaration from the new call to png_read_gray_to_rgb() (bug introduced in libpng-1.4.0beta67). (Patch contributed by Alam Arias)	2009-07-19 19:24:58 -05:00
Glenn Randers-Pehrson	97a4573885	[devel] Describe new filter-selection test in CHANGES and ANNOUNCE.	2009-07-19 15:10:36 -05:00
Glenn Randers-Pehrson	4ace0e1530	[devel] Revised the new test to run faster in the usual PNG_ALL_FILTERS case. The previous, more accurate test, would save some computation in uncommon cases, but is probably not worth while in the long run.	2009-07-19 15:04:35 -05:00
Glenn Randers-Pehrson	9d8b41ea6f	[devel] Relocated new 'if' test after the 'png_debug(1, "in png_write_find_filter");' statement.	2009-07-19 14:45:43 -05:00
Glenn Randers-Pehrson	0b1ba8c05e	[devel] Bump version to libpng-1.4.0beta69	2009-07-19 14:30:05 -05:00
Glenn Randers-Pehrson	12a11c521b	[devel] Imported from libpng-1.4.0beta68.tar	2009-07-19 14:27:36 -05:00
Glenn Randers-Pehrson	9c90d7f4ee	[devel] Revised test for avoiding filter selection tests to obtain the same result as previously when the user asks for a filter selection that does not include NONE or SUB, e.g., if the user asks for PAETH-only that's what they should get.	2009-07-19 13:11:25 -05:00
Glenn Randers-Pehrson	575d067998	[devel] Revised test for avoiding filter selection tests to obtain the same result as previously when the user asks for a filter selection that does not include NONE or SUB, e.g., if the user asks for PAETH-only that's what they should get.	2009-07-19 12:57:34 -05:00
Glenn Randers-Pehrson	ae4af5600d	[devel] Avoid some tests while selecting a filter. The AVG and PAETH filters will never be selected for the first row, so we need not test them.	2009-07-18 11:28:33 -05:00
Glenn Randers-Pehrson	ee100094e4	[devel] Bump version to libpng-1.4.0beta68	2009-07-07 13:55:58 -05:00
Glenn Randers-Pehrson	bc7156d089	[devel] Imported from libpng-1.4.0beta67.tar	2009-07-06 09:14:14 -05:00
Glenn Randers-Pehrson	237d1fba11	[devel] add "xcode" project contributed by Alam Arias	2009-07-05 14:21:54 -05:00
Glenn Randers-Pehrson	99708d560f	[devel] Added high-level PNG_TRANSFORM_GRAY_TO_RGB transform.	2009-06-29 17:30:00 -05:00
Glenn Randers-Pehrson	6878eb6899	[devel] Relocate the INVERT_ALPHA function within png_read_png() and png_write_png().	2009-06-29 16:45:53 -05:00
Glenn Randers-Pehrson	cd2634b3ce	[devel] Bump version to libpng-1.4.0beta67	2009-06-29 16:39:03 -05:00
Glenn Randers-Pehrson	bfbf86558c	[devel] Imported from libpng-1.4.0beta66.tar	2009-06-26 21:49:39 -05:00