Imported from libpng-1.2.20rc3.tar

Imported from libpng-1.2.20rc2.tar
Imported from libpng-1.2.20rc1.tar
2025-07-10 18:04:09 +02:00 · 2009-04-06 16:14:45 -05:00 · 2009-04-06 16:14:43 -05:00 · 2009-04-06 16:14:40 -05:00 · 2009-04-06 16:14:37 -05:00 · 2009-04-06 16:14:35 -05:00
71 changed files with 4450 additions and 3605 deletions
--- a/120
+++ b/120
@@ -1,5 +1,5 @@

-Libpng 1.2.19beta18 - June 23, 2007
+Libpng 1.2.20rc3 - August 30, 2007

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

-   libpng-1.2.19beta18.tar.gz
-   libpng-1.2.19beta18.tar.bz2
+   libpng-1.2.20rc3.tar.gz
+   libpng-1.2.20rc3.tar.bz2

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

-   libpng-1.2.19beta18-no-config.tar.gz
-   libpng-1.2.19beta18-no-config.tar.bz2
+   libpng-1.2.20rc3-no-config.tar.gz
+   libpng-1.2.20rc3-no-config.tar.bz2

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

-   lp1219b18.zip
-   lp1219b18.tar.bz2
+   lp1220r03.zip
+   lp1220r03.tar.bz2

 Project files

-   libpng-1.2.19beta18-project-netware.zip
-   libpng-1.2.19beta18-project-wince.zip
+   libpng-1.2.20rc3-project-netware.zip
+   libpng-1.2.20rc3-project-wince.zip

 Other information:

-   libpng-1.2.19beta18-README.txt
-   libpng-1.2.19beta18-KNOWNBUGS.txt
-   libpng-1.2.19beta18-LICENSE.txt
-   libpng-1.2.19beta18-Y2K-compliance.txt
+   libpng-1.2.20rc3-README.txt
+   libpng-1.2.20rc3-KNOWNBUGS.txt
+   libpng-1.2.20rc3-LICENSE.txt
+   libpng-1.2.20rc3-Y2K-compliance.txt

-Changes since the last public release (1.2.18):
+Changes since the last public release (1.2.19):

-version 1.2.19beta1 [May 18, 2007]
-  Changed "const static" to "static PNG_CONST" everywhere, mostly undoing
-    change of libpng-1.2.17beta2.  Changed other "const" to "PNG_CONST"
+version 1.2.20beta01 [August 19, 2007]
+  Fixed problem with compiling pnggccrd.c on Intel-Apple platforms.
+  Added PNG_NO_ERROR_TEXT feature, with demo in contrib/pngminim
+  Removed define PNG_WARN_UNINITIALIZED_ROW 1 /* 0: warning; 1: error */
+    because it caused some trouble.

-version 1.2.19beta2 [May 18, 2007]
-  Fixed png_do_expand() to only use the appropriate bits of tRNS value.
+version 1.2.20beta02 [August 20, 2007]
+  Avoid compiling pnggccrd.c on Intel-Apple platforms.

-version 1.2.19beta3 [May 20, 2007]
-  Add some "png_byte" typecasts in png_check_keyword().
-  Write new_key instead of key in zTXt chunk.
+version 1.2.20beta03 [August 20, 2007]
+  Added "/D PNG_NO_MMX_CODE" to the non-mmx builds of projects/visualc6
+    and visualc71.

-version 1.2.19beta4 [May 21, 2007]
-  Add png_snprintf() function and use it in place of sprint() for improved
-    defense against buffer overflows.
+version 1.2.20beta04 [August 21, 2007]
+  Revised pngvcrd.c for improved efficiency (Steve Snyder).

-version 1.2.19beta5 [May 21, 2007]
-  Fixed png_handle_tRNS() to only use the appropriate bits of tRNS value.
-  Changed handling of more unused parameters, to avoid compiler warnings.
-  Removed some PNG_CONST in pngwutil.c to avoid compiler warnings.
+version 1.2.20rc1 [August 23, 2007]
+  Revised pngconf.h to set PNG_NO_MMX_CODE for gcc-3.x compilers.

-version 1.2.19beta6 [May 22, 2007]
-  Added some #ifdef PNG_MMX_CODE_SUPPORTED where needed in pngvcrd.c
-  Added a special "_MSC_VER" case that defines png_snprintf to _snprintf
+version 1.2.20rc2 [August 27, 2007]
+  Revised scripts/CMakeLists.txt
+  Revised #ifdefs to ensure one and only one of pnggccrd.c, pngvcrd.c,
+    or part of pngrutil.c is selected.

-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
-    the warnings that png_squelch_warnings was squelching.
-
-version 1.2.19beta8 [May 22, 2007]
-  Removed __MMX__ from test in pngconf.h.
-
-version 1.2.19beta9 [May 23, 2007]
-  Made png_squelch_warnings() available via PNG_SQUELCH_WARNINGS macro.
-  Revised png_squelch_warnings() so it might work.
-  Updated makefile.sgcc and makefile.solaris; added makefile.solaris-x86.
-
-version 1.2.19beta10 [May 24, 2007]
-  Resquelched png_squelch_warnings(), use "__attribute__((used))" instead.
-
-version 1.2.19beta11 [May 28, 2007]
-  Return 0 from png_get_sPLT() and png_get_unknown_chunks() if png_ptr is NULL;
-    changed three remaining instances of png_strcpy() to png_strncpy() (David
-    Hill).
-  Make test for NULL row_buf at the beginning of png_do_read_transformations
-    unconditional.
-
-version 1.2.19beta12 [May 28, 2007]
-  Revised pnggccrd.c.
-
-version 1.2.19beta13 [June 14, 2007]
-  Prefer PNG_USE_PNGVCRD when _MSC_VER is defined in pngconf.h
-
-version 1.2.19beta14 [June 16, 2007]
-  Fix bug with handling of 16-bit transparency, introduced in 1.2.19beta2
-
-version 1.2.19beta15 [June 17, 2007]
-  Revised pnggccrd.c.
-
-version 1.2.19beta16 [June 18, 2007]
-  Revised pnggccrd.c again.
-  Updated contrib/gregbook.
-  Changed '#include "pnggccrd.c"' to 'include "$srcdir/pnggccrd.c"'
-    in configure.ac
-
-version 1.2.19beta17 [June 19, 2007]
-  Revised many of the makefiles, to set -DPNG_NO_MMX_CODE where needed
-    and to not use -O3 unless -DPNG_NO_MMX_CODE is also set.
-
-version 1.2.19beta18 [June 23, 2007]
-  Replaced some C++ style comments with C style comments in pnggccrd.c.
-  Copied optimized C code from pnggccrd.c to pngrutil.c, removed dependency
-    on pnggccrd.o from many makefiles.
-  Added sl and dylib to list of extensions be installed by Makefile.am
+version 1.2.20rc3 [August 30, 2007]
+  Remove a little more code in pngwutil.c when PNG_NO_WRITE_FILTER is selected.
+  Added /D _CRT_SECURE_NO_WARNINGS to visual6c and visualc71 projects.
+  Compile png_mmx_support() in png.c even when PNG_NO_MMX_CODE is defined.
+  Restored a "superfluous" #ifdef that was removed from 1.2.20rc2 pnggccrd.c,
+    breaking the png_mmx_support() function.

 Send comments/corrections/commendations to png-mng-implement at lists.sf.net

--- a/122
+++ b/122
@@ -1480,7 +1480,7 @@ version 1.2.9beta5 [March 4, 2006]
  Restored scripts/makefile.elf which was inadvertently deleted.

 version 1.2.9beta6 [March 6, 2006]
-  Fixed typo (19) in configuration files.
+  Fixed typo (20) in configuration files.

 version 1.2.9beta7 [March 7, 2006]
  Removed libpng.vers and libpng.sym from libpng12_la_SOURCES in Makefile.am
@@ -1806,6 +1806,126 @@ version 1.2.19beta18 [June 23, 2007]
    on pnggccrd.o from many makefiles.
  Added sl and dylib to list of extensions be installed by Makefile.am

+version 1.2.19beta19 [June 28, 2007]
+  Fixed testing PNG_RGB_TO_GRAY_ERR & PNG_RGB_TO_GRAY_WARN in pngrtran.c
+  More cleanup of pnggccrd.c and pngvcrd.c
+
+version 1.2.19beta20 [June 29, 2007]
+  Rebuilt Makefile.in and configure using libtool-1.5.24.
+  Fixed typo in pnggccrd.c
+
+version 1.2.19beta21 [June 30, 2007]
+  More revision of pnggccrd.c
+  Added "test" target to Makefile.in and Makefile.am
+
+version 1.2.19beta22 [July 3, 2007]
+  Added info about pngrutil/pnggccrd/pngvcrd to png_get_header_version()
+  Fix type definition of dummy_value_a, b in pnggccrd.c
+
+version 1.2.19beta23 [July 10, 2007]
+  Revert change to type definition of dummy_value_a, b in pnggccrd.c
+  Make sure __PIC__ is defined in pnggccrd.c when PIC is defined.
+  Require gcc-4.1 or better to use PNG_HAVE_MMX_FILTER_ROW on x86_64 platforms
+
+version 1.2.19beta24 [July 14, 2007]
+  Added PNG_NO_READ_FILTER, PNG_NO_WRITE_FILTER, PNG_NO_WARNING macros.
+  Added contrib/pngminim to demonstrate building minimal encoder and decoder
+
+version 1.2.19beta25 [July 15, 2007]
+  Removed the new PNG_NO_READ_FILTER macro since it would make the library
+    unable to read valid PNG files, and filtering is at the heart of the
+    PNG format.
+
+version 1.2.19beta26 [July 16, 2007]
+  Changed "png_free(str)" to "png_free(png_ptr,str)" in pngrutil.c WinCE
+    code (Yves Piguet).  This bug was introduced in libpng-1.2.14.
+  Updated scripts/CMakeLists.txt
+  Relocated a misplaced #endif in pnggccrd.c
+
+version 1.2.19beta27 [July 17, 2007]
+  Fixed incorrect stride and number of bytes copied (was 4 instead of
+    6 bytes) in the cleanup loop of pnggccrd.c and pngvcrd.c for handling
+    the end of 48-bit interlaced rows (Glenn R-P).
+
+version 1.2.19beta28 [July 19, 2007]
+  Removed requirement for gcc-4.1 or better to use PNG_HAVE_MMX_FILTER_ROW
+    on x86_64 platforms
+  Added png_warning() in pngrutil.c for short iCCP, iTXt, sPLT, or zTXT chunks.
+  Revised pngtest.c so warnings are displayed regardless of PNG_NO_STDIO.
+
+version 1.2.19beta29 [July 20, 2007]
+  Fix typo in pnggccrd.c (%%eax should be %%ax in secondloop48)
+
+version 1.2.19beta30 [July 26, 2007]
+  Revised pnggccrd.c
+
+version 1.2.19beta31 [July 27, 2007]
+  Fix typos in pnggccrd.c
+
+version 1.0.27rc1 and 1.2.19rc1 [July 31, 2007]
+  Disable PNG_MMX_CODE_SUPPORTED when PNG_ASSEMBLER_CODE_SUPPORTED is off.
+  Enable PNG_MMX_READ_FILTER_* by default, except when gcc-3.x is being
+    used (they were inadvertently disabled in libpng-1.2.19beta23).
+  Fix some debugging statements in pnggccrd.c and pngrutil.c
+  Added information about disabling the MMX code in libpng documentation.
+
+version 1.0.27rc2 and 1.2.19rc2 [August 4, 2007]
+  Removed some "#if 0" blocks.
+  Made a global struct local in pngvcrd.c to make it thread safe.
+  Issue a png_error() if application attempts to transform a row tht
+    has not been initialized.
+
+version 1.0.27rc3 and 1.2.19rc3 [August 9, 2007]
+  Slightly revised pngvcrd.c
+
+version 1.0.27rc4 and 1.2.19rc4 [August 9, 2007]
+  Revised pnggccrd.c debugging change of rc1, which was broken.
+  Revised scripts/CMakeLists.txt
+  Change default to PNG_NO_GLOBAL_ARRAYS for MSVC.
+  Turn off PNG_FLAG_ROW_INIT flag when setting transforms that expand pixels.
+
+version 1.0.27rc5 and 1.2.19rc5 [August 10, 2007]
+  Fix typo (missing '"') in pnggccrd.c
+  Revise handling of png_strtod in recent versions of WINCE
+
+version 1.0.27rc6 and 1.2.19rc6 [August 15, 2007]
+  Fix typo (missing ',') in contrib/gregbook/readpng2.c
+  Undid row initialization error exit added to rc2 and rc4.
+
+version 1.0.27 and 1.2.19 [August 18, 2007]
+  Conditionally restored row initialization error exit.
+
+version 1.2.20beta01 [August 19, 2007]
+  Fixed problem with compiling pnggccrd.c on Intel-Apple platforms.
+  Added PNG_NO_ERROR_TEXT feature, with demo in contrib/pngminim
+  Removed define PNG_WARN_UNINITIALIZED_ROW 1 /* 0: warning; 1: error */
+    because it caused some trouble.
+
+version 1.2.20beta02 [August 20, 2007]
+  Avoid compiling pnggccrd.c on Intel-Apple platforms.
+
+version 1.2.20beta03 [August 20, 2007]
+  Added "/D PNG_NO_MMX_CODE" to the non-mmx builds of projects/visualc6
+    and visualc71.
+
+version 1.2.20beta04 [August 21, 2007]
+  Revised pngvcrd.c for improved efficiency (Steve Snyder).
+
+version 1.2.20rc1 [August 23, 2007]
+  Revised pngconf.h to set PNG_NO_MMX_CODE for gcc-3.x compilers.
+
+version 1.2.20rc2 [August 27, 2007]
+  Revised scripts/CMakeLists.txt
+  Revised #ifdefs to ensure one and only one of pnggccrd.c, pngvcrd.c,
+    or part of pngrutil.c is selected.
+
+version 1.2.20rc3 [August 30, 2007]
+  Remove a little more code in pngwutil.c when PNG_NO_WRITE_FILTER is selected.
+  Added /D _CRT_SECURE_NO_WARNINGS to visual6c and visualc71 projects.
+  Compile png_mmx_support() in png.c even when PNG_NO_MMX_CODE is defined.
+  Restored a "superfluous" #ifdef that was removed from 1.2.20rc2 pnggccrd.c,
+    breaking the png_mmx_support() function.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
--- a/20
+++ b/20
@@ -1,5 +1,5 @@

-Installing libpng version 1.2.19beta18 - June 23, 2007
+Installing libpng version 1.2.20rc3 - August 30, 2007

 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.2.19beta18" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.20rc3" 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:
@@ -101,14 +101,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 libpng12.so.0.1.2.19beta18)
+                       gcc, creates libpng12.so.0.1.2.20rc3)
 makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng12.so.0.1.2.19beta18)
+                       (gcc, creates libpng12.so.0.1.2.20rc3)
 makefile.gcmmx    =>  Linux/ELF makefile
-                       (gcc, creates libpng12.so.0.1.2.19beta18,
+                       (gcc, creates libpng12.so.0.1.2.20rc3,
                       uses assembler code tuned for Intel MMX platform)
 makefile.nommx    =>  Linux/ELF makefile
-                       (gcc, creates libpng12.so.0.1.2.19beta18
+                       (gcc, creates libpng12.so.0.1.2.20rc3
                       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
@@ -131,14 +131,14 @@ include
 makefile.openbsd  =>  OpenBSD makefile
 makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
 makefile.sggcc    =>  Silicon Graphics (gcc,
-                       creates libpng12.so.0.1.2.19beta18)
+                       creates libpng12.so.0.1.2.20rc3)
 makefile.sunos    =>  Sun makefile
 makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng12.so.0.1.2.19beta18)
+                       creates libpng12.so.0.1.2.20rc3)
 makefile.solaris-x86 =>  Solaris/intelMMX 2.X makefile (gcc,
-                       creates libpng12.so.0.1.2.19beta18)
+                       creates libpng12.so.0.1.2.20rc3)
 makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng12.so.0.1.2.19beta18)
+                       creates libpng12.so.0.1.2.20rc3)
 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/10
+++ b/10
@@ -1,5 +1,5 @@

-Known bugs in libpng version 1.2.19beta18
+Known bugs in libpng version 1.2.20rc3

 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
@@ -19,5 +19,11 @@ Known bugs in libpng version 1.2.19beta18
   libpng12.so => libpng12.so.0.1.2.9betaN
   that are generated by the custom makefiles.

-   STATUS: For now, system library builders should use the custom makefiles.
+4. June 28, 2007: Pnggccrd.c has been reported to be unreliable on
+   several 64-bit platforms running gcc-3.x.  Although it appears to
+   build properly, it does not always read files correctly.
+
+   STATUS:  Appears to be a bug in the 64-bit version of gcc-3.4.6.
+   Workarounds are to define PNG_NO_MMX_FILTER_UP|AVG|PAETH (as in
+   pngconf.h) or to upgrade gcc to a newer version.

--- a/4
+++ b/4
@@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
 If you modify libpng you may insert additional notices immediately following
 this sentence.

-libpng versions 1.2.6, August 15, 2004, through 1.2.19beta18, June 23, 2007, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.20rc3, August 30, 2007, 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
@@ -106,4 +106,4 @@ certification mark of the Open Source Initiative.

 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-June 23, 2007
+August 30, 2007
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,6 +109,8 @@ libpng.vers: libpng.sym
 	$(ECHO) 'local: *; };' >> $@.new
 	mv $@.new $@

+test: check
+
 # install the .../include headers as links to the new ones
 install-data-hook:
 	cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
--- a/Makefile.in
+++ b/Makefile.in
@@ -1259,6 +1259,8 @@ libpng.vers: libpng.sym
 	$(ECHO) 'local: *; };' >> $@.new
 	mv $@.new $@

+test: check
+
 # install the .../include headers as links to the new ones
 install-data-hook:
 	cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
--- a/14
+++ b/14
@@ -1,4 +1,4 @@
-README for libpng version 1.2.19beta18 - June 23, 2007 (shared library 12.0)
+README for libpng version 1.2.20rc3 - August 30, 2007 (shared library 12.0)
 See the note about version numbers near the top of png.h

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

-      June 23, 2007
+      August 30, 2007

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

      This is your unofficial assurance that libpng from version 0.71 and
-      upward through 1.2.19beta18 are Y2K compliant.  It is my belief that earlier
+      upward through 1.2.20rc3 are Y2K compliant.  It is my belief that earlier
      versions were also Y2K compliant.

      Libpng only has three year fields.  One is a 2-byte unsigned integer
--- a/1135
+++ b/1135
--- a/configure.ac
+++ b/configure.ac
@@ -18,15 +18,15 @@ AC_PREREQ(2.59)

 dnl Version number stuff here:

-AC_INIT([libpng], [1.2.19beta18], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.20rc3], [png-mng-implement@lists.sourceforge.net])
 AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE

-PNGLIB_VERSION=1.2.19beta18
+PNGLIB_VERSION=1.2.20rc3
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=2
-PNGLIB_RELEASE=19
+PNGLIB_RELEASE=20

 dnl End of version number stuff

--- a/contrib/gregbook/readpng2.c
+++ b/contrib/gregbook/readpng2.c
@@ -99,7 +99,7 @@ void readpng2_version_info(void)
              (compilerID == 2? "GNU C" : "unknown"));
            fprintf(stderr, "  Processor (x86%s) %s MMX instructions.\n",
 #if defined(__x86_64__)
-              "_64"
+              "_64",
 #else
              "",
 #endif
--- a/contrib/pngminim/decoder/README
+++ b/contrib/pngminim/decoder/README
@@ -0,0 +1,6 @@
+This demonstrates the use of PNG_USER_CONFIG and pngusr.h
+
+To build a minimal read-only decoder, run
+    gather.sh  # to collect needed files from pngminus, libpng, and zlib
+    make -f makefile.std
+ 
--- a/contrib/pngminim/decoder/gather.sh
+++ b/contrib/pngminim/decoder/gather.sh
@@ -0,0 +1,8 @@
+cp ../../pngminus/png2pnm.c pngm2pnm.c
+cp ../../../*.h .
+cp ../../../*.c .
+rm example.c pnggccrd.c pngvcrd.c pngtest.c
+# change the following 2 lines if zlib is somewhere else
+cp ../../../../zlib/*.h .
+cp ../../../../zlib/*.c .
+rm minigzip.c example.c compress.c deflate.c
--- a/contrib/pngminim/decoder/makefile.std
+++ b/contrib/pngminim/decoder/makefile.std
@@ -0,0 +1,44 @@
+# Makefile for PngMinus (pngm2pnm)
+# Linux / Unix
+
+#CC=cc
+CC=gcc
+LD=$(CC)
+
+RM=rm -f
+
+CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \
+       -DdeflateParams\(a,b,c\)=Z_OK -I. -O1
+
+C=.c
+O=.o
+L=.a
+E=
+
+ZOBJS  = adler32$(O) crc32$(O) gzio$(O) \
+	 infback$(O) inffast$(O) inflate$(O) inftrees$(O) \
+	 trees$(O) uncompr$(O) zutil$(O)
+
+OBJS  = pngm2pnm$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
+	pngpread$(O) pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \
+	pngset$(O) pngtrans$(O)  $(ZOBJS)
+
+# implicit make rules -------------------------------------------------------
+
+.c$(O): png.h pngconf.h pngusr.h zlib.h
+	$(CC) -c $(CFLAGS) $<
+
+# dependencies
+
+all: pngm2pnm$(E)
+
+pngm2pnm$(E): $(OBJS)
+	$(LD) -o pngm2pnm$(E) $(OBJS)
+	strip pngm2pnm$(E)
+
+clean:
+	$(RM) pngm2pnm$(O)
+	$(RM) pngm2pnm$(E)
+	$(RM) $(OBJS)
+
+# End of makefile for pngm2pnm
--- a/contrib/pngminim/decoder/pngusr.h
+++ b/contrib/pngminim/decoder/pngusr.h
@@ -0,0 +1,67 @@
+/* minrdpngconf.h: headers to make a minimal png-read-only library
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 2007 Glenn Randers-Pehrson
+ * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
+ */
+
+#ifndef MINRDPNGCONF_H
+#define MINRDPNGCONF_H
+
+#define PNG_NO_GLOBAL_ARRAYS
+
+#define PNG_NO_WARNINGS
+#define png_warning(s1,s2) ""
+#define png_chunk_warning(s1,s2) ""
+#define PNG_NO_ERROR_TEXT
+#define png_error(s1,s2) png_err(s1)
+#define png_chunk_error(s1,s2) png_err(s1)
+
+#define PNG_NO_ASSEMBLER_CODE
+#define PNG_NO_OPTIMIZED_CODE
+#define PNG_NO_READ_GAMMA
+#define PNG_NO_READ_BACKGROUND
+#define PNG_NO_READ_DITHER
+#define PNG_NO_READ_INVERT
+#define PNG_NO_READ_SHIFT
+#define PNG_NO_READ_PACK
+#define PNG_NO_READ_PACKSWAP
+#define PNG_NO_READ_FILLER
+#define PNG_NO_READ_SWAP_ALPHA
+#define PNG_NO_READ_INVERT_ALPHA
+#define PNG_NO_READ_RGB_TO_GRAY
+#define PNG_NO_READ_USER_TRANSFORM
+#define PNG_NO_READ_bKGD
+#define PNG_NO_READ_cHRM
+#define PNG_NO_READ_gAMA
+#define PNG_NO_READ_hIST
+#define PNG_NO_READ_iCCP
+#define PNG_NO_READ_pCAL
+#define PNG_NO_READ_pHYs
+#define PNG_NO_READ_sBIT
+#define PNG_NO_READ_sCAL
+#define PNG_NO_READ_sPLT
+#define PNG_NO_READ_TEXT
+#define PNG_NO_READ_tIME
+#define PNG_NO_READ_UNKNOWN_CHUNKS
+#define PNG_NO_READ_USER_CHUNKS
+#define PNG_NO_READ_EMPTY_PLTE
+#define PNG_NO_READ_OPT_PLTE
+#define PNG_NO_READ_STRIP_ALPHA
+#define PNG_NO_READ_oFFs
+#define PNG_NO_WARN_UNINITIALIZED_ROW
+
+#define PNG_NO_WRITE_SUPPORTED
+
+#define PNG_NO_INFO_IMAGE
+#define PNG_NO_USER_MEM
+#define PNG_NO_FIXED_POINT_SUPPORTED
+#define PNG_NO_MNG_FEATURES
+#define PNG_NO_USER_TRANSFORM_PTR
+#define PNG_NO_HANDLE_AS_UNKNOWN
+#define PNG_NO_CONSOLE_IO
+#define PNG_NO_ZALLOC_ZERO
+#define PNG_NO_ERROR_NUMBERS
+#define PNG_NO_EASY_ACCESS
+#define PNG_NO_PROGRESSIVE_READ
+
+#endif /* MINRDPNGCONF_H */
--- a/contrib/pngminim/encoder/README
+++ b/contrib/pngminim/encoder/README
@@ -0,0 +1,6 @@
+This demonstrates the use of PNG_USER_CONFIG and pngusr.h
+
+To build a minimal write-only encoder, run
+    gather.sh  # to collect needed files from pngminus, libpng, and zlib
+    make -f makefile.std
+ 
--- a/contrib/pngminim/encoder/dummy_inflate.c
+++ b/contrib/pngminim/encoder/dummy_inflate.c
@@ -0,0 +1,27 @@
+#include "zlib.h"
+
+int ZEXPORT inflate(strm, flush)
+z_streamp strm;
+int flush;
+{ return Z_OK ; }
+
+int ZEXPORT inflateReset(strm)
+z_streamp strm;
+{ return Z_OK ; }
+
+int ZEXPORT inflateEnd(strm)
+z_streamp strm;
+{ return Z_STREAM_ERROR ; }
+
+int ZEXPORT inflateInit_(strm, version, stream_size)
+z_streamp strm;
+const char *version;
+int stream_size;
+{ return Z_OK ; }
+
+int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
+z_streamp strm;
+int windowBits;
+const char *version;
+int stream_size;
+{ return Z_STREAM_ERROR ; }
--- a/contrib/pngminim/encoder/gather.sh
+++ b/contrib/pngminim/encoder/gather.sh
@@ -0,0 +1,9 @@
+cp ../../pngminus/pnm2png.c pnm2pngm.c
+cp ../../../*.h .
+cp ../../../*.c .
+rm example.c pnggccrd.c pngvcrd.c pngtest.c
+# Change the next 2 lines if zlib is somewhere else.
+cp ../../../../zlib/*.h .
+cp ../../../../zlib/*.c .
+rm inf*.[ch]
+rm minigzip.c example.c
--- a/contrib/pngminim/encoder/makefile.std
+++ b/contrib/pngminim/encoder/makefile.std
@@ -0,0 +1,44 @@
+# Makefile for PngMinus (pnm2pngm)
+# Linux / Unix
+
+#CC=cc
+CC=gcc
+LD=$(CC)
+
+RM=rm -f
+
+CFLAGS=-DPNG_USER_CONFIG -DNO_GZIP -I. -O1
+
+C=.c
+O=.o
+L=.a
+E=
+
+ZOBJS  = adler32$(O) compress$(O) crc32$(O) deflate$(O) gzio$(O) \
+	 dummy_inflate$(O) \
+	 trees$(O) uncompr$(O) zutil$(O)
+
+OBJS  = pnm2pngm$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
+	pngpread$(O) pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \
+	pngset$(O) pngtrans$(O) pngwio$(O) pngwrite$(O) \
+	pngwtran$(O) pngwutil$(O) $(ZOBJS)
+
+# implicit make rules -------------------------------------------------------
+
+.c$(O): png.h pngconf.h pngusr.h zlib.h
+	$(CC) -c $(CFLAGS) $<
+
+# dependencies
+
+all: pnm2pngm$(E)
+
+pnm2pngm$(E): $(OBJS)
+	$(LD) -o pnm2pngm$(E) $(OBJS)
+	strip pnm2pngm$(E)
+
+clean:
+	$(RM) pnm2pngm$(O)
+	$(RM) pnm2pngm$(E)
+	$(RM) $(OBJS)
+
+# End of makefile for pnm2pngm
--- a/contrib/pngminim/encoder/pngusr.h
+++ b/contrib/pngminim/encoder/pngusr.h
@@ -0,0 +1,66 @@
+/* minwrpngconf.h: headers to make a minimal png-write-only library
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 2007 Glenn Randers-Pehrson
+ * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
+ */
+
+#ifndef MINWRPNGCONF_H
+#define MINWRPNGCONF_H
+
+#define PNG_NO_GLOBAL_ARRAYS
+
+#define PNG_NO_READ_SUPPORTED
+
+#define PNG_NO_WARNINGS
+#define png_warning(s1,s2) ""
+#define png_chunk_warning(s1,s2) ""
+#define PNG_NO_ERROR_TEXT
+#define png_error(s1,s2) png_err(s1)
+#define png_chunk_error(s1,s2) png_err(s1)
+
+#define PNG_NO_WRITE_BACKGROUND
+#define PNG_NO_WRITE_GAMMA
+#define PNG_NO_WRITE_DITHER
+#define PNG_NO_WRITE_INVERT
+#define PNG_NO_WRITE_SHIFT
+#define PNG_NO_WRITE_PACK
+#define PNG_NO_WRITE_PACKSWAP
+#define PNG_NO_WRITE_FILLER
+#define PNG_NO_WRITE_SWAP_ALPHA
+#define PNG_NO_WRITE_INVERT_ALPHA
+#define PNG_NO_WRITE_RGB_TO_GRAY
+#define PNG_NO_WRITE_USER_TRANSFORM
+#define PNG_NO_WRITE_bKGD
+#define PNG_NO_WRITE_cHRM
+#define PNG_NO_WRITE_gAMA
+#define PNG_NO_WRITE_sRGB
+#define PNG_NO_WRITE_hIST
+#define PNG_NO_WRITE_iCCP
+#define PNG_NO_WRITE_oFFs
+#define PNG_NO_WRITE_pCAL
+#define PNG_NO_WRITE_pHYs
+#define PNG_NO_WRITE_sBIT
+#define PNG_NO_WRITE_sCAL
+#define PNG_NO_WRITE_sPLT
+#define PNG_NO_WRITE_TEXT
+#define PNG_NO_WRITE_tIME
+#define PNG_NO_WRITE_UNKNOWN_CHUNKS
+#define PNG_NO_WRITE_USER_CHUNKS
+#define PNG_NO_WRITE_EMPTY_PLTE
+#define PNG_NO_WRITE_OPT_PLTE
+#define PNG_NO_WRITE_FILTER
+#define PNG_NO_WRITE_WEIGHTED_FILTER
+#define PNG_NO_WRITE_INTERLACING_SUPPORTED
+
+#define PNG_NO_INFO_IMAGE
+#define PNG_NO_USER_MEM
+#define PNG_NO_FIXED_POINT_SUPPORTED
+#define PNG_NO_MNG_FEATURES
+#define PNG_NO_USER_TRANSFORM_PTR
+#define PNG_NO_HANDLE_AS_UNKNOWN
+#define PNG_NO_CONSOLE_IO
+#define PNG_NO_ZALLOC_ZERO
+#define PNG_NO_ERROR_NUMBERS
+#define PNG_NO_EASY_ACCESS
+
+#endif /* MINWRPNGCONF_H */
--- a/libpng-1.2.19beta18.txt
+++ b/libpng-1.2.19beta18.txt
@@ -1,6 +1,6 @@
 libpng.txt - A description on how to use and modify libpng

- libpng version 1.2.19beta18 - June 23, 2007
+ libpng version 1.2.20rc3 - August 30, 2007
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp at users.sourceforge.net>
 Copyright (c) 1998-2007 Glenn Randers-Pehrson
@@ -2790,7 +2790,8 @@ this may include optimizations that did not exist at the time the code was
 written and compiled.  It is also possible, of course, to enable only known,
 specific optimizations; for example:

-    #if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200)
+    #if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200) && \
+       defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED)
       flags = PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  \
             | PNG_ASM_FLAG_MMX_READ_INTERLACE    \
             | PNG_ASM_FLAG_MMX_READ_FILTER_SUB   \
@@ -2845,6 +2846,52 @@ For more extensive examples of runtime querying, enabling and disabling
 of optimized features, see contrib/gregbook/readpng2.c in the libpng
 source-code distribution.

+It is also possible to disable or enable specific optimization features
+at compile time.  To disable them entirely, which may result in slower
+but smaller and less complex and troublesome code, define
+
+     PNG_NO_ASSEMBLER_CODE
+
+If you do this, then the run-time code for setting and querying flags
+described above, and the assembler code in pnggccrd.c or pngvcrd.c will
+not be built.
+
+If you have disabled the assembler code, you can also disable the
+optimized C code, to obtain even slower but smaller code, by defining
+
+     PNG_NO_OPTIMZED_CODE
+
+To disable only the MMX assembler code, define
+
+     PNG_NO_MMX_CODE
+
+There are two versions of the MMX code: one for gcc compilers and one for
+MSVC compilers.  Pngconf.h should automatically detect which you are
+using, and it will set either PNG_USE_PNGGCCRD or PNG_USE_PNGVCRD for you.
+
+Define one or more of the following to disable specific parts of the
+assembler code:
+
+     PNG_NO_MMX_COMBINE_ROW
+     PNG_NO_MMX_READ_INTERLACE
+     PNG_NO_MMX_READ_FILTER_ROW
+
+If the latter is not disabled, you can disable one or more of the
+individual filter types by defining
+
+     PNG_NO_MMX_FILTER_SUB
+     PNG_NO_MMX_FILTER_UP
+     PNG_NO_MMX_FILTER_AVG
+     PNG_NO_MMX_FILTER_PAETH
+
+By default, libpng only enables the "sub" filter when gcc-3.x is used
+because experiments show that gcc-3.x produces bad code for the others.
+
+When you disable various MMX features, libpng will still be able to decode
+files with those features.  It will fall back upon the optimized C code
+or the unoptimized C code to decode them.
+
+
 VII.  MNG support

 The MNG specification (available at http://www.libpng.org/pub/mng) allows
@@ -2921,13 +2968,13 @@ application:

 IX. Y2K Compliance in libpng

-June 23, 2007
+August 30, 2007

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

 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.19beta18 are Y2K compliant.  It is my belief that earlier
+upward through 1.2.20rc3 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 23, 2007"
+.TH LIBPNG 3 "August 30, 2007"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta18
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.20rc3
 .SH SYNOPSIS
 \fB
 #include <png.h>\fP
@@ -410,7 +410,7 @@ Following is a copy of the libpng.txt file that accompanies libpng.
 .SH LIBPNG.TXT
 libpng.txt - A description on how to use and modify libpng

- libpng version 1.2.19beta18 - June 23, 2007
+ libpng version 1.2.20rc3 - August 30, 2007
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp at users.sourceforge.net>
 Copyright (c) 1998-2007 Glenn Randers-Pehrson
@@ -3200,7 +3200,8 @@ this may include optimizations that did not exist at the time the code was
 written and compiled.  It is also possible, of course, to enable only known,
 specific optimizations; for example:

-    #if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200)
+    #if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200) && \
+       defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED)
       flags = PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  \
             | PNG_ASM_FLAG_MMX_READ_INTERLACE    \
             | PNG_ASM_FLAG_MMX_READ_FILTER_SUB   \
@@ -3255,6 +3256,52 @@ For more extensive examples of runtime querying, enabling and disabling
 of optimized features, see contrib/gregbook/readpng2.c in the libpng
 source-code distribution.

+It is also possible to disable or enable specific optimization features
+at compile time.  To disable them entirely, which may result in slower
+but smaller and less complex and troublesome code, define
+
+     PNG_NO_ASSEMBLER_CODE
+
+If you do this, then the run-time code for setting and querying flags
+described above, and the assembler code in pnggccrd.c or pngvcrd.c will
+not be built.
+
+If you have disabled the assembler code, you can also disable the
+optimized C code, to obtain even slower but smaller code, by defining
+
+     PNG_NO_OPTIMZED_CODE
+
+To disable only the MMX assembler code, define
+
+     PNG_NO_MMX_CODE
+
+There are two versions of the MMX code: one for gcc compilers and one for
+MSVC compilers.  Pngconf.h should automatically detect which you are
+using, and it will set either PNG_USE_PNGGCCRD or PNG_USE_PNGVCRD for you.
+
+Define one or more of the following to disable specific parts of the
+assembler code:
+
+     PNG_NO_MMX_COMBINE_ROW
+     PNG_NO_MMX_READ_INTERLACE
+     PNG_NO_MMX_READ_FILTER_ROW
+
+If the latter is not disabled, you can disable one or more of the
+individual filter types by defining
+
+     PNG_NO_MMX_FILTER_SUB
+     PNG_NO_MMX_FILTER_UP
+     PNG_NO_MMX_FILTER_AVG
+     PNG_NO_MMX_FILTER_PAETH
+
+By default, libpng only enables the "sub" filter when gcc-3.x is used
+because experiments show that gcc-3.x produces bad code for the others.
+
+When you disable various MMX features, libpng will still be able to decode
+files with those features.  It will fall back upon the optimized C code
+or the unoptimized C code to decode them.
+
+
 .SH VII.  MNG support

 The MNG specification (available at http://www.libpng.org/pub/mng) allows
@@ -3331,13 +3378,13 @@ application:

 .SH IX. Y2K Compliance in libpng

-June 23, 2007
+August 30, 2007

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

 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.19beta18 are Y2K compliant.  It is my belief that earlier
+upward through 1.2.20rc3 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
@@ -3526,7 +3573,16 @@ the first widely used release:
 1.2.17              13    10217  12.so.0.17[.0]
 1.0.26              10    10026  10.so.0.26[.0]
 1.2.18              13    10218  12.so.0.18[.0]
- 1.2.19beta1-18      13    10219  12.so.0.19[.0]
+ 1.2.19beta1-31      13    10219  12.so.0.19[.0]
+ 1.0.27rc1-6         10    10027  10.so.0.27[.0]
+ 1.2.19rc1-6         13    10219  12.so.0.19[.0]
+ 1.0.27              10    10027  10.so.0.27[.0]
+ 1.2.19              13    10219  12.so.0.19[.0]
+ 1.2.20beta01-04     13    10220  12.so.0.20[.0]
+ 1.0.28rc1-2         10    10028  10.so.0.28[.0]
+ 1.2.20rc1-2         13    10220  12.so.0.20[.0]
+ 1.0.28              10    10028  10.so.0.28[.0]
+ 1.2.20              13    10220  12.so.0.20[.0]

 Henceforth the source version will match the shared-library minor
 and patch numbers; the shared-library major version number will be
@@ -3539,7 +3595,7 @@ version 1.0.6j; from then on they were given the upcoming public
 release number plus "betaNN" or "rcN".

 .SH "SEE ALSO"
-libpngpf(3), png(5)
+.IR libpngpf(3) ", " png(5)
 .LP
 .IR libpng :
 .IP
@@ -3582,7 +3638,7 @@ possible without all of you.

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

-Libpng version 1.2.19beta18 - June 23, 2007:
+Libpng version 1.2.20rc3 - August 30, 2007:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).

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

-libpng versions 1.2.6, August 15, 2004, through 1.2.19beta18, June 23, 2007, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.20rc3, August 30, 2007, 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
@@ -3702,7 +3758,7 @@ certification mark of the Open Source Initiative.

 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-June 23, 2007
+August 30, 2007

 .\" end of man page

--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "June 23, 2007"
+.TH LIBPNGPF 3 "August 30, 2007"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta18
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.20rc3
 (private functions)
 .SH SYNOPSIS
 \fB#include <png.h>\fP
@@ -269,6 +269,6 @@ are listed alphabetically here as an aid to libpng maintainers.
 See png.h for more information on these functions.

 .SH SEE ALSO
-libpng(3), png(5)
+.IR libpng(3) ", " png(5)
 .SH AUTHOR
 Glenn Randers-Pehrson
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "June 23, 2007"
+.TH PNG 5 "August 30, 2007"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
@@ -18,7 +18,7 @@ gamma and chromaticity data for improved color matching on heterogeneous
 platforms.

 .SH "SEE ALSO"
-.IR libpng(3), zlib(3), deflate(5), and zlib(5)
+.IR libpng(3) ", " zlib(3) ", " deflate(5) ", and " zlib(5)
 .LP
 PNG specification (second edition), November 2003:
 .IP
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@

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

 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_19beta18 Your_png_h_is_not_version_1_2_19beta18;
+typedef version_1_2_20rc3 Your_png_h_is_not_version_1_2_20rc3;

 /* Version information for C files.  This had better match the version
 * string defined in png.h.  */
@@ -692,21 +692,13 @@ png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime)
 }
 #endif /* PNG_TIME_RFC1123_SUPPORTED */

-#if 0
-/* Signature string for a PNG file. */
-png_bytep PNGAPI
-png_sig_bytes(void)
-{
-   return ((png_bytep)"\211\120\116\107\015\012\032\012");
-}
-#endif
 #endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */

 png_charp PNGAPI
 png_get_copyright(png_structp png_ptr)
 {
   png_ptr = png_ptr;  /* silence compiler warning about unused png_ptr */
-   return ((png_charp) "\n libpng version 1.2.19beta18 - June 23, 2007\n\
+   return ((png_charp) "\n libpng version 1.2.20rc3 - August 30, 2007\n\
   Copyright (c) 1998-2007 Glenn Randers-Pehrson\n\
   Copyright (c) 1996-1997 Andreas Dilger\n\
   Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
@@ -741,7 +733,53 @@ png_get_header_version(png_structp png_ptr)
 {
   /* Returns longer string containing both version and date */
   png_ptr = png_ptr;  /* silence compiler warning about unused png_ptr */
-   return ((png_charp) PNG_HEADER_VERSION_STRING);
+   return ((png_charp) PNG_HEADER_VERSION_STRING
+#ifdef PNG_READ_SUPPORTED
+#  ifdef PNG_USE_PNGGCCRD
+#    ifdef __x86_64__
+#      ifdef __PIC__
+   "     (PNGGCRD x86_64, PIC)\n"
+#      else
+#        ifdef PNG_THREAD_UNSAFE_OK
+   "     (PNGGCRD x86_64, Thread unsafe)\n"
+#        else
+   "     (PNGGCRD x86_64, Thread safe)\n"
+#        endif
+#      endif
+#    else
+#    ifdef PNG_THREAD_UNSAFE_OK
+   "     (PNGGCRD, Thread unsafe)\n"
+#      else
+   "     (PNGGCRD, Thread safe)\n"
+#      endif
+#    endif
+#  else
+#    ifdef PNG_USE_PNGVCRD
+#      ifdef __x86_64__
+   "     (x86_64 PNGVCRD)\n"
+#      else
+   "     (PNGVCRD)\n"
+#      endif
+#    else
+#      ifdef __x86_64__
+#        ifdef PNG_OPTIMIZED_CODE_SUPPORTED
+   "     (x86_64 OPTIMIZED)\n"
+#        else
+   "     (x86_64 NOT OPTIMIZED)\n"
+#        endif
+#      else
+#        ifdef PNG_OPTIMIZED_CODE_SUPPORTED
+   "     (OPTIMIZED)\n"
+#        else
+   "     (NOT OPTIMIZED)\n"
+#        endif
+#      endif
+#    endif
+#  endif
+#else
+   "     (NO READ SUPPORT)\n"
+#endif
+   );
 }

 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
@@ -831,8 +869,7 @@ png_init_mmx_flags (png_structp png_ptr)
 #endif /* !(PNG_MMX_CODE_SUPPORTED) */

 /* this function was added to libpng 1.2.0 */
-#if !defined(PNG_USE_PNGGCCRD) && \
-    !(defined(PNG_MMX_CODE_SUPPORTED) && defined(PNG_USE_PNGVCRD))
+#if !defined(PNG_USE_PNGGCCRD) && !defined(PNG_USE_PNGVCRD)
 int PNGAPI
 png_mmx_support(void)
 {
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@

 /* png.h - header file for PNG reference library
 *
- * libpng version 1.2.19beta18 - June 23, 2007
+ * libpng version 1.2.20rc3 - August 30, 2007
 * Copyright (c) 1998-2007 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -9,7 +9,7 @@
 * Authors and maintainers:
 *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
 *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *  libpng versions 0.97, January 1998, through 1.2.19beta18 - June 23, 2007: Glenn
+ *  libpng versions 0.97, January 1998, through 1.2.20rc3 - August 30, 2007: Glenn
 *  See also "Contributing Authors", below.
 *
 * Note about libpng version numbers:
@@ -150,7 +150,16 @@
 *    1.2.17                  13    10217  12.so.0.17[.0]
 *    1.0.26                  10    10026  10.so.0.26[.0]
 *    1.2.18                  13    10218  12.so.0.18[.0]
- *    1.2.19beta1-18          13    10219  12.so.0.19[.0]
+ *    1.2.19beta1-31          13    10219  12.so.0.19[.0]
+ *    1.0.27rc1-6             10    10027  10.so.0.27[.0]
+ *    1.2.19rc1-6             13    10219  12.so.0.19[.0]
+ *    1.0.27                  10    10027  10.so.0.27[.0]
+ *    1.2.19                  13    10219  12.so.0.19[.0]
+ *    1.2.20beta01-04         13    10220  12.so.0.20[.0]
+ *    1.0.28rc1-2             10    10028  10.so.0.28[.0]
+ *    1.2.20rc1-2             13    10220  12.so.0.20[.0]
+ *    1.0.28                  10    10028  10.so.0.28[.0]
+ *    1.2.20                  13    10220  12.so.0.20[.0]
 *
 *    Henceforth the source version will match the shared-library major
 *    and minor numbers; the shared-library major version number will be
@@ -180,7 +189,7 @@
 * If you modify libpng you may insert additional notices immediately following
 * this sentence.
 *
- * libpng versions 1.2.6, August 15, 2004, through 1.2.19beta18, June 23, 2007, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.20rc3, August 30, 2007, 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:
@@ -292,13 +301,13 @@
 * Y2K compliance in libpng:
 * =========================
 *
- *    June 23, 2007
+ *    August 30, 2007
 *
 *    Since the PNG Development group is an ad-hoc body, we can't make
 *    an official declaration.
 *
 *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.2.19beta18 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.2.20rc3 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
@@ -354,9 +363,9 @@
 */

 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.19beta18"
+#define PNG_LIBPNG_VER_STRING "1.2.20rc3"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.2.19beta18 - June 23, 2007 (header)\n"
+   " libpng version 1.2.20rc3 - August 30, 2007\n"

 #define PNG_LIBPNG_VER_SONUM   0
 #define PNG_LIBPNG_VER_DLLNUM  13
@@ -364,11 +373,11 @@
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
 #define PNG_LIBPNG_VER_MAJOR   1
 #define PNG_LIBPNG_VER_MINOR   2
-#define PNG_LIBPNG_VER_RELEASE 19
+#define PNG_LIBPNG_VER_RELEASE 20
 /* This should match the numeric part of the final component of
 * PNG_LIBPNG_VER_STRING, omitting any leading zero: */

-#define PNG_LIBPNG_VER_BUILD  18
+#define PNG_LIBPNG_VER_BUILD  3

 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -385,14 +394,14 @@
 #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
                                       PNG_LIBPNG_BUILD_PRIVATE */

-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA
+#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC

 /* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
 * We must not include leading zeros.
 * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
 * version 1.0.0 was mis-numbered 100 instead of 10000).  From
 * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release */
-#define PNG_LIBPNG_VER 10219 /* 1.2.19 */
+#define PNG_LIBPNG_VER 10220 /* 1.2.20 */

 #ifndef PNG_VERSION_INFO_ONLY
 /* include the compression library's header */
@@ -1353,7 +1362,7 @@ struct png_struct_def
   png_byte filter_type;
 #endif

-#if defined(PNG_1_0_X) || defined(PNG_DEBUG)
+#if defined(PNG_1_0_X)
 /* New member added in libpng-1.0.10, ifdef'ed out in 1.2.0 */
   png_uint_32 row_buf_size;
 #endif
@@ -1407,7 +1416,7 @@ struct png_struct_def
 /* This triggers a compiler error in png.c, if png.c and png.h
 * do not agree upon the version number.
 */
-typedef png_structp version_1_2_19beta18;
+typedef png_structp version_1_2_20rc3;

 typedef png_struct FAR * FAR * png_structpp;

@@ -2055,6 +2064,7 @@ extern void *png_far_to_near PNGARG((png_structp png_ptr,png_voidp ptr,
   int check));
 #endif /* USE_FAR_KEYWORD */

+#ifndef PNG_NO_ERROR_TEXT
 /* Fatal error in PNG image of libpng - can't continue */
 extern PNG_EXPORT(void,png_error) PNGARG((png_structp png_ptr,
   png_const_charp error_message));
@@ -2062,14 +2072,22 @@ extern PNG_EXPORT(void,png_error) PNGARG((png_structp png_ptr,
 /* The same, but the chunk name is prepended to the error string. */
 extern PNG_EXPORT(void,png_chunk_error) PNGARG((png_structp png_ptr,
   png_const_charp error_message));
+#else
+/* Fatal error in PNG image of libpng - can't continue */
+extern PNG_EXPORT(void,png_err) PNGARG((png_structp png_ptr));
+#endif

+#ifndef PNG_NO_WARNINGS
 /* Non-fatal error in libpng.  Can continue, but may have a problem. */
 extern PNG_EXPORT(void,png_warning) PNGARG((png_structp png_ptr,
   png_const_charp warning_message));

+#ifdef PNG_READ_SUPPORTED
 /* Non-fatal error in libpng, chunk name is prepended to message. */
 extern PNG_EXPORT(void,png_chunk_warning) PNGARG((png_structp png_ptr,
   png_const_charp warning_message));
+#endif /* PNG_READ_SUPPORTED */
+#endif /* PNG_NO_WARNINGS */

 /* The png_set_<chunk> functions are for storing values in the png_info_struct.
 * Similarly, the png_get_<chunk> calls are used to read values from the
@@ -2491,10 +2509,6 @@ extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr,
 #define png_debug2(l, m, p1, p2)
 #endif

-#if 0
-extern PNG_EXPORT(png_bytep,png_sig_bytes) PNGARG((void));
-#endif
-
 extern PNG_EXPORT(png_charp,png_get_copyright) PNGARG((png_structp png_ptr));
 extern PNG_EXPORT(png_charp,png_get_header_ver) PNGARG((png_structp png_ptr));
 extern PNG_EXPORT(png_charp,png_get_header_version) PNGARG((png_structp png_ptr));
@@ -2820,9 +2834,6 @@ extern PNG_EXPORT(void,png_save_uint_16)
 #ifdef PNG_USE_GLOBAL_ARRAYS
   PNG_EXPORT_VAR (PNG_CONST png_byte FARDATA) png_sig[8];
 #else
-#if 0
-#define png_sig png_sig_bytes(NULL)
-#endif
 #endif
 #endif /* PNG_NO_EXTERN */

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

 /* pngconf.h - machine configurable file for libpng
 *
- * libpng version 1.2.19beta18 - June 23, 2007
+ * libpng version 1.2.20rc3 - August 30, 2007
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2007 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -75,6 +75,11 @@

 /* End of material added to libpng-1.2.8 */

+/* Added at libpng-1.2.19, removed at libpng-1.2.20 because it caused trouble
+#    define PNG_WARN_UNINITIALIZED_ROW 1
+*/
+/* End of material added at libpng-1.2.19 */
+
 /* This is the size of the compression buffer, and thus the size of
 * an IDAT chunk.  Make this whatever size you feel is best for your
 * machine.  One of these will be allocated per png_struct.  When this
@@ -744,32 +749,38 @@
 #    define PNG_ASSEMBLER_CODE_SUPPORTED
 #  endif

-#if 0 /* we may not need this any more. */
-#  if defined(XP_MACOSX) && !defined(PNG_NO_MMX_CODE)
-     /* work around Intel-Mac compiler bug */
-#    define PNG_NO_MMX_CODE
+#  if defined(__GNUC__) && defined(__x86_64__) && (__GNUC__ < 4)
+     /* work around 64-bit gcc compiler bugs in gcc-3.x */
+#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+#      define PNG_NO_MMX_CODE
+#    endif
+#  endif
+
+#  if defined(__APPLE__)
+#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+#      define PNG_NO_MMX_CODE
+#    endif
 #  endif
-#endif

 #  if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
 #    define PNG_MMX_CODE_SUPPORTED
 #  endif

-#  if !defined(PNG_USE_PNGVCRD) && !defined(PNG_NO_MMX_CODE) && \
+#  if !defined(PNG_USE_PNGVCRD) && defined(PNG_MMX_CODE_SUPPORTED) && \
     defined(_MSC_VER)
 #    define PNG_USE_PNGVCRD
 #  endif

-#  if !defined(PNG_USE_PNGGCCRD) && !defined(PNG_NO_MMX_CODE) && \
+#  if !defined(PNG_USE_PNGGCCRD) && defined(PNG_MMX_CODE_SUPPORTED) && \
     !defined(PNG_USE_PNGVCRD)
 #    define PNG_USE_PNGGCCRD
+     /* If you are sure that you don't need thread safety and you are compiling
+        with PNG_USE_PNGCCRD for an MMX application, you can define this for
+        faster execution.  See pnggccrd.c.
+#    define PNG_THREAD_UNSAFE_OK
+     */
 #  endif

-/* If you are sure that you don't need thread safety and you are compiling
-   with PNG_USE_PNGCCRD for an MMX application, you can define this for
-   faster execution.  See pnggccrd.c.
-#define PNG_THREAD_UNSAFE_OK
-*/
 #endif

 #if !defined(PNG_1_0_X)
@@ -1292,7 +1303,8 @@ typedef z_stream FAR *  png_zstreamp;
 * but might be required for some pre-1.0.5c applications.
 */
 #if !defined(PNG_USE_LOCAL_ARRAYS) && !defined(PNG_USE_GLOBAL_ARRAYS)
-#  if defined(PNG_NO_GLOBAL_ARRAYS) || (defined(__GNUC__) && defined(PNG_DLL))
+#  if defined(PNG_NO_GLOBAL_ARRAYS) || \
+      (defined(__GNUC__) && defined(PNG_DLL)) || defined(_MSC_VER)
 #    define PNG_USE_LOCAL_ARRAYS
 #  else
 #    define PNG_USE_GLOBAL_ARRAYS
@@ -1481,39 +1493,45 @@ typedef z_stream FAR *  png_zstreamp;
 /* Prior to libpng-1.0.9, this block was in pngasmrd.h */
 #if defined(PNG_INTERNAL)

-/* These are the default thresholds before the MMX code kicks in; if either
- * rowbytes or bitdepth is below the threshold, plain C code is used.  These
- * can be overridden at runtime via the png_set_mmx_thresholds() call in
- * libpng 1.2.0 and later.  The values below were chosen by Intel.
- */
-
-#ifndef PNG_MMX_ROWBYTES_THRESHOLD_DEFAULT
-#  define PNG_MMX_ROWBYTES_THRESHOLD_DEFAULT  128  /*  >=  */
-#endif
-#ifndef PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT
-#  define PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT  9    /*  >=  */   
-#endif
-
-/* Set this in the makefile for VC++ on Pentium, not here. */
-/* Platform must be Pentium.  Makefile must assemble and load pngvcrd.c .
- * MMX will be detected at run time and used if present.
- */
-#ifdef PNG_USE_PNGVCRD
-#  define PNG_HAVE_MMX_COMBINE_ROW
-#  define PNG_HAVE_MMX_READ_INTERLACE
-#  define PNG_HAVE_MMX_READ_FILTER_ROW
-#endif
-
-/* Set this in the makefile for gcc/as on Pentium, not here. */
-/* Platform must be Pentium.  Makefile must assemble and load pnggccrd.c .
- * MMX will be detected at run time and used if present.
- */
-#ifdef PNG_USE_PNGGCCRD
-#  define PNG_HAVE_MMX_COMBINE_ROW
-#  define PNG_HAVE_MMX_READ_INTERLACE
-#  define PNG_HAVE_MMX_READ_FILTER_ROW
-#endif
-/* - see pnggccrd.c for info about what is currently enabled */
+#if defined(PNG_USE_PNGGCCRD) || defined(PNG_USE_PNGVCRD)
+  /* Platform must be Pentium.  Makefile must assemble and load
+   * pnggccrd.c or  pngvcrd.c. MMX will be detected at run time and
+   * used if present.
+   */
+#  ifndef PNG_NO_MMX_COMBINE_ROW
+#    define PNG_HAVE_MMX_COMBINE_ROW
+#  endif
+#  ifndef PNG_NO_MMX_READ_INTERLACE
+#    define PNG_HAVE_MMX_READ_INTERLACE
+#  endif
+#  ifndef PNG_NO_MMX_READ_FILTER_ROW
+#    define PNG_HAVE_MMX_READ_FILTER_ROW
+#    ifndef PNG_NO_MMX_FILTER_SUB
+#      define PNG_MMX_READ_FILTER_SUB_SUPPORTED
+#    endif
+#    ifndef PNG_NO_MMX_FILTER_UP
+#      define PNG_MMX_READ_FILTER_UP_SUPPORTED
+#    endif
+#    ifndef PNG_NO_MMX_FILTER_AVG
+#      define PNG_MMX_READ_FILTER_AVG_SUPPORTED
+#    endif
+#    ifndef PNG_NO_MMX_FILTER_PAETH
+#      define PNG_MMX_READ_FILTER_PAETH_SUPPORTED
+#    endif
+#  endif
+  /* These are the default thresholds before the MMX code kicks in; if either
+   * rowbytes or bitdepth is below the threshold, plain C code is used.  These
+   * can be overridden at runtime via the png_set_mmx_thresholds() call in
+   * libpng 1.2.0 and later.  The values below were chosen by Intel.
+   */
+#  ifndef PNG_MMX_ROWBYTES_THRESHOLD_DEFAULT
+#    define PNG_MMX_ROWBYTES_THRESHOLD_DEFAULT  128  /*  >=  */
+#  endif
+#  ifndef PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT
+#    define PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT  9    /*  >=  */   
+#  endif
+#endif /* PNG_USE_PNGGCCRD || PNG_USE_PNGVCRD */
+/* - see pngvcrd.c or pnggccrd.c for info about what is currently enabled */

 #endif /* PNG_INTERNAL */
 #endif /* PNG_READ_SUPPORTED */
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,7 +1,7 @@

 /* pngerror.c - stub functions for i/o and memory allocation
 *
- * Last changed in libpng 1.2.19 June 23, 2007
+ * Last changed in libpng 1.2.20 August 30, 2007
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2007 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -20,15 +20,18 @@
 static void /* PRIVATE */
 png_default_error PNGARG((png_structp png_ptr,
  png_const_charp error_message));
+#ifndef PNG_NO_WARNINGS
 static void /* PRIVATE */
 png_default_warning PNGARG((png_structp png_ptr,
  png_const_charp warning_message));
+#endif /* PNG_NO_WARNINGS */

 /* This function is called whenever there is a fatal error.  This function
 * should not be changed.  If there is a need to handle errors differently,
 * you should supply a replacement error function and use png_set_error_fn()
 * to replace the error function at run-time.
 */
+#ifndef PNG_NO_ERROR_TEXT
 void PNGAPI
 png_error(png_structp png_ptr, png_const_charp error_message)
 {
@@ -75,7 +78,20 @@ png_error(png_structp png_ptr, png_const_charp error_message)
      use the default handler, which will not return. */
   png_default_error(png_ptr, error_message);
 }
+#else
+void PNGAPI
+png_err(png_structp png_ptr)
+{
+   if (png_ptr != NULL && png_ptr->error_fn != NULL)
+      (*(png_ptr->error_fn))(png_ptr, '\0');

+   /* If the custom handler doesn't exist, or if it returns,
+      use the default handler, which will not return. */
+   png_default_error(png_ptr, '\0');
+}
+#endif /* PNG_NO_ERROR_TEXT */
+
+#ifndef PNG_NO_WARNINGS
 /* This function is called whenever there is a non-fatal error.  This function
 * should not be changed.  If there is a need to handle warnings differently,
 * you should supply a replacement warning function and use
@@ -105,6 +121,7 @@ png_warning(png_structp png_ptr, png_const_charp warning_message)
   else
      png_default_warning(png_ptr, warning_message+offset);
 }
+#endif /* PNG_NO_WARNINGS */


 /* These utilities are used internally to build an error message that relates
@@ -119,6 +136,7 @@ static PNG_CONST char png_digit[16] = {
   'A', 'B', 'C', 'D', 'E', 'F'
 };

+#if !defined(PNG_NO_WARNINGS) || !defined(PNG_NO_ERROR_TEXT)
 static void /* PRIVATE */
 png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
   error_message)
@@ -152,6 +170,7 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
   }
 }

+#ifdef PNG_READ_SUPPORTED
 void PNGAPI
 png_chunk_error(png_structp png_ptr, png_const_charp error_message)
 {
@@ -164,7 +183,10 @@ png_chunk_error(png_structp png_ptr, png_const_charp error_message)
     png_error(png_ptr, msg);
   }
 }
+#endif /* PNG_READ_SUPPORTED */
+#endif /* !defined(PNG_NO_WARNINGS) || !defined(PNG_NO_ERROR_TEXT) */

+#ifndef PNG_NO_WARNINGS
 void PNGAPI
 png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)
 {
@@ -177,6 +199,7 @@ png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)
     png_warning(png_ptr, msg);
   }
 }
+#endif /* PNG_NO_WARNINGS */


 /* This is the default error handling function.  Note that replacements for
@@ -234,6 +257,7 @@ png_default_error(png_structp png_ptr, png_const_charp error_message)
 #endif
 }

+#ifndef PNG_NO_WARNINGS
 /* This function is called when there is a warning, but the library thinks
 * it can continue anyway.  Replacement functions don't have to do anything
 * here if you don't want them to.  In the default configuration, png_ptr is
@@ -271,6 +295,7 @@ png_default_warning(png_structp png_ptr, png_const_charp warning_message)
 #endif
   png_ptr = png_ptr; /* make compiler happy */
 }
+#endif /* PNG_NO_WARNINGS */

 /* This function is called when the application wants to use another method
 * of handling errors and warnings.  Note that the error function MUST NOT
--- a/pnggccrd.c
+++ b/pnggccrd.c
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@

 /* pngpread.c - read a png file in push mode
 *
- * Last changed in libpng 1.2.19 June 23, 2007
+ * Last changed in libpng 1.2.20 August 30, 2007
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2007 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1468,59 +1468,59 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
   if (!(png_ptr->chunk_name[0] & 0x20))
   {
 #if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
-      if(png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
-           PNG_HANDLE_CHUNK_ALWAYS
+     if(png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
+          PNG_HANDLE_CHUNK_ALWAYS
 #if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
-           && png_ptr->read_user_chunk_fn == NULL
+          && png_ptr->read_user_chunk_fn == NULL
 #endif
-         )
+        )
 #endif
-         png_chunk_error(png_ptr, "unknown critical chunk");
+        png_chunk_error(png_ptr, "unknown critical chunk");

-      info_ptr = info_ptr; /* to quiet some compiler warnings */
+     info_ptr = info_ptr; /* to quiet some compiler warnings */
   }

 #if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
   if (png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
   {
 #ifdef PNG_MAX_MALLOC_64K
-       if (length > (png_uint_32)65535L)
-       {
-           png_warning(png_ptr, "unknown chunk too large to fit in memory");
-           skip = length - (png_uint_32)65535L;
-           length = (png_uint_32)65535L;
-       }
+      if (length > (png_uint_32)65535L)
+      {
+          png_warning(png_ptr, "unknown chunk too large to fit in memory");
+          skip = length - (png_uint_32)65535L;
+          length = (png_uint_32)65535L;
+      }
 #endif
-       png_strncpy((png_charp)png_ptr->unknown_chunk.name,
+      png_strncpy((png_charp)png_ptr->unknown_chunk.name,
 	 (png_charp)png_ptr->chunk_name,
-         png_sizeof((png_charp)png_ptr->chunk_name));
-       png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
-       png_ptr->unknown_chunk.size = (png_size_t)length;
-       png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
+        png_sizeof((png_charp)png_ptr->chunk_name));
+      png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
+      png_ptr->unknown_chunk.size = (png_size_t)length;
+      png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
 #if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
-       if(png_ptr->read_user_chunk_fn != NULL)
-       {
-          /* callback to user unknown chunk handler */
-          int ret;
-          ret = (*(png_ptr->read_user_chunk_fn))
-            (png_ptr, &png_ptr->unknown_chunk);
-          if (ret < 0)
-             png_chunk_error(png_ptr, "error in user chunk");
-          if (ret == 0)
-          {
-             if (!(png_ptr->chunk_name[0] & 0x20))
-                if(png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
-                     PNG_HANDLE_CHUNK_ALWAYS)
-                   png_chunk_error(png_ptr, "unknown critical chunk");
-                png_set_unknown_chunks(png_ptr, info_ptr,
-                   &png_ptr->unknown_chunk, 1);
-          }
-       }
+      if(png_ptr->read_user_chunk_fn != NULL)
+      {
+         /* callback to user unknown chunk handler */
+         int ret;
+         ret = (*(png_ptr->read_user_chunk_fn))
+           (png_ptr, &png_ptr->unknown_chunk);
+         if (ret < 0)
+            png_chunk_error(png_ptr, "error in user chunk");
+         if (ret == 0)
+         {
+            if (!(png_ptr->chunk_name[0] & 0x20))
+               if(png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
+                    PNG_HANDLE_CHUNK_ALWAYS)
+                  png_chunk_error(png_ptr, "unknown critical chunk");
+            png_set_unknown_chunks(png_ptr, info_ptr,
+               &png_ptr->unknown_chunk, 1);
+         }
+      }
 #else
-       png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
+      png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
 #endif
-       png_free(png_ptr, png_ptr->unknown_chunk.data);
-       png_ptr->unknown_chunk.data = NULL;
+      png_free(png_ptr, png_ptr->unknown_chunk.data);
+      png_ptr->unknown_chunk.data = NULL;
   }
   else
 #endif
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@

 /* pngread.c - read a PNG file
 *
- * Last changed in libpng 1.2.19 June 23, 2007
+ * Last changed in libpng 1.2.19 August 19, 2007
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2007 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,7 +1,7 @@

 /* pngrtran.c - transforms the data in a row for PNG readers
 *
- * Last changed in libpng 1.2.19 June 23, 2007
+ * Last changed in libpng 1.2.19 August 19, 2007
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2007 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -548,6 +548,9 @@ png_set_expand(png_structp png_ptr)
   png_debug(1, "in png_set_expand\n");
   if(png_ptr == NULL) return;
   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
+#ifdef PNG_WARN_UNINITIALIZED_ROW
+   png_ptr->flags &= !(PNG_FLAG_ROW_INIT);
+#endif
 }

 /* GRR 19990627:  the following three functions currently are identical
@@ -574,6 +577,9 @@ png_set_palette_to_rgb(png_structp png_ptr)
   png_debug(1, "in png_set_palette_to_rgb\n");
   if(png_ptr == NULL) return;
   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
+#ifdef PNG_WARN_UNINITIALIZED_ROW
+   png_ptr->flags &= !(PNG_FLAG_ROW_INIT);
+#endif
 }

 #if !defined(PNG_1_0_X)
@@ -584,6 +590,9 @@ png_set_expand_gray_1_2_4_to_8(png_structp png_ptr)
   png_debug(1, "in png_set_expand_gray_1_2_4_to_8\n");
   if(png_ptr == NULL) return;
   png_ptr->transformations |= PNG_EXPAND;
+#ifdef PNG_WARN_UNINITIALIZED_ROW
+   png_ptr->flags &= !(PNG_FLAG_ROW_INIT);
+#endif
 }
 #endif

@@ -604,8 +613,11 @@ png_set_gray_1_2_4_to_8(png_structp png_ptr)
 void PNGAPI
 png_set_tRNS_to_alpha(png_structp png_ptr)
 {
-   png_debug(1, "in png_set_expand\n");
+   png_debug(1, "in png_set_tRNS_to_alpha\n");
   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
+#ifdef PNG_WARN_UNINITIALIZED_ROW
+   png_ptr->flags &= !(PNG_FLAG_ROW_INIT);
+#endif
 }
 #endif /* defined(PNG_READ_EXPAND_SUPPORTED) */

@@ -615,6 +627,9 @@ png_set_gray_to_rgb(png_structp png_ptr)
 {
   png_debug(1, "in png_set_gray_to_rgb\n");
   png_ptr->transformations |= PNG_GRAY_TO_RGB;
+#ifdef PNG_WARN_UNINITIALIZED_ROW
+   png_ptr->flags &= !(PNG_FLAG_ROW_INIT);
+#endif
 }
 #endif

@@ -1257,6 +1272,17 @@ png_do_read_transformations(png_structp png_ptr)
      png_error(png_ptr, "NULL row buffer");
 #endif
   }
+#ifdef PNG_WARN_UNINITIALIZED_ROW
+   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+      /* Application has failed to call either png_read_start_image()
+       * or png_read_update_info() after setting transforms that expand
+       * pixels.  This check added to libpng-1.2.19 */
+#if (PNG_WARN_UNINITIALIZED_ROW==1)
+      png_error(png_ptr, "Uninitialized row");
+#else
+      png_warning(png_ptr, "Uninitialized row");
+#endif
+#endif

 #if defined(PNG_READ_EXPAND_SUPPORTED)
   if (png_ptr->transformations & PNG_EXPAND)
@@ -1293,9 +1319,11 @@ png_do_read_transformations(png_structp png_ptr)
      if(rgb_error)
      {
         png_ptr->rgb_to_gray_status=1;
-         if(png_ptr->transformations & PNG_RGB_TO_GRAY_WARN)
+         if((png_ptr->transformations & PNG_RGB_TO_GRAY) == 
+             PNG_RGB_TO_GRAY_WARN)
            png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
-         if(png_ptr->transformations & PNG_RGB_TO_GRAY_ERR)
+         if((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
+             PNG_RGB_TO_GRAY_ERR)
            png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");
      }
   }
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@

 /* pngrutil.c - utilities to read a PNG file
 *
- * Last changed in libpng 1.2.19 June 23, 2007
+ * Last changed in libpng 1.2.19 August 19, 2007
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2007 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -16,8 +16,12 @@

 #if defined(PNG_READ_SUPPORTED)

+#if defined(_WIN32_WCE) && (_WIN32_WCE<0x500)
+#  define WIN32_WCE_OLD
+#endif
+
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-#  if defined(_WIN32_WCE)
+#  if defined(WIN32_WCE_OLD)
 /* strtod() function is not supported on WindowsCE */
 __inline double png_strtod(png_structp png_ptr, PNG_CONST char *nptr, char **endptr)
 {
@@ -33,7 +37,7 @@ __inline double png_strtod(png_structp png_ptr, PNG_CONST char *nptr, char **end
      result = wcstod(str, &end);
      len = WideCharToMultiByte(CP_ACP, 0, end, -1, NULL, 0, NULL, NULL);
      *endptr = (char *)nptr + (png_strlen(nptr) - len + 1);
-      png_free(str);
+      png_free(png_ptr, str);
   }
   return result;
 }
@@ -1040,7 +1044,7 @@ png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)

   /* there should be at least one zero (the compression type byte)
      following the separator, and we should be on it  */
-   if ( profile >= chunkdata + slength)
+   if ( profile >= chunkdata + slength - 1)
   {
      png_free(png_ptr, chunkdata);
      png_warning(png_ptr, "Malformed iCCP chunk");
@@ -1144,7 +1148,7 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
   ++entry_start;

   /* a sample depth should follow the separator, and we should be on it  */
-   if (entry_start > chunkdata + slength)
+   if (entry_start > chunkdata + slength - 2)
   {
      png_free(png_ptr, chunkdata);
      png_warning(png_ptr, "malformed sPLT chunk");
@@ -1990,10 +1994,11 @@ png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
      /* empty loop */ ;

   /* zTXt must have some text after the chunkdataword */
-   if (text == chunkdata + slength)
+   if (text == chunkdata + slength - 1)
   {
-      comp_type = PNG_TEXT_COMPRESSION_NONE;
-      png_warning(png_ptr, "Zero length zTXt chunk");
+      png_warning(png_ptr, "Truncated zTXt chunk");
+      png_free(png_ptr, chunkdata);
+      return;
   }
   else
   {
@@ -2093,10 +2098,11 @@ png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
      translated keyword (possibly empty), and possibly some text after the
      keyword */

-   if (lang >= chunkdata + slength)
+   if (lang >= chunkdata + slength - 3)
   {
-      comp_flag = PNG_TEXT_COMPRESSION_NONE;
-      png_warning(png_ptr, "Zero length iTXt chunk");
+      png_warning(png_ptr, "Truncated iTXt chunk");
+      png_free(png_ptr, chunkdata);
+      return;
   }
   else
   {
@@ -2111,6 +2117,12 @@ png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
   for (text = lang_key; *text; text++)
      /* empty loop */ ;
   text++;        /* skip NUL separator */
+   if (text >= chunkdata + slength)
+   {
+      png_warning(png_ptr, "Malformed iTXt chunk");
+      png_free(png_ptr, chunkdata);
+      return;
+   }

   prefix_len = text - chunkdata;

@@ -2273,8 +2285,8 @@ png_check_chunk_name(png_structp png_ptr, png_bytep chunk_name)
 *
 */

-#if !defined(PNG_USE_PNGGCCRD) &&  !defined(PNG_USE_PNGVCRD)
 #if defined(PNG_OPTIMIZED_CODE_SUPPORTED)
+#if !defined(PNG_HAVE_MMX_COMBINE_ROW)

 /*===========================================================================*/
 /*                                                                           */
@@ -2325,7 +2337,50 @@ static PNG_CONST int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1};
   {
      switch (png_ptr->row_info.pixel_depth)
      {
-         /* most common case:  combining 32-bit RGBA */
+         /* most common case:  combining 24-bit RGB */
+         case 24:       /* png_ptr->row_info.pixel_depth */
+         {
+            png_bytep srcptr;
+            png_bytep dstptr;
+
+            {
+               register png_uint_32 i;
+               png_uint_32 initial_val = BPP3 * png_pass_start[png_ptr->pass];
+                 /* png.c:  png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; */
+               register int stride = BPP3 * png_pass_inc[png_ptr->pass];
+                 /* png.c:  png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
+               register int rep_bytes = BPP3 * png_pass_width[png_ptr->pass];
+                 /* png.c:  png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; */
+               png_uint_32 len = png_ptr->width &~7; /* reduce to mult of 8 */
+               int diff = (int) (png_ptr->width & 7); /* amount lost */
+               register png_uint_32 final_val = BPP3 * len;   /* GRR bugfix */
+
+               srcptr = png_ptr->row_buf + 1 + initial_val;
+               dstptr = row + initial_val;
+
+               for (i = initial_val; i < final_val; i += stride)
+               {
+                  png_memcpy(dstptr, srcptr, rep_bytes);
+                  srcptr += stride;
+                  dstptr += stride;
+               }
+               if (diff)  /* number of leftover pixels:  3 for pngtest */
+               {
+                  final_val += diff*BPP3;
+                  for (; i < final_val; i += stride)
+                  {
+                     if (rep_bytes > (int)(final_val-i))
+                        rep_bytes = (int)(final_val-i);
+                     png_memcpy(dstptr, srcptr, rep_bytes);
+                     srcptr += stride;
+                     dstptr += stride;
+                  }
+               }
+            } /* end of else (_mmx_supported) */
+
+            break;
+         }       /* end 24 bpp */
+
         case 32:       /* png_ptr->row_info.pixel_depth */
         {
            png_bytep srcptr;
@@ -2369,6 +2424,48 @@ static PNG_CONST int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1};
            break;
         }       /* end 32 bpp */

+         case 8:        /* png_ptr->row_info.pixel_depth */
+         {
+            png_bytep srcptr;
+            png_bytep dstptr;
+            {
+               register png_uint_32 i;
+               png_uint_32 initial_val = png_pass_start[png_ptr->pass];
+                 /* png.c:  png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; */
+               register int stride = png_pass_inc[png_ptr->pass];
+                 /* png.c:  png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
+               register int rep_bytes = png_pass_width[png_ptr->pass];
+                 /* png.c:  png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; */
+               png_uint_32 len = png_ptr->width &~7; /* reduce to mult of 8 */
+               int diff = (int) (png_ptr->width & 7); /* amount lost */
+               register png_uint_32 final_val = len;  /* GRR bugfix */
+
+               srcptr = png_ptr->row_buf + 1 + initial_val;
+               dstptr = row + initial_val;
+
+               for (i = initial_val; i < final_val; i += stride)
+               {
+                  png_memcpy(dstptr, srcptr, rep_bytes);
+                  srcptr += stride;
+                  dstptr += stride;
+               }
+               if (diff)  /* number of leftover pixels:  3 for pngtest */
+               {
+                  final_val += diff /* *BPP1 */ ;
+                  for (; i < final_val; i += stride)
+                  {
+                     if (rep_bytes > (int)(final_val-i))
+                        rep_bytes = (int)(final_val-i);
+                     png_memcpy(dstptr, srcptr, rep_bytes);
+                     srcptr += stride;
+                     dstptr += stride;
+                  }
+               }
+            }
+
+            break;
+         }       /* end 8 bpp */
+
         case 1:        /* png_ptr->row_info.pixel_depth */
         {
            png_bytep sp;
@@ -2535,48 +2632,6 @@ static PNG_CONST int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1};
            break;
         }       /* end 4 bpp */

-         case 8:        /* png_ptr->row_info.pixel_depth */
-         {
-            png_bytep srcptr;
-            png_bytep dstptr;
-            {
-               register png_uint_32 i;
-               png_uint_32 initial_val = png_pass_start[png_ptr->pass];
-                 /* png.c:  png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; */
-               register int stride = png_pass_inc[png_ptr->pass];
-                 /* png.c:  png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
-               register int rep_bytes = png_pass_width[png_ptr->pass];
-                 /* png.c:  png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; */
-               png_uint_32 len = png_ptr->width &~7; /* reduce to mult of 8 */
-               int diff = (int) (png_ptr->width & 7); /* amount lost */
-               register png_uint_32 final_val = len;  /* GRR bugfix */
-
-               srcptr = png_ptr->row_buf + 1 + initial_val;
-               dstptr = row + initial_val;
-
-               for (i = initial_val; i < final_val; i += stride)
-               {
-                  png_memcpy(dstptr, srcptr, rep_bytes);
-                  srcptr += stride;
-                  dstptr += stride;
-               }
-               if (diff)  /* number of leftover pixels:  3 for pngtest */
-               {
-                  final_val += diff /* *BPP1 */ ;
-                  for (; i < final_val; i += stride)
-                  {
-                     if (rep_bytes > (int)(final_val-i))
-                        rep_bytes = (int)(final_val-i);
-                     png_memcpy(dstptr, srcptr, rep_bytes);
-                     srcptr += stride;
-                     dstptr += stride;
-                  }
-               }
-            }
-
-            break;
-         }       /* end 8 bpp */
-
         case 16:       /* png_ptr->row_info.pixel_depth */
         {
            png_bytep srcptr;
@@ -2621,48 +2676,6 @@ static PNG_CONST int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1};
         }       /* end 16 bpp */


-         case 24:       /* png_ptr->row_info.pixel_depth */
-         {
-            png_bytep srcptr;
-            png_bytep dstptr;
-
-            {
-               register png_uint_32 i;
-               png_uint_32 initial_val = BPP3 * png_pass_start[png_ptr->pass];
-                 /* png.c:  png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; */
-               register int stride = BPP3 * png_pass_inc[png_ptr->pass];
-                 /* png.c:  png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
-               register int rep_bytes = BPP3 * png_pass_width[png_ptr->pass];
-                 /* png.c:  png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; */
-               png_uint_32 len = png_ptr->width &~7; /* reduce to mult of 8 */
-               int diff = (int) (png_ptr->width & 7); /* amount lost */
-               register png_uint_32 final_val = BPP3 * len;   /* GRR bugfix */
-
-               srcptr = png_ptr->row_buf + 1 + initial_val;
-               dstptr = row + initial_val;
-
-               for (i = initial_val; i < final_val; i += stride)
-               {
-                  png_memcpy(dstptr, srcptr, rep_bytes);
-                  srcptr += stride;
-                  dstptr += stride;
-               }
-               if (diff)  /* number of leftover pixels:  3 for pngtest */
-               {
-                  final_val += diff*BPP3;
-                  for (; i < final_val; i += stride)
-                  {
-                     if (rep_bytes > (int)(final_val-i))
-                        rep_bytes = (int)(final_val-i);
-                     png_memcpy(dstptr, srcptr, rep_bytes);
-                     srcptr += stride;
-                     dstptr += stride;
-                  }
-               }
-            } /* end of else (_mmx_supported) */
-
-            break;
-         }       /* end 24 bpp */

         case 48:       /* png_ptr->row_info.pixel_depth */
         {
@@ -2756,6 +2769,7 @@ static PNG_CONST int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1};
   } /* end if (non-trivial mask) */

 } /* end png_combine_row() */
+#endif /* PNG_HAVE_MMX_COMBINE_ROW */



@@ -2766,6 +2780,7 @@ static PNG_CONST int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1};
 /*===========================================================================*/

 #if defined(PNG_READ_INTERLACING_SUPPORTED)
+#if !defined(PNG_HAVE_MMX_READ_INTERLACE)

 /* png_do_read_interlace() is called after any 16-bit to 8-bit conversion
 * has taken place.  [GRR: what other steps come before and/or after?]
@@ -3037,7 +3052,7 @@ static PNG_CONST int FARDATA png_pass_inc[7]   = {8, 8, 4, 4, 2, 2, 1};
                     png_memcpy(v, sptr, 4);
                     for (j = 0; j < png_pass_inc[pass]; j++)
                     {
-#if defined(PNG_DEBUG)
+#if defined(PNG_DEBUG) && defined(PNG_1_0_X)
                        if (dp < row || dp+3 > row+png_ptr->row_buf_size)
                        {
                           printf("dp out of bounds: row=%d, dp=%d, rp=%d\n",
@@ -3109,10 +3124,12 @@ static PNG_CONST int FARDATA png_pass_inc[7]   = {8, 8, 4, 4, 2, 2, 1};

 } /* end png_do_read_interlace() */

+#endif /* PNG_HAVE_MMX_READ_INTERLACE */
 #endif /* PNG_READ_INTERLACING_SUPPORTED */



+#if !defined(PNG_HAVE_MMX_READ_FILTER_ROW)
 /*===========================================================================*/
 /*                                                                           */
 /*                   P N G _ R E A D _ F I L T E R _ R O W                   */
@@ -3292,8 +3309,12 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
   }
 }

+#endif /* PNG_HAVE_MMX_READ_FILTER_ROW */
 #endif /* PNG_OPTIMIZED_CODE_SUPPORTED */

+#if !defined(PNG_ASSEMBLER_CODE_SUPPORTED) || \
+    !defined(PNG_MMX_CODE_SUPPORTED) || \
+    (!defined(PNG_USE_PNGGCCRD) && !defined(PNG_USE_PNGVCRD))
 #if !defined(PNG_OPTIMIZED_CODE_SUPPORTED)
 /* Use the unoptimized original C code.  This might be removed from a future
 * version of libpng if testing proves it to be worthless. */
@@ -3848,7 +3869,8 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,
   }
 }
 #endif /* !PNG_OPTIMIZED_CODE_SUPPORTED */
-#endif /* !PNG_USE_PNGGCCRD && !PNG_USE_PNGVCRD */
+#endif /* !PNG_ASSEMBLER_CODE_SUPPORTED || !PNG_MMX_CODE_SUPPORTED || */
+       /* (!PNG_USE_PNGGCCRD && !PNG_USE_PNGVCRD) */

 void /* PRIVATE */
 png_read_finish_row(png_structp png_ptr)
@@ -4143,7 +4165,7 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
 #endif
   png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes+64);
   png_ptr->row_buf = png_ptr->big_row_buf+32;
-#if defined(PNG_DEBUG) && defined(PNG_USE_PNGGCCRD)
+#if defined(PNG_DEBUG) && defined(PNG_USE_PNGGCCRD) && defined(PNG_1_0_X)
   png_ptr->row_buf_size = row_bytes;
 #endif

--- a/pngset.c
+++ b/pngset.c
@@ -879,9 +879,6 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,
         textp->itxt_length = 0;
 #endif
      }
-#if 0 /* appears to be redundant; */
-      info_ptr->text[info_ptr->num_text]= *textp;
-#endif
      info_ptr->num_text++;
      png_debug1(3, "transferred text chunk %d\n", info_ptr->num_text);
   }
--- a/pngtest.c
+++ b/pngtest.c
@@ -434,8 +434,9 @@ pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
      png_error(png_ptr, "Write Error");
   }
 }
-
 #endif /* USE_FAR_KEYWORD */
+#endif /* PNG_NO_STDIO */
+/* END of code to validate stdio-free compilation */

 /* This function is called when there is a warning, but the library thinks
 * it can continue anyway.  Replacement functions don't have to do anything
@@ -463,8 +464,6 @@ pngtest_error(png_structp png_ptr, png_const_charp message)
   /* We can return because png_error calls the default handler, which is
    * actually OK in this case. */
 }
-#endif /* PNG_NO_STDIO */
-/* END of code to validate stdio-free compilation */

 /* START of code to validate memory allocation and deallocation */
 #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
@@ -658,10 +657,8 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
   read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
      png_error_ptr_NULL, png_error_ptr_NULL);
 #endif
-#if defined(PNG_NO_STDIO)
   png_set_error_fn(read_ptr, (png_voidp)inname, pngtest_error,
       pngtest_warning);
-#endif
 #ifdef PNG_WRITE_SUPPORTED
 #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
   write_ptr = png_create_write_struct_2(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
@@ -671,10 +668,8 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
   write_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
      png_error_ptr_NULL, png_error_ptr_NULL);
 #endif
-#if defined(PNG_NO_STDIO)
   png_set_error_fn(write_ptr, (png_voidp)inname, pngtest_error,
       pngtest_warning);
-#endif
 #endif
   png_debug(0, "Allocating read_info, write_info and end_info structures\n");
   read_info_ptr = png_create_info_struct(read_ptr);
@@ -1553,4 +1548,4 @@ main(int argc, char *argv[])
 }

 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_19beta18 your_png_h_is_not_version_1_2_19beta18;
+typedef version_1_2_20rc3 your_png_h_is_not_version_1_2_20rc3;
--- a/pngvcrd.c
+++ b/pngvcrd.c
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -391,11 +391,6 @@ png_write_end(png_structp png_ptr, png_infop info_ptr)

   /* write end of PNG file */
   png_write_IEND(png_ptr);
-#if 0
-/* This flush, added in libpng-1.0.8,  causes some applications to crash
-   because they do not set png_ptr->output_flush_fn */
-   png_flush(png_ptr);
-#endif
 }

 #if defined(PNG_WRITE_tIME_SUPPORTED)
@@ -1141,15 +1136,26 @@ png_set_filter(png_structp png_ptr, int method, int filters)
   {
      switch (filters & (PNG_ALL_FILTERS | 0x07))
      {
+#ifndef PNG_NO_WRITE_FILTER
         case 5:
         case 6:
         case 7: png_warning(png_ptr, "Unknown row filter for method 0");
-         case PNG_FILTER_VALUE_NONE:  png_ptr->do_filter=PNG_FILTER_NONE; break;
-         case PNG_FILTER_VALUE_SUB:   png_ptr->do_filter=PNG_FILTER_SUB;  break;
-         case PNG_FILTER_VALUE_UP:    png_ptr->do_filter=PNG_FILTER_UP;   break;
-         case PNG_FILTER_VALUE_AVG:   png_ptr->do_filter=PNG_FILTER_AVG;  break;
-         case PNG_FILTER_VALUE_PAETH: png_ptr->do_filter=PNG_FILTER_PAETH;break;
+#endif /* PNG_NO_WRITE_FILTER */
+         case PNG_FILTER_VALUE_NONE:
+              png_ptr->do_filter=PNG_FILTER_NONE; break;
+#ifndef PNG_NO_WRITE_FILTER
+         case PNG_FILTER_VALUE_SUB:
+              png_ptr->do_filter=PNG_FILTER_SUB; break;
+         case PNG_FILTER_VALUE_UP:
+              png_ptr->do_filter=PNG_FILTER_UP; break;
+         case PNG_FILTER_VALUE_AVG:
+              png_ptr->do_filter=PNG_FILTER_AVG; break;
+         case PNG_FILTER_VALUE_PAETH:
+              png_ptr->do_filter=PNG_FILTER_PAETH; break;
         default: png_ptr->do_filter = (png_byte)filters; break;
+#else
+         default: png_warning(png_ptr, "Unknown row filter for method 0");
+#endif /* PNG_NO_WRITE_FILTER */
      }

      /* If we have allocated the row_buf, this means we have already started
@@ -1163,6 +1169,7 @@ png_set_filter(png_structp png_ptr, int method, int filters)
       */
      if (png_ptr->row_buf != NULL)
      {
+#ifndef PNG_NO_WRITE_FILTER
         if ((png_ptr->do_filter & PNG_FILTER_SUB) && png_ptr->sub_row == NULL)
         {
            png_ptr->sub_row = (png_bytep)png_malloc(png_ptr,
@@ -1217,6 +1224,7 @@ png_set_filter(png_structp png_ptr, int method, int filters)
         }

         if (png_ptr->do_filter == PNG_NO_FILTERS)
+#endif /* PNG_NO_WRITE_FILTER */
            png_ptr->do_filter = PNG_FILTER_NONE;
      }
   }
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@

 /* pngwutil.c - utilities to write a PNG file
 *
- * Last changed in libpng 1.2.19 June 23, 2007
+ * Last changed in libpng 1.2.19 August 19, 2007
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2007 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1726,6 +1726,7 @@ png_write_tIME(png_structp png_ptr, png_timep mod_time)
 void /* PRIVATE */
 png_write_start_row(png_structp png_ptr)
 {
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
 #ifdef PNG_USE_LOCAL_ARRAYS
   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */

@@ -1740,6 +1741,7 @@ png_write_start_row(png_structp png_ptr)

   /* offset to next interlace block in the y direction */
   int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif
 #endif

   png_size_t buf_size;
@@ -1752,6 +1754,7 @@ png_write_start_row(png_structp png_ptr)
   png_ptr->row_buf = (png_bytep)png_malloc(png_ptr, (png_uint_32)buf_size);
   png_ptr->row_buf[0] = PNG_FILTER_VALUE_NONE;

+#ifndef PNG_NO_WRITE_FILTERING
   /* set up filtering buffer, if using this filter */
   if (png_ptr->do_filter & PNG_FILTER_SUB)
   {
@@ -1787,6 +1790,7 @@ png_write_start_row(png_structp png_ptr)
            (png_ptr->rowbytes + 1));
         png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
      }
+#endif /* PNG_NO_WRITE_FILTERING */
   }

 #ifdef PNG_WRITE_INTERLACING_SUPPORTED
@@ -1820,6 +1824,7 @@ png_write_start_row(png_structp png_ptr)
 void /* PRIVATE */
 png_write_finish_row(png_structp png_ptr)
 {
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
 #ifdef PNG_USE_LOCAL_ARRAYS
   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */

@@ -1834,6 +1839,7 @@ png_write_finish_row(png_structp png_ptr)

   /* offset to next interlace block in the y direction */
   int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif
 #endif

   int ret;
@@ -2108,7 +2114,9 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)
 void /* PRIVATE */
 png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
 {
-   png_bytep prev_row, best_row, row_buf;
+   png_bytep best_row;
+#ifndef PNG_NO_WRITE_FILTER
+   png_bytep prev_row, row_buf;
   png_uint_32 mins, bpp;
   png_byte filter_to_do = png_ptr->do_filter;
   png_uint_32 row_bytes = row_info->rowbytes;
@@ -2121,7 +2129,10 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
   bpp = (row_info->pixel_depth + 7) >> 3;

   prev_row = png_ptr->prev_row;
-   best_row = row_buf = png_ptr->row_buf;
+#endif
+   best_row = png_ptr->row_buf;
+#ifndef PNG_NO_WRITE_FILTER
+   row_buf = best_row;
   mins = PNG_MAXSUM;

   /* The prediction method we use is to find which method provides the
@@ -2696,11 +2707,12 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
         best_row = png_ptr->paeth_row;
      }
   }
-
+#endif /* PNG_NO_WRITE_FILTER */
   /* Do the actual writing of the filtered row data from the chosen filter. */

   png_write_filtered_row(png_ptr, best_row);

+#ifndef PNG_NO_WRITE_FILTER
 #if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
   /* Save the type of filter we picked this time for future calculations */
   if (png_ptr->num_prev_filters > 0)
@@ -2713,6 +2725,7 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
      png_ptr->prev_filters[j] = best_row[0];
   }
 #endif
+#endif /* PNG_NO_WRITE_FILTER */
 }


--- a/projects/visualc6/libpng.dsp
+++ b/projects/visualc6/libpng.dsp
@@ -50,7 +50,7 @@ CFG=libpng - Win32 DLL Release
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
 # SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_BUILD_DLL" /D "PNG_NO_MMX_CODE" /D "ZLIB_DLL" /D "_CRT_SECURE_NO_WARNINGS /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -81,7 +81,7 @@ LINK32=link.exe
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
 # SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "PNG_NO_MMX_CODE" /D PNG_DEBUG=1 /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D "_CRT_SECURE_NO_WARNINGS /FD /GZ /c
 # SUBTRACT CPP /YX /Yc /Yu
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -112,7 +112,7 @@ LINK32=link.exe
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
 # SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_USE_PNGVCRD" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D "PNG_LIBPNG_SPECIALBUILD" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_USE_PNGVCRD" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -143,7 +143,7 @@ LINK32=link.exe
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
 # SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /D "PNG_USE_PNGVCRD" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D "PNG_LIBPNG_SPECIALBUILD" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /D "PNG_USE_PNGVCRD" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS /FD /GZ /c
 # SUBTRACT CPP /YX /Yc /Yu
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -174,7 +174,7 @@ LINK32=link.exe
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
 # SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D PNGAPI=__stdcall /D "PNG_NO_MODULEDEF" /D "PNG_LIBPNG_SPECIALBUILD" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D PNGAPI=__stdcall /D "PNG_NO_MODULEDEF" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -210,7 +210,7 @@ PostBuild_Cmds=echo    Deleting $(targetname) import library and export file (No
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
 # SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "PNG_NO_MMX_CODE" /D "WIN32" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -237,7 +237,7 @@ LIB32=link.exe -lib
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
 # SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "PNG_NO_MMX_CODE" /D PNG_DEBUG=1 /D "_CRT_SECURE_NO_WARNINGS /FD /GZ /c
 # SUBTRACT CPP /YX /Yc /Yu
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -264,7 +264,7 @@ LIB32=link.exe -lib
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
 # SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_USE_PNGVCRD" /D "PNG_LIBPNG_SPECIALBUILD" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_USE_PNGVCRD" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -291,7 +291,7 @@ LIB32=link.exe -lib
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
 # SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /D "PNG_USE_PNGVCRD" /D "PNG_LIBPNG_SPECIALBUILD" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /D "PNG_USE_PNGVCRD" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS /FD /GZ /c
 # SUBTRACT CPP /YX /Yc /Yu
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
--- a/projects/visualc71/libpng.vcproj
+++ b/projects/visualc71/libpng.vcproj
@@ -18,7 +18,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..;..\..\..\zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;PNG_BUILD_DLL;ZLIB_DLL"
+				PreprocessorDefinitions="WIN32;PNG_NO_MMX_CODE;NDEBUG;PNG_BUILD_DLL;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -43,7 +43,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG";_CRT_SECURE_NO_WARNINGS
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..;..\..\..\zlib;$(IntDir)"/>
 			<Tool
@@ -66,7 +66,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..;..\..\..\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;PNG_DEBUG=1;PNG_BUILD_DLL;ZLIB_DLL"
+				PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;PNG_NO_MMX_CODE;PNG_DEBUG=1;PNG_BUILD_DLL;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="3"
@@ -91,7 +91,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG,PNG_DEBUG=1"
+				PreprocessorDefinitions="_DEBUG,PNG_DEBUG=1;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..;..\..\..\zlib;$(IntDir)"/>
 			<Tool
@@ -114,7 +114,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..;..\..\..\zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;PNG_USE_PNGVCRD;PNG_BUILD_DLL;ZLIB_DLL;PNG_LIBPNG_SPECIALBUILD"
+				PreprocessorDefinitions="WIN32;NDEBUG;PNG_USE_PNGVCRD;PNG_BUILD_DLL;ZLIB_DLL;PNG_LIBPNG_SPECIALBUILD;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/d PNG_LIBPNG_SPECIALBUILD=&quot;&quot;&quot;&quot;Use MMX instructions&quot;&quot;&quot;&quot;"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..;..\..\..\zlib;$(IntDir)"/>
 			<Tool
@@ -163,7 +163,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..;..\..\..\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;PNG_DEBUG=1;PNG_USE_PNGVCRD;PNG_BUILD_DLL;ZLIB_DLL;PNG_LIBPNG_SPECIALBUILD"
+				PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;PNG_DEBUG=1;PNG_USE_PNGVCRD;PNG_BUILD_DLL;ZLIB_DLL;PNG_LIBPNG_SPECIALBUILD;_CRT_SECURE_NO_WARNINGS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="3"
@@ -189,7 +189,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/d PNG_LIBPNG_SPECIALBUILD=&quot;&quot;&quot;&quot;Use MMX instructions&quot;&quot;&quot;&quot;"
-				PreprocessorDefinitions="_DEBUG,PNG_DEBUG=1"
+				PreprocessorDefinitions="_DEBUG,PNG_DEBUG=1;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..;..\..\..\zlib;$(IntDir)"/>
 			<Tool
@@ -212,7 +212,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..;..\..\..\zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;PNG_BUILD_DLL;ZLIB_DLL;PNGAPI=__stdcall;PNG_NO_MODULEDEF;PNG_LIBPNG_SPECIALBUILD"
+				PreprocessorDefinitions="WIN32;NDEBUG;PNG_BUILD_DLL;ZLIB_DLL;PNGAPI=__stdcall;PNG_NO_MMX_CODE;PNG_NO_MODULEDEF;PNG_LIBPNG_SPECIALBUILD;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -237,7 +237,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/d PNG_LIBPNG_DLLFNAME_POSTFIX=&quot;&quot;&quot;&quot;VB&quot;&quot;&quot;&quot; /d PNG_LIBPNG_SPECIALBUILD=&quot;&quot;&quot;&quot;__stdcall calling convention used for exported functions&quot;&quot;&quot;&quot;"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..;..\..\..\zlib;$(IntDir)"/>
 			<Tool
@@ -260,7 +260,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..;..\..\..\zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG"
+				PreprocessorDefinitions="PNG_NO_MMX_CODE;WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -301,7 +301,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..;..\..\..\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;PNG_DEBUG=1"
+				PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;PNG_NO_MMX_CODE;PNG_DEBUG=1;_CRT_SECURE_NO_WARNINGS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="3"
@@ -342,7 +342,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..,..\..\..\zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;PNG_USE_PNGVCRD;PNG_LIBPNG_SPECIALBUILD"
+				PreprocessorDefinitions="WIN32;NDEBUG;PNG_USE_PNGVCRD;PNG_LIBPNG_SPECIALBUILD;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -383,7 +383,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..,..\..\..\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;PNG_DEBUG=1;PNG_USE_PNGVCRD;PNG_LIBPNG_SPECIALBUILD"
+				PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;PNG_DEBUG=1;PNG_USE_PNGVCRD;PNG_LIBPNG_SPECIALBUILD;_CRT_SECURE_NO_WARNINGS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="3"
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,3 +1,4 @@
+                                             
 project(PNG)

 # Copyright (C) 2007 Glenn Randers-Pehrson
@@ -5,7 +6,7 @@ project(PNG)

 set(PNGLIB_MAJOR 1)
 set(PNGLIB_MINOR 2)
-set(PNGLIB_RELEASE 19)
+set(PNGLIB_RELEASE 20)
 set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
 set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})

@@ -29,7 +30,11 @@ endif(NOT WIN32)
 # COMMAND LINE OPTIONS
 option(PNG_SHARED "Build shared lib" YES)
 option(PNG_STATIC "Build static lib" YES)
-option(PNG_TESTS  "Build pngtest" YES)
+if(MINGW)
+  option(PNG_TESTS  "Build pngtest" NO)
+else(MINGW)
+  option(PNG_TESTS  "Build pngtest" YES)
+endif(MINGW)
 option(PNG_NO_CONSOLE_IO "FIXME" YES)
 option(PNG_NO_STDIO      "FIXME" YES)
 option(PNG_DEBUG         "Build with debug output" YES)
@@ -49,6 +54,12 @@ if(NOT WIN32)
      set(png_asm_tmp "OFF")
   endif("uname_output" MATCHES "^.*i[1-9]86.*$")
 endif(uname_executable)
+else(NOT WIN32)
+ # this env var is normally only set on win64
+ SET(TEXT "ProgramFiles(x86)")
+ if("$ENV{${TEXT}}" STREQUAL "")
+  set(png_asm_tmp "ON")
+ endif("$ENV{${TEXT}}" STREQUAL "")
 endif(NOT WIN32)

 option(PNG_MMX "Use MMX assembler code (x86 only)" ${png_asm_tmp})
@@ -122,9 +133,9 @@ if(PNG_DEBUG)
 add_definitions(-DPNG_DEBUG)
 endif(PNG_DEBUG)

-if(NOT M_LIBRARY)
+if(NOT M_LIBRARY AND NOT WIN32)
 add_definitions(-DPNG_NO_FLOATING_POINT_SUPPORTED)
-endif(NOT M_LIBRARY)
+endif(NOT M_LIBRARY AND NOT WIN32)

 # NOW BUILD OUR TARGET
 include_directories(${PNG_SOURCE_DIR} ${ZLIB_INCLUDE_DIR})
@@ -169,16 +180,22 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in

 # SET UP LINKS
 set_target_properties(${PNG_LIB_NAME} PROPERTIES
-#    VERSION 0.${PNGLIB_RELEASE}.1.2.19beta18
+#    VERSION 0.${PNGLIB_RELEASE}.1.2.20rc3
     VERSION 0.${PNGLIB_RELEASE}.0
     SOVERSION 0
     CLEAN_DIRECT_OUTPUT 1)
-set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES
+if(NOT WIN32)
+  # that's uncool on win32 - it overwrites our static import lib...
+  set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES
     OUTPUT_NAME ${PNG_LIB_NAME}
     CLEAN_DIRECT_OUTPUT 1)
-
+endif(NOT WIN32)
 # INSTALL
-install_targets(/lib ${PNG_LIB_NAME} ${PNG_LIB_NAME_STATIC})
+install_targets(/lib ${PNG_LIB_NAME})
+if(PNG_STATIC)
+  install_targets(/lib ${PNG_LIB_NAME_STATIC})
+endif(PNG_STATIC)
+
 install(FILES png.h pngconf.h         DESTINATION include)
 install(FILES png.h pngconf.h         DESTINATION include/${PNGLIB_NAME})
 install(FILES libpng.3 libpngpf.3             DESTINATION man/man3)
@@ -201,3 +218,4 @@ install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config DESTINATION bin)
 # to create msvc import lib for mingw compiled shared lib
 # pexports libpng.dll > libpng.def
 # lib /def:libpng.def /machine:x86
+
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@

 # Modeled after libxml-config.

-version=1.2.19beta18
+version=1.2.20rc3
 prefix=""
 libdir=""
 libs=""
--- a/scripts/libpng.pc-configure.in
+++ b/scripts/libpng.pc-configure.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng12

 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.2.19beta18
+Version: 1.2.20rc3
 Libs: -L${libdir} -lpng12
 Cflags: -I${includedir} @LIBPNG_NO_MMX@
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng12

 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.2.19beta18
+Version: 1.2.20rc3
 Libs: -L${libdir} -lpng12
 Cflags: -I${includedir}
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@ LN_SF = ln -f -s

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 prefix=/usr/local
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng12
 PNGMAJ = 0
 CYGDLL = 12
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 SHAREDLIB=cygpng$(CYGDLL).dll
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@ ZLIBINC=../zlib
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@

 # Library name:
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -16,7 +16,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -78,7 +78,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng12
 PNGMAJ = 0
 MINGDLL = 12
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 SHAREDLIB=libpng$(MINGDLL).dll
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng12

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

 LIB=	png
 SHLIB_MAJOR=	3
-SHLIB_MINOR=	1.2.19beta18
+SHLIB_MINOR=	1.2.20rc3
 SRCS=	pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 		pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 		pngwtran.c pngmem.c pngerror.c pngpread.c
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -7,7 +7,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -8,7 +8,7 @@ LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat

 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.19beta18
+SHLIB_MINOR=	1.2.20rc3

 LIB=	png
 SRCS=	png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@

 # Library name:
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta18
+PNGMIN = 1.2.20rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
@@ -69,7 +69,7 @@ DM=$(DESTDIR)$(MANPATH)

 OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
-	pngwtran.o pngmem.o pngerror.o pngpread.o
+	pngwtran.o pngmem.o pngerror.o pngpread.o pnggccrd.o

 OBJSDLL = $(OBJS:.o=.pic.o)

@@ -232,6 +232,7 @@ pngwio.o pngwio.pic.o: png.h pngconf.h
 pngmem.o pngmem.pic.o: png.h pngconf.h
 pngset.o pngset.pic.o: png.h pngconf.h
 pngget.o pngget.pic.o: png.h pngconf.h
+pnggccrd.o pnggccrd.pic.o: png.h pngconf.h
 pngread.o pngread.pic.o: png.h pngconf.h
 pngrtran.o pngrtran.pic.o: png.h pngconf.h
 pngrutil.o pngrutil.pic.o: png.h pngconf.h
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------

-; Version 1.2.19beta18
+; Version 1.2.20rc3

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

 EXPORTS
-;Version 1.2.19beta18
+;Version 1.2.20rc3
  png_build_grayscale_palette  @1
  png_check_sig        @2
  png_chunk_error      @3
@@ -45,7 +45,7 @@ EXPORTS
  png_get_image_width  @37
  png_get_interlace_type  @38
  png_get_io_ptr    @39
-  png_get_libpng_ver  @40
+  ; png_get_libpng_ver  @40
  png_get_oFFs    @41
  png_get_pCAL    @42
  png_get_pHYs    @43
Author	SHA1	Message	Date
Glenn Randers-Pehrson	9cc7b03503	Imported from libpng-1.2.20rc3.tar	2009-04-06 16:14:45 -05:00
Glenn Randers-Pehrson	b38f12d519	Imported from libpng-1.2.20rc2.tar	2009-04-06 16:14:43 -05:00
Glenn Randers-Pehrson	e736f1ead9	Imported from libpng-1.2.20rc1.tar	2009-04-06 16:14:40 -05:00
Glenn Randers-Pehrson	b56c1f6023	Imported from libpng-1.2.20beta04.tar	2009-04-06 16:14:37 -05:00
Glenn Randers-Pehrson	268f0d64fc	Imported from libpng-1.2.20beta03.tar	2009-04-06 16:14:35 -05:00
Glenn Randers-Pehrson	b3ea17736b	Imported from libpng-1.2.20beta02.tar	2009-04-06 16:14:33 -05:00
Glenn Randers-Pehrson	963daeaec5	Imported from libpng-1.2.20beta01.tar	2009-04-06 16:14:30 -05:00
Glenn Randers-Pehrson	249bd44ebc	Imported from libpng-1.2.19.tar	2009-04-06 16:14:28 -05:00
Glenn Randers-Pehrson	04a1b1c123	Imported from libpng-1.2.19rc6.tar	2009-04-06 16:14:25 -05:00
Glenn Randers-Pehrson	3922e7afc3	Imported from libpng-1.2.19rc5.tar	2009-04-06 16:14:23 -05:00
Glenn Randers-Pehrson	f0a97a0d80	Imported from libpng-1.2.19rc4.tar	2009-04-06 16:14:21 -05:00
Glenn Randers-Pehrson	88713fd590	Imported from libpng-1.2.19rc3.tar	2009-04-06 16:14:18 -05:00
Glenn Randers-Pehrson	394759e0c8	Imported from libpng-1.2.19rc2.tar	2009-04-06 16:14:16 -05:00
Glenn Randers-Pehrson	c229f65dcf	Imported from libpng-1.2.19rc1.tar	2009-04-06 16:14:13 -05:00
Glenn Randers-Pehrson	f929861609	Imported from libpng-1.2.19beta31.tar	2009-04-06 16:14:10 -05:00
Glenn Randers-Pehrson	f024ce7675	Imported from libpng-1.2.19beta30.tar	2009-04-06 16:14:08 -05:00
Glenn Randers-Pehrson	f3fcf00392	Imported from libpng-1.2.19beta29.tar	2009-04-06 16:14:05 -05:00
Glenn Randers-Pehrson	08313ef870	Imported from libpng-1.2.19beta28.tar	2009-04-06 16:14:03 -05:00
Glenn Randers-Pehrson	911c469d69	Imported from libpng-1.2.19beta27.tar	2009-04-06 16:14:00 -05:00
Glenn Randers-Pehrson	07c089ee04	Imported from libpng-1.2.19beta26.tar	2009-04-06 16:13:58 -05:00
Glenn Randers-Pehrson	dadc944810	Imported from libpng-1.2.19beta25.tar	2009-04-06 16:13:55 -05:00
Glenn Randers-Pehrson	80663032a9	Imported from libpng-1.2.19beta24.tar	2009-04-06 16:13:53 -05:00
Glenn Randers-Pehrson	67c75ee7f0	Imported from libpng-1.2.19beta23.tar	2009-04-06 16:13:51 -05:00
Glenn Randers-Pehrson	62626737a5	Imported from libpng-1.2.19beta22.tar	2009-04-06 16:13:48 -05:00
Glenn Randers-Pehrson	e404eed318	Imported from libpng-1.2.19beta21.tar	2009-04-06 16:13:46 -05:00
Glenn Randers-Pehrson	3c115428ea	Imported from libpng-1.2.19beta20.tar	2009-04-06 16:13:43 -05:00
Glenn Randers-Pehrson	db40ca4aca	Imported from libpng-1.2.19beta19.tar	2009-04-06 16:13:41 -05:00