Imported from libpng-1.2.19rc6.tar

ANNOUNCE

@@ -1,5 +1,5 @@
 
-Libpng 1.2.19beta27 - July 18, 2007
+Libpng 1.2.19rc6 - August 15, 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,32 +9,32 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   libpng-1.2.19beta27.tar.gz
-   libpng-1.2.19beta27.tar.bz2
+   libpng-1.2.19rc6.tar.gz
+   libpng-1.2.19rc6.tar.bz2
 
 Source files with LF line endings (for Unix/Linux) without the
 "configure" script
 
-   libpng-1.2.19beta27-no-config.tar.gz
-   libpng-1.2.19beta27-no-config.tar.bz2
+   libpng-1.2.19rc6-no-config.tar.gz
+   libpng-1.2.19rc6-no-config.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp1219b27.zip
-   lp1219b27.tar.bz2
+   lp1219r06.zip
+   lp1219r06.tar.bz2
 
 Project files
 
-   libpng-1.2.19beta27-project-netware.zip
-   libpng-1.2.19beta27-project-wince.zip
+   libpng-1.2.19rc6-project-netware.zip
+   libpng-1.2.19rc6-project-wince.zip
 
 Other information:
 
-   libpng-1.2.19beta27-README.txt
-   libpng-1.2.19beta27-KNOWNBUGS.txt
-   libpng-1.2.19beta27-LICENSE.txt
-   libpng-1.2.19beta27-Y2K-compliance.txt
+   libpng-1.2.19rc6-README.txt
+   libpng-1.2.19rc6-KNOWNBUGS.txt
+   libpng-1.2.19rc6-LICENSE.txt
+   libpng-1.2.19rc6-Y2K-compliance.txt
 
 Changes since the last public release (1.2.18):
 
@@ -149,11 +149,53 @@ version 1.2.19beta26 [July 16, 2007]
   Updated scripts/CMakeLists.txt
   Relocated a misplaced #endif in pnggccrd.c
 
-version 1.2.19beta27 [July 18, 2007]
+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.19beta30 [July 26, 2007]
+  Revised pnggccrd.c
+
+version 1.2.19beta31 [July 27, 2007]
+  Fix typos in pnggccrd.c
+
+version 1.2.19beta32 [August 15, 2007]
+  Disable PNG_MMX_CODE_SUPPORTED when PNG_ASSEMBLER_CODE_SUPPORTED is off.
+  Enable PNG_MMX_READ_FILTER_* by default (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.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 
 (subscription required; visit 

CHANGES

@@ -1842,11 +1842,56 @@ version 1.2.19beta26 [July 16, 2007]
   Updated scripts/CMakeLists.txt
   Relocated a misplaced #endif in pnggccrd.c
 
-version 1.2.19beta27 [July 18, 2007]
+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.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement

INSTALL

@@ -1,5 +1,5 @@
 
-Installing libpng version 1.2.19beta27 - July 18, 2007
+Installing libpng version 1.2.19rc6 - August 15, 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.19beta27" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.19rc6" 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.19beta27)
+                       gcc, creates libpng12.so.0.1.2.19rc6)
  makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng12.so.0.1.2.19beta27)
+                       (gcc, creates libpng12.so.0.1.2.19rc6)
  makefile.gcmmx    =>  Linux/ELF makefile
-                       (gcc, creates libpng12.so.0.1.2.19beta27,
+                       (gcc, creates libpng12.so.0.1.2.19rc6,
                        uses assembler code tuned for Intel MMX platform)
  makefile.nommx    =>  Linux/ELF makefile
-                       (gcc, creates libpng12.so.0.1.2.19beta27
+                       (gcc, creates libpng12.so.0.1.2.19rc6
                        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.19beta27)
+                       creates libpng12.so.0.1.2.19rc6)
  makefile.sunos    =>  Sun makefile
  makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng12.so.0.1.2.19beta27)
+                       creates libpng12.so.0.1.2.19rc6)
  makefile.solaris-x86 =>  Solaris/intelMMX 2.X makefile (gcc,
-                       creates libpng12.so.0.1.2.19beta27)
+                       creates libpng12.so.0.1.2.19rc6)
  makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng12.so.0.1.2.19beta27)
+                       creates libpng12.so.0.1.2.19rc6)
  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

KNOWNBUG

@@ -1,5 +1,5 @@
 
-Known bugs in libpng version 1.2.19beta27
+Known bugs in libpng version 1.2.19rc6
 
 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
@@ -20,11 +20,10 @@ Known bugs in libpng version 1.2.19beta27
    that are generated by the custom makefiles.
 
 4. June 28, 2007: Pnggccrd.c has been reported to be unreliable on
-   several 64-bit platforms running gcc-3.4.6.  It appears to build
-   properly, but it does not always read files correctly, leading to
-   corrupted output or to a crash of the application.
+   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 use -DPNG_NO_MMX_CODE or to upgrade gcc to a
-   newer version.
+   Workarounds are to define PNG_NO_MMX_FILTER_UP|AVG|PAETH (as in
+   pngconf.h) or to upgrade gcc to a newer version.
 

LICENSE

@@ -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.19beta27, July 18, 2007, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.19rc6, August 15, 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
-July 18, 2007
+August 15, 2007

README

@@ -1,4 +1,4 @@
-README for libpng version 1.2.19beta27 - July 18, 2007 (shared library 12.0)
+README for libpng version 1.2.19rc6 - August 15, 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.19beta27)
+                            gcc, creates libpng12.so.0.1.2.19rc6)
        makefile.linux   =>  Linux/ELF makefile
-                            (gcc, creates libpng12.so.0.1.2.19beta27)
+                            (gcc, creates libpng12.so.0.1.2.19rc6)
        makefile.gcmmx   =>  Linux/ELF makefile
-                            (gcc, creates libpng12.so.0.1.2.19beta27,
+                            (gcc, creates libpng12.so.0.1.2.19rc6,
                             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.19beta27)
+                            (gcc, creates libpng12.so.0.1.2.19rc6)
        makefile.sunos   =>  Sun makefile
        makefile.solaris =>  Solaris 2.X makefile
-                            (gcc, creates libpng12.so.0.1.2.19beta27)
+                            (gcc, creates libpng12.so.0.1.2.19rc6)
        makefile.so9     =>  Solaris 9 makefile
-                            (gcc, creates libpng12.so.0.1.2.19beta27)
+                            (gcc, creates libpng12.so.0.1.2.19rc6)
        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

Y2KINFO

@@ -1,13 +1,13 @@
    Y2K compliance in libpng:
    =========================
 
-      July 18, 2007
+      August 15, 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.19beta27 are Y2K compliant.  It is my belief that earlier
+      upward through 1.2.19rc6 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

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libpng 1.2.19beta27.
+# Generated by GNU Autoconf 2.61 for libpng 1.2.19rc6.
 #
 # Report bugs to <png-mng-implement@lists.sourceforge.net>.
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libpng'
 PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.2.19beta27'
-PACKAGE_STRING='libpng 1.2.19beta27'
+PACKAGE_VERSION='1.2.19rc6'
+PACKAGE_STRING='libpng 1.2.19rc6'
 PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
 
 ac_unique_file="pngget.c"
@@ -1405,7 +1405,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libpng 1.2.19beta27 to adapt to many kinds of systems.
+\`configure' configures libpng 1.2.19rc6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1475,7 +1475,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libpng 1.2.19beta27:";;
+     short | recursive ) echo "Configuration of libpng 1.2.19rc6:";;
    esac
   cat <<\_ACEOF
 
@@ -1585,7 +1585,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libpng configure 1.2.19beta27
+libpng configure 1.2.19rc6
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1599,7 +1599,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libpng $as_me 1.2.19beta27, which was
+It was created by libpng $as_me 1.2.19rc6, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2269,7 +2269,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libpng'
- VERSION='1.2.19beta27'
+ VERSION='1.2.19rc6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2440,7 +2440,7 @@ fi
 
 
 
-PNGLIB_VERSION=1.2.19beta27
+PNGLIB_VERSION=1.2.19rc6
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=2
 PNGLIB_RELEASE=19
@@ -21282,7 +21282,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libpng $as_me 1.2.19beta27, which was
+This file was extended by libpng $as_me 1.2.19rc6, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21335,7 +21335,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libpng config.status 1.2.19beta27
+libpng config.status 1.2.19rc6
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

configure.ac

@@ -18,12 +18,12 @@ AC_PREREQ(2.59)
 
 dnl Version number stuff here:
 
-AC_INIT([libpng], [1.2.19beta27], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.19rc6], [png-mng-implement@lists.sourceforge.net])
 AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE
 
-PNGLIB_VERSION=1.2.19beta27
+PNGLIB_VERSION=1.2.19rc6
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=2
 PNGLIB_RELEASE=19

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

contrib/pngminim/decoder/pngusr.h

@@ -13,7 +13,7 @@
 #define png_warning(s1,s2) ""
 #define png_chunk_warning(s1,s2) ""
 
-#define PNG_NO_MMX_CODE
+#define PNG_NO_ASSEMBLER_CODE
 #define PNG_NO_OPTIMIZED_CODE
 #define PNG_NO_READ_GAMMA
 #define PNG_NO_READ_BACKGROUND

libpng-1.2.19rc6.txt

@@ -1,6 +1,6 @@
 libpng.txt - A description on how to use and modify libpng
 
- libpng version 1.2.19beta27 - July 18, 2007
+ libpng version 1.2.19rc6 - August 15, 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
 
-July 18, 2007
+August 15, 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.19beta27 are Y2K compliant.  It is my belief that earlier
+upward through 1.2.19rc6 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

libpng.3

@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "July 18, 2007"
+.TH LIBPNG 3 "August 15, 2007"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta27
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19rc6
 .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.19beta27 - July 18, 2007
+ libpng version 1.2.19rc6 - August 15, 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
 
-July 18, 2007
+August 15, 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.19beta27 are Y2K compliant.  It is my belief that earlier
+upward through 1.2.19rc6 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,9 @@ 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-27      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]
 
 Henceforth the source version will match the shared-library minor
 and patch numbers; the shared-library major version number will be
@@ -3582,7 +3631,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.2.19beta27 - July 18, 2007:
+Libpng version 1.2.19rc6 - August 15, 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 +3652,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.19beta27, July 18, 2007, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.19rc6, August 15, 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 +3751,7 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-July 18, 2007
+August 15, 2007
 
 .\" end of man page
 

libpngpf.3

@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "July 18, 2007"
+.TH LIBPNGPF 3 "August 15, 2007"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta27
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19rc6
 (private functions)
 .SH SYNOPSIS
 \fB#include <png.h>\fP

png.5

@@ -1,4 +1,4 @@
-.TH PNG 5 "July 18, 2007"
+.TH PNG 5 "August 15, 2007"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION

png.c

@@ -1,7 +1,7 @@
 
 /* png.c - location for general purpose libpng functions
  *
- * Last changed in libpng 1.2.19 July 18, 2007
+ * Last changed in libpng 1.2.19 August 15, 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_19beta27 Your_png_h_is_not_version_1_2_19beta27;
+typedef version_1_2_19rc6 Your_png_h_is_not_version_1_2_19rc6;
 
 /* 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.19beta27 - July 18, 2007\n\
+   return ((png_charp) "\n libpng version 1.2.19rc6 - August 15, 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");

png.h

@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.2.19beta27 - July 18, 2007
+ * libpng version 1.2.19rc6 - August 15, 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.19beta27 - July 18, 2007: Glenn
+ *  libpng versions 0.97, January 1998, through 1.2.19rc6 - August 15, 2007: Glenn
  *  See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -150,7 +150,9 @@
  *    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-27          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]
  *
  *    Henceforth the source version will match the shared-library major
  *    and minor numbers; the shared-library major version number will be
@@ -180,7 +182,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.19beta27, July 18, 2007, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.19rc6, August 15, 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 +294,13 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    July 18, 2007
+ *    August 15, 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.19beta27 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.2.19rc6 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 +356,9 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.19beta27"
+#define PNG_LIBPNG_VER_STRING "1.2.19rc6"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.2.19beta27 - July 18, 2007\n"
+   " libpng version 1.2.19rc6 - August 15, 2007\n"
 
 #define PNG_LIBPNG_VER_SONUM   0
 #define PNG_LIBPNG_VER_DLLNUM  13
@@ -368,7 +370,7 @@
 /* This should match the numeric part of the final component of
  * PNG_LIBPNG_VER_STRING, omitting any leading zero: */
 
-#define PNG_LIBPNG_VER_BUILD  27
+#define PNG_LIBPNG_VER_BUILD  6
 
 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -385,7 +387,7 @@
 #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.
@@ -1407,7 +1409,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_19beta27;
+typedef png_structp version_1_2_19rc6;
 
 typedef png_struct FAR * FAR * png_structpp;
 
@@ -2495,10 +2497,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));
@@ -2824,9 +2822,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 */
 

pngconf.h

@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.2.19beta27 - July 18, 2007
+ * libpng version 1.2.19rc6 - August 15, 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)
@@ -744,40 +744,25 @@
 #    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
-#  endif
-#endif
-
 #  if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
-#      define PNG_MMX_CODE_SUPPORTED
-#    if defined(__GNUC__) && defined(__x86_64__) && !defined(PNG_NO_MMX_READ_FILTER_ROW) && \
-       ((__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR == 0))) && \
-       !defined(PNG_HAVE_MMX_READ_FILTER_ROW) 
-       /* work around 64-bit gcc compiler bugs in gcc-3.3, 3.4, 4.0.
-        * If you are using gcc-4.0 with -O2 or -O3 it may be safe to define
-        * PNG_HAVE_MMX_READ_FILTER_ROW manually */
-#      define PNG_NO_MMX_READ_FILTER_ROW
-#    endif
+#    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)
@@ -1300,7 +1285,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
@@ -1489,24 +1475,11 @@ 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
+#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
@@ -1515,25 +1488,35 @@ typedef z_stream FAR *  png_zstreamp;
 #  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
+#    if !(defined(__GNUC__) && defined(__x86_64__) && (__GNUC__ < 4))
+       /* work around 64-bit gcc compiler bugs in gcc-3.x */
+#      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 /* !((__x86_64__) && (GNUC < 4)) */
 #  endif
-#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
-#  ifndef PNG_NO_MMX_COMBINE_ROW
-#    define PNG_HAVE_MMX_COMBINE_ROW
+  /* 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_NO_MMX_READ_INTERLACE
-#    define PNG_HAVE_MMX_READ_INTERLACE
+#  ifndef PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT
+#    define PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT  9    /*  >=  */   
 #  endif
-#  ifndef PNG_NO_MMX_READ_FILTER
-#    define PNG_HAVE_MMX_READ_FILTER_ROW
-#  endif
-#endif
-/* - see pnggccrd.c for info about what is currently enabled */
+#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 */

pngerror.c

@@ -1,7 +1,7 @@
 
 /* pngerror.c - stub functions for i/o and memory allocation
  *
- * Last changed in libpng 1.2.19 July 18, 2007
+ * Last changed in libpng 1.2.19 August 15, 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)

pnggccrd.c

@@ -1,9 +1,9 @@
 
 /* pnggccrd.c - mixed C/assembler version of utilities to read a PNG file
  *
- * For Intel x86 CPU (Pentium-MMX or later) and GNU C compiler.
+ * For Intel/AMD x86 or x86-64 CPU (Pentium-MMX or later) and GNU C compiler.
  *
- * Last changed in libpng 1.2.19 July 18, 2007
+ * Last changed in libpng 1.2.19 August 15, 2007
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998 Intel Corporation
  * Copyright (c) 1999-2002,2007 Greg Roelofs
@@ -23,6 +23,7 @@
  *
  *     http://www.ibiblio.org/gferg/ldp/GCC-Inline-Assembly-HOWTO.html
  *     http://sam.zoy.org/blog/2007-04-13-shlib-with-non-pic-code-have-inline-assembly-and-pic-mix-well
+ *     http://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html
  *     http://gcc.gnu.org/onlinedocs/gcc/Variable-Attributes.html
  *     http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
  *     AMD64 Architecture Programmer's Manual, volumes 1 and 5
@@ -170,7 +171,7 @@
  * 20000822:
  *  - ARGH, stupid png_read_filter_row_mmx_sub() segfault only happens with
  *     shared-library (-fPIC) version!  Code works just fine as part of static
- *     library.  Damn damn damn damn damn, should have tested that sooner.
+ *     library.  Should have tested that sooner.
  *     ebx is getting clobbered again (explicitly this time); need to save it
  *     on stack or rewrite asm code to avoid using it altogether.  Blargh!
  *
@@ -224,7 +225,7 @@
  *  - fixed buffer-overrun bug in png_combine_row() C code (non-MMX)
  *
  * 20010808:
- *  - added PNG_THREAD_UNSAFE_OK around code using global variables [GRP]
+ *  - added PNG_THREAD_UNSAFE_OK around code using global variables [GR-P]
  *
  * 20011124:
  *  - fixed missing save of Eflag in png_mmx_support() [Maxim Sobolev]
@@ -237,13 +238,13 @@
  *
  * 20040724:
  *  - more tinkering with clobber list at lines 4529 and 5033 to get it to
- *     compile with gcc 3.4 [GRP]
+ *     compile with gcc 3.4 [GR-P]
  *
  * 20040809:
- *  - added "rim" definitions for CONST4 and CONST6 [GRP]
+ *  - added "rim" definitions for CONST4 and CONST6 [GR-P]
  *
  * 20060303:
- *  - added "OS2" to list of systems that don't need leading underscores [GRP]
+ *  - added "OS2" to list of systems that don't need leading underscores [GR-P]
  *
  * 20060320:
  *  - made PIC-compliant [Christian Aichinger]
@@ -356,7 +357,7 @@
  * 20070618:
  *  - fixed misplaced PNG_THREAD_UNSAFE_OK endif (was missing LOAD_GOT_rbp/
  *     RESTORE_rbp in 32-bit thread-safe case)
- *  - changed all "ifdef *" to "if defined(*)" [GRP]
+ *  - changed all "ifdef *" to "if defined(*)" [GR-P]
  *
  * 20070619:
  *  - rearranged most bitdepth-related case statements to put most frequent
@@ -369,7 +370,7 @@
  *  - removed single libpng-1.2.x PNG_DEBUG dependency on 1.0.x png_struct
  *     member (row_buf_size)
  *  - rearranged pass-related if-blocks in png_do_read_interlace() to put most
- *     frequent cases (4, 5) at top [GRP suggestion]
+ *     frequent cases (4, 5) at top [GR-P suggestion]
  *
  * 20070624-29:
  *  - fixed 64-bit crash bug:  pointers -> rsi/rdi, not esi/edi (switched to
@@ -397,16 +398,25 @@
  *  - added check for (manual) PIC macro to fix OpenBSD crash bug
  *
  * 20070717:
- *  - Copy 6 bytes per pixel, not 4, and use stride of 6, not 4, in the
- *    second loop of interlace processing of 48-bit pixels (GR-P).
+ *  - fixed 48-bit png_combine_row() bug (was acting like 32-bit):  copy 6
+ *     bytes per pixel, not 4, and use stride of 6, not 4, in the second loop
+ *     of interlace processing of 48-bit pixels [GR-P]
+ *
+ * 20070722:
+ *  - fixed 64-bit png_uint_32 bug with MMXLength/FullLength temp vars
+ *
+ * [still broken:  tops of all row-filter blocks (input/output constraints);
+ *  shows up on 64-bit dynamic (-fPIC) version with -O2, especially if debug-
+ *  printfs enabled, but at right edge of odd-width images even if disabled]
  *
  *
  * STILL TO DO:
  *  - fix final thread-unsafe code using stack vars and pointer? (paeth top,
- *     default, bottom only; default, bottom already 5 reg constraints; could
+ *     default, bottom only:  default, bottom already 5 reg constraints; could
  *     replace bpp with pointer and group bpp/patemp/pbtemp/pctemp in array)
  *  - fix ebp/no-reg-constraint inefficiency (avg/paeth/sub top)
  *  - test png_do_read_interlace() 64-bit case (pixel_bytes == 8)
+ *  - write MMX code for 48-bit case (pixel_bytes == 6)
  *  - figure out what's up with 24-bit case (pixel_bytes == 3):
  *     why subtract 8 from width_mmx in the pass 4/5 case?  due to
  *     odd number of bytes? (only width_mmx case) (near line 2335)
@@ -427,15 +437,16 @@
 #define PNG_INTERNAL
 #include "png.h"
 
-#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_USE_PNGGCCRD)
 
-/* for some inexplicable reason, gcc x.x.x on OpenBSD (and elsewhere?) does
+/* for some inexplicable reason, gcc 3.3.5 on OpenBSD (and elsewhere?) does
  * *not* define __PIC__ when the -fPIC option is used, so we have to rely on
  * makefiles and whatnot to define the PIC macro explicitly */
 #if defined(PIC) && !defined(__PIC__)   // (this can/should move to pngconf.h)
 #  define __PIC__
 #endif
 
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_USE_PNGGCCRD)
+
 /* if you want/need full thread-safety on x86-64 even when linking statically,
  * comment out the "&& defined(__PIC__)" part here: */
 #if defined(__x86_64__) && defined(__PIC__)
@@ -662,13 +673,12 @@ static PNG_CONST ull _amask4_2_2  __attribute__((used, aligned(8))) = 0x00000000
 
 #if defined(PNG_HAVE_MMX_READ_FILTER_ROW) || defined(PNG_HAVE_MMX_COMBINE_ROW)
 
-// this block is specific to png_read_filter_row_mmx_paeth()
+// this block is specific to png_read_filter_row_mmx_paeth() except for
+// LOAD_GOT_rbp and RESTORE_rbp, which are also used in png_combine_row()
 #if defined(PNG_x86_64_USE_GOTPCREL)
-#  if defined(PNG_HAVE_MMX_READ_FILTER_ROW)
 #  define pa_TEMP                "%%r11d"
 #  define pb_TEMP                "%%r12d"
 #  define pc_TEMP                "%%r13d"
-#  endif
 #  if defined(PNG_CLOBBER_x86_64_REGS_SUPPORTED)  // works as of gcc 3.4.3 ...
 #    define SAVE_r11_r12_r13
 #    define RESTORE_r11_r12_r13
@@ -1893,12 +1903,12 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
                   "jnc       skip48           \n\t" // if CF = 0
                   "movl      (%3), %%eax      \n\t"
                   "movl      %%eax, (%4)      \n\t"
-                  "movw      4(%3), %%eax     \n\t"
-                  "movw      %%eax, 4(%4)     \n\t"
+                  "movw      4(%3), %%ax      \n\t" // GR-P bugfix 20070717
+                  "movw      %%ax, 4(%4)      \n\t" // GR-P bugfix 20070717
 
                 "skip48:                      \n\t"
-                  "add       $6, %3           \n\t"
-                  "add       $6, %4           \n\t"
+                  "add       $6, %3           \n\t" // GR-P bugfix 20070717
+                  "add       $6, %4           \n\t" // GR-P bugfix 20070717
                   "decl      %%ecx            \n\t"
                   "jnz       secondloop48     \n\t"
 
@@ -3125,10 +3135,8 @@ png_do_read_interlace(png_structp png_ptr)
                         if (dp < row || dp+3 > row+png_ptr->row_buf_size)
                         {
                            printf("dp out of bounds: row=%10p, dp=%10p, "
-                             "rp=%10p\n", row, dp,
-                              row+png_ptr->row_buf_size);
-                           printf("row_buf_size=%lu\n",
-                              png_ptr->row_buf_size);
+                             "rp=%10p\n", row, dp, row+png_ptr->row_buf_size);
+                           printf("row_buf_size=%lu\n", png_ptr->row_buf_size);
                         }
 #endif
                         png_memcpy(dp, v, BPP4);
@@ -3221,7 +3229,7 @@ png_do_read_interlace(png_structp png_ptr)
 
 
 #if defined(PNG_HAVE_MMX_READ_FILTER_ROW)
-#ifdef PNG_MMX_READ_FILTER_AVG_SUPPORTED
+#if defined(PNG_MMX_READ_FILTER_AVG_SUPPORTED)
 
 //===========================================================================//
 //                                                                           //
@@ -3235,7 +3243,7 @@ static void /* PRIVATE */
 png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row,
                             png_bytep prev_row)
 {
-   png_uint_32 FullLength, MMXLength;
+   unsigned FullLength, MMXLength;  // png_uint_32 is actually 64-bit on x86-64
    int bpp;
    int dummy_value_a;
    int dummy_value_c;   // fix 'forbidden register 2 (cx) was spilled' error
@@ -3248,14 +3256,15 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row,
    FullLength = row_info->rowbytes;         // number of bytes to filter
 
    __asm__ __volatile__ (
+   "avg_top:                       \n\t"
       SAVE_GOT_ebx
       SAVE_r15
       SAVE_ebp
       // initialize address pointers and offset
-//pre "movl row, %2                \n\t" // edi/rdi:  ptr to Avg(x)
+//pre "movl row, %5                \n\t" // edi/rdi:  ptr to Avg(x)
       "xorl %%ebx, %%ebx           \n\t" // ebx:  x
-//pre "movl prev_row, %1           \n\t" // esi/rsi:  ptr to Prior(x)
-      "mov  %2, " PDX "            \n\t" // copy of row ptr...
+//pre "movl prev_row, %4           \n\t" // esi/rsi:  ptr to Prior(x)
+      "mov  %5, " PDX "            \n\t" // copy of row ptr...
 //pre "subl bpp, " PDX "           \n\t" // (bpp is preloaded into ecx)
       "sub  " PCX "," PDX "        \n\t" // edx/rdx:  ptr to Raw(x-bpp)
 //pre "movl FullLength, %%eax      \n\t" // bring in via eax...
@@ -3265,24 +3274,24 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row,
       // Compute the Raw value for the first bpp bytes
       //    Raw(x) = Avg(x) + (Prior(x)/2)
    "avg_rlp:                       \n\t"
-      "movb (%1," PBX ",), %%al    \n\t" // load al with Prior(x)
+      "movb (%4," PBX ",), %%al    \n\t" // load al with Prior(x)
       "incl %%ebx                  \n\t"
       "shrb %%al                   \n\t" // divide by 2
-      "addb -1(%2," PBX ",), %%al  \n\t" // add Avg(x); -1 to offset inc ebx
+      "addb -1(%5," PBX ",), %%al  \n\t" // add Avg(x); -1 to offset inc ebx
 //pre "cmpl bpp, %%ebx             \n\t" // (bpp is preloaded into ecx)
       "cmpl %%ecx, %%ebx           \n\t"
-      "movb %%al, -1(%2," PBX ",)  \n\t" // write Raw(x); -1 to offset inc ebx
+      "movb %%al, -1(%5," PBX ",)  \n\t" // write Raw(x); -1 to offset inc ebx
       "jb avg_rlp                  \n\t" // mov does not affect flags
 
       // get # of bytes to alignment (32-bit mask _would_ be good enough
       // [computing delta], but 32-bit ops are zero-extended on 64-bit, argh)
       // (if swapped edx and ebp, could do 8-bit or 16-bit mask...FIXME?)
-      "mov  %2, " PBP "            \n\t" // take start of row
+      "mov  %5, " PBP "            \n\t" // take start of row
       "add  " PBX "," PBP "        \n\t" // add bpp
       "add  $0xf, " PBP "          \n\t" // add 7+8 to incr past alignment bdry
 //    "andl $0xfffffff8, %%ebp     \n\t" // mask to alignment boundary (32-bit!)
       CLEAR_BOTTOM_3_BITS  PBP    "\n\t" // mask to alignment boundary
-      "sub  %2, " PBP "            \n\t" // subtract row ptr again => ebp =
+      "sub  %5, " PBP "            \n\t" // subtract row ptr again => ebp =
       "jz avg_go                   \n\t" //  target value of ebx at alignment
 
       "xorl %%ecx, %%ecx           \n\t"
@@ -3292,14 +3301,14 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row,
       //    Raw(x) = Avg(x) + ((Raw(x-bpp) + Prior(x))/2)
    "avg_lp1:                       \n\t"
       "xorl %%eax, %%eax           \n\t"
-      "movb (%1," PBX ",), %%cl    \n\t" // load cl with Prior(x)
+      "movb (%4," PBX ",), %%cl    \n\t" // load cl with Prior(x)
       "movb (" PDX "," PBX ",), %%al \n\t" // load al with Raw(x-bpp)
       "addw %%cx, %%ax             \n\t"
       "incl %%ebx                  \n\t"
       "shrw %%ax                   \n\t" // divide by 2
-      "addb -1(%2," PBX ",), %%al  \n\t" // add Avg(x); -1 to offset inc ebx
+      "addb -1(%5," PBX ",), %%al  \n\t" // add Avg(x); -1 to offset inc ebx
       "cmpl %%ebp, %%ebx           \n\t" // check if at alignment boundary
-      "movb %%al, -1(%2," PBX ",)  \n\t" // write Raw(x); -1 to offset inc ebx
+      "movb %%al, -1(%5," PBX ",)  \n\t" // write Raw(x); -1 to offset inc ebx
       "jb avg_lp1                  \n\t" // repeat until at alignment boundary
 
    "avg_go:                        \n\t"
@@ -3314,15 +3323,32 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row,
       RESTORE_r15
       RESTORE_GOT_ebx
 
-      : "=c" (MMXLength),                // output regs
-        "=S" (dummy_value_S),
-        "=D" (dummy_value_D),
-        "=a" (diff)
+// "There is no way for you to specify that an input operand is modified
+// without also specifying it as an output operand."  [makes sense]
 
-      : "0" (bpp),         // ecx        // input regs
-        "1" (prev_row),    // esi/rsi
-        "2" (row),         // edi/rdi
-        "3" (FullLength)   // eax
+// "Unless an output operand has the `&' constraint modifier, GCC may
+// allocate it in the same register as an unrelated input operand, on the
+// assumption the inputs are consumed before the outputs are produced."
+// [trying to _force_ this]
+
+// "`='   Means that this operand is write-only for this instruction:
+//        the previous value is discarded and replaced by output data."
+//        [operand == variable name, presumably]
+
+      // output regs
+      // these are operands 0-1 (originally 0-3):
+      : "=c" (MMXLength),      // %0 -> %0
+        "=a" (diff)            // %3 -> %1
+//      "=S" (dummy_value_S),  // %1 -> GONE
+//      "=D" (dummy_value_D),  // %2 -> GONE
+
+      // input regs
+      // these are operands 2-5 (originally 4-7); two of their constraints say
+      // they must go in same places as operands 0-1 (originally 0-3) above:
+      : "0" (bpp),         // %4 -> %2 ecx
+        "1" (FullLength),  // %7 -> %3 eax
+        "S" (prev_row),    // %5 -> %4 esi/rsi
+        "D" (row)          // %6 -> %5 edi/rdi
 
       : "%edx"                           // clobber list
         _CLOBBER_r15
@@ -3962,13 +3988,14 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row,
    );
 
 } /* end png_read_filter_row_mmx_avg() */
+
 #endif /* PNG_MMX_READ_FILTER_AVG_SUPPORTED */
 
 
 
+#if defined(PNG_MMX_READ_FILTER_PAETH_SUPPORTED)
 #if defined(PNG_x86_64_USE_GOTPCREL) || defined(PNG_THREAD_UNSAFE_OK)
 
-#ifdef PNG_MMX_READ_FILTER_PAETH_SUPPORTED
 //===========================================================================//
 //                                                                           //
 //         P N G _ R E A D _ F I L T E R _ R O W _ M M X _ P A E T H         //
@@ -3981,7 +4008,7 @@ static void /* PRIVATE */
 png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row,
                               png_bytep prev_row)
 {
-   png_uint_32 FullLength, MMXLength;
+   unsigned FullLength, MMXLength;  // png_uint_32 is actually 64-bit on x86-64
    int bpp;
    int dummy_value_a;
    int dummy_value_c;   // fix 'forbidden register 2 (cx) was spilled' error
@@ -5075,14 +5102,15 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row,
    );
 
 } /* end png_read_filter_row_mmx_paeth() */
-#endif /* PNG_MMX_READ_FILTER_PAETH_SUPPORTED */
 
 #endif // PNG_x86_64_USE_GOTPCREL || PNG_THREAD_UNSAFE_OK
+#endif /* PNG_MMX_READ_FILTER_PAETH_SUPPORTED */
 
 
 
 
-#ifdef PNG_MMX_READ_FILTER_SUB_SUPPORTED
+#if defined(PNG_MMX_READ_FILTER_SUB_SUPPORTED)
+
 //===========================================================================//
 //                                                                           //
 //           P N G _ R E A D _ F I L T E R _ R O W _ M M X _ S U B           //
@@ -5094,7 +5122,7 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row,
 static void /* PRIVATE */
 png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row)
 {
-   png_uint_32 FullLength, MMXLength;
+   unsigned FullLength, MMXLength;  // png_uint_32 is actually 64-bit on x86-64
    int bpp;
    int dummy_value_a;
    int dummy_value_c;
@@ -5564,12 +5592,14 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row)
    );
 
 } // end of png_read_filter_row_mmx_sub()
+
 #endif /* PNG_MMX_READ_FILTER_SUB_SUPPORTED */
 
 
 
 
-#ifdef PNG_MMX_READ_FILTER_UP_SUPPORTED
+#if defined(PNG_MMX_READ_FILTER_UP_SUPPORTED)
+
 //===========================================================================//
 //                                                                           //
 //            P N G _ R E A D _ F I L T E R _ R O W _ M M X _ U P            //
@@ -5582,7 +5612,7 @@ static void /* PRIVATE */
 png_read_filter_row_mmx_up(png_row_infop row_info, png_bytep row,
                            png_bytep prev_row)
 {
-   png_uint_32 len;
+   unsigned len;        // png_uint_32 is actually 64-bit on x86-64
    int dummy_value_d;   // fix 'forbidden register 3 (dx) was spilled' error
    png_bytep dummy_value_S;
    png_bytep dummy_value_D;
@@ -5715,6 +5745,7 @@ png_read_filter_row_mmx_up(png_row_infop row_info, png_bytep row,
    );
 
 } // end of png_read_filter_row_mmx_up()
+
 #endif /* PNG_MMX_READ_FILTER_UP_SUPPORTED */
 
 
@@ -5726,7 +5757,6 @@ png_read_filter_row_mmx_up(png_row_infop row_info, png_bytep row,
 /*                                                                           */
 /*===========================================================================*/
 
-
 /* Optimized png_read_filter_row routines */
 
 void /* PRIVATE */
@@ -5763,8 +5793,9 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
 #else
            _mmx_supported
 #endif
+           ? "MMX" :
 #endif
-           ? "MMX" : "C");
+           "C");
          break;
 
       case 2:
@@ -5777,8 +5808,9 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
 #else
            _mmx_supported
 #endif
+           ? "MMX" :
 #endif
-           ? "MMX" : "C");
+           "C");
          break;
 
       case 3:
@@ -5791,8 +5823,9 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
 #else
            _mmx_supported
 #endif
+           ? "MMX" :
 #endif
-           ? "MMX" : "C");
+           "C");
          break;
 
       case 4:
@@ -5809,7 +5842,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
            ? "MMX" :
 #endif /* PNG_x86_64_USE_GOTPCREL || PNG_THREAD_UNSAFE_OK */
 #endif
-             "C");
+           "C");
          break;
 
       default:

pngpread.c

@@ -1,7 +1,7 @@
 
 /* pngpread.c - read a png file in push mode
  *
- * Last changed in libpng 1.2.19 July 18, 2007
+ * Last changed in libpng 1.2.19 August 15, 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)

pngread.c

@@ -1,7 +1,7 @@
 
 /* pngread.c - read a PNG file
  *
- * Last changed in libpng 1.2.19 July 18, 2007
+ * Last changed in libpng 1.2.19 August 15, 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)

pngrtran.c

@@ -1,7 +1,7 @@
 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * Last changed in libpng 1.2.19 July 18, 2007
+ * Last changed in libpng 1.2.19 August 15, 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);
+#if 0
+   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);
+#if 0
+   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;
+#if 0
+   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);
+#if 0
+   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;
+#if 0
+   png_ptr->flags &= !(PNG_FLAG_ROW_INIT);
+#endif
 }
 #endif
 
@@ -1257,6 +1272,13 @@ png_do_read_transformations(png_structp png_ptr)
       png_error(png_ptr, "NULL row buffer");
 #endif
    }
+#if 0
+   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 */
+      png_error(png_ptr, "Uninitialized row");
+#endif
 
 #if defined(PNG_READ_EXPAND_SUPPORTED)
    if (png_ptr->transformations & PNG_EXPAND)

pngrutil.c

@@ -1,7 +1,7 @@
 
 /* pngrutil.c - utilities to read a PNG file
  *
- * Last changed in libpng 1.2.19 July 18, 2007
+ * Last changed in libpng 1.2.19 August 15, 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)
 {
@@ -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;
 
@@ -3040,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",
@@ -4150,7 +4162,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
 

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);
    }

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_19beta27 your_png_h_is_not_version_1_2_19beta27;
+typedef version_1_2_19rc6 your_png_h_is_not_version_1_2_19rc6;

pngvcrd.c

@@ -3,7 +3,7 @@
  *
  * For Intel x86 CPU and Microsoft Visual C++ compiler
  *
- * Last changed in libpng 1.2.19 July 18, 2007
+ * Last changed in libpng 1.2.19 August 15, 2007
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2007 Glenn Randers-Pehrson
  * Copyright (c) 1998, Intel Corporation
@@ -22,6 +22,11 @@
  *
  * [runtime MMX configuration, GRR 20010102]
  *
+ * [Copy 6 bytes per pixel, not 4, and use stride of 6, not 4, in the
+ *  second loop of interlace processing of 48-bit pixels, GR-P 20070717]
+ *
+ * [move instances of uAll union into local, except for two constant
+ * instances, GR-P 20070805]
  */
 
 #define PNG_INTERNAL
@@ -32,7 +37,6 @@
 
 static int mmx_supported=2;
 
-
 int PNGAPI
 png_mmx_support(void)
 {
@@ -931,8 +935,8 @@ secondloop48:
                   mov        ax,[esi+4]       // These 2 lines added 20070717
                   mov        [ebx+4],ax       // Glenn R-P
 skip48:
-                  add        esi,6
-                  add        ebx,6
+                  add        esi,6            // Changed 4 to 6 on these 2
+                  add        ebx,6            // lines.  Glenn R-P 20070717
 
                   dec        ecx
                   jnz        secondloop48
@@ -1916,22 +1920,25 @@ loop4_pass0:
 #endif /* PNG_READ_INTERLACING_SUPPORTED */
 
 
-// These variables are utilized in the functions below.  They are declared
-// globally here to ensure alignment on 8-byte boundaries.
-
-union uAll {
-   __int64 use;
-   double  align;
-} LBCarryMask = {0x0101010101010101},
-  HBClearMask = {0x7f7f7f7f7f7f7f7f},
-  ActiveMask, ActiveMask2, ActiveMaskEnd, ShiftBpp, ShiftRem;
-
+// These global constants are declared
+// here to ensure alignment on 8-byte boundaries.
+  union uAll {
+     __int64 use;
+     double  double_align;
+     long long long_long_align;
+  } ;
+  static PNG_CONST union uAll LBCarryMask = {0x0101010101010101},
+                              HBClearMask = {0x7f7f7f7f7f7f7f7f};
 
 // Optimized code for PNG Average filter decoder
 void /* PRIVATE */
 png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row
                             , png_bytep prev_row)
 {
+  // These variables are declared
+  // here to ensure alignment on 8-byte boundaries.
+  union uAll ActiveMask, ShiftBpp, ShiftRem;
+
    int bpp;
    png_uint_32 FullLength;
    png_uint_32 MMXLength;
@@ -2365,6 +2372,10 @@ void /* PRIVATE */
 png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row,
                               png_bytep prev_row)
 {
+  // These variables are declared
+  // here to ensure alignment on 8-byte boundaries.
+  union uAll  ActiveMask, ActiveMask2, ActiveMaskEnd, ShiftBpp, ShiftRem;
+
    png_uint_32 FullLength;
    png_uint_32 MMXLength;
    //png_uint_32 len;
@@ -3260,6 +3271,10 @@ dpthend:
 void /* PRIVATE */
 png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row)
 {
+  // These variables are declared
+  // here to ensure alignment on 8-byte boundaries.
+  union uAll ActiveMask, ShiftBpp, ShiftRem;
+
    //int test;
    int bpp;
    png_uint_32 FullLength;

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)

pngwutil.c

@@ -1,7 +1,7 @@
 
 /* pngwutil.c - utilities to write a PNG file
  *
- * Last changed in libpng 1.2.19 July 18, 2007
+ * Last changed in libpng 1.2.19 August 15, 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)

scripts/CMakeLists.txt

@@ -1,3 +1,4 @@
+                                             
 project(PNG)
 
 # Copyright (C) 2007 Glenn Randers-Pehrson
@@ -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(MSVC)
+  option(PNG_TESTS  "Build pngtest" NO)
+else(MSVC)
+  option(PNG_TESTS  "Build pngtest" YES)
+endif(MSVC)
 option(PNG_NO_CONSOLE_IO "FIXME" YES)
 option(PNG_NO_STDIO      "FIXME" YES)
 option(PNG_DEBUG         "Build with debug output" YES)
@@ -175,14 +180,16 @@ 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.19beta27
+#    VERSION 0.${PNGLIB_RELEASE}.1.2.19rc6
      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(FILES png.h pngconf.h         DESTINATION include)
@@ -207,3 +214,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
+

scripts/libpng-config-head.in

@@ -8,7 +8,7 @@
 
 # Modeled after libxml-config.
 
-version=1.2.19beta27
+version=1.2.19rc6
 prefix=""
 libdir=""
 libs=""

scripts/libpng.pc-configure.in

@@ -5,6 +5,6 @@ includedir=@includedir@/libpng12
 
 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.2.19beta27
+Version: 1.2.19rc6
 Libs: -L${libdir} -lpng12
 Cflags: -I${includedir} @LIBPNG_NO_MMX@

scripts/libpng.pc.in

@@ -5,6 +5,6 @@ includedir=@includedir@/libpng12
 
 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.2.19beta27
+Version: 1.2.19rc6
 Libs: -L${libdir} -lpng12
 Cflags: -I${includedir}

scripts/makefile.32sunu

@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.64sunu

@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.aix

@@ -20,7 +20,7 @@ LN_SF = ln -f -s
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 prefix=/usr/local

scripts/makefile.beos

@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.cygwin

@@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng12
 PNGMAJ = 0
 CYGDLL = 12
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 SHAREDLIB=cygpng$(CYGDLL).dll

scripts/makefile.darwin

@@ -19,7 +19,7 @@ ZLIBINC=../zlib
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.dec

@@ -5,7 +5,7 @@
 
 # Library name:
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 

scripts/makefile.elf

@@ -12,7 +12,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.gcmmx

@@ -16,7 +16,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.hp64

@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.hpgcc

@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.hpux

@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.linux

@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.mingw

@@ -78,7 +78,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng12
 PNGMAJ = 0
 MINGDLL = 12
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 SHAREDLIB=libpng$(MINGDLL).dll

scripts/makefile.ne12bsd

@@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
 
 LIB=	png12
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.19beta27
+SHLIB_MINOR=	1.2.19rc6
 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

scripts/makefile.netbsd

@@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng
 
 LIB=	png
 SHLIB_MAJOR=	3
-SHLIB_MINOR=	1.2.19beta27
+SHLIB_MINOR=	1.2.19rc6
 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

scripts/makefile.nommx

@@ -7,7 +7,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.openbsd

@@ -8,7 +8,7 @@ LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat
 
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.19beta27
+SHLIB_MINOR=	1.2.19rc6
 
 LIB=	png
 SRCS=	png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \

scripts/makefile.sco

@@ -9,7 +9,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.sggcc

@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.sgi

@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.so9

@@ -8,7 +8,7 @@
 
 # Library name:
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 

scripts/makefile.solaris

@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.solaris-x86

@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.19beta27
+PNGMIN = 1.2.19rc6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/pngos2.def

@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------
 
-; Version 1.2.19beta27
+; Version 1.2.19rc6
 
 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"

scripts/pngw32.def

@@ -5,7 +5,7 @@
 LIBRARY
 
 EXPORTS
-;Version 1.2.19beta27
+;Version 1.2.19rc6
   png_build_grayscale_palette  @1
   png_check_sig        @2
   png_chunk_error      @3