Imported from libpng-1.0.10rc1.tar

e1644478 · Glenn Randers-Pehrson · 19095603 · e1644478 · e1644478 · e1644478
52 changed file
--- a/ANNOUNCE
+++ b/ANNOUNCE

-Libpng 1.0.10beta1 - March 14, 2001
+Libpng 1.0.10rc1 - March 23, 2001

 This is a public release of libpng, intended for use in production codes.

@@ -16,6 +16,8 @@ Changes since the last public release (1.0.9):
  Fixed memory leak in contrib/visupng/PngFile.c
  Fixed bugs in png_combine_row() in pnggccrd.c and pngvcrd.c (C version)
  Added warnings when retrieving or setting gamma=0.
+  Changed all instances of memcpy, strcpy, and strlen to png_memcpy, png_strcpy,
+    and png_strlen.

 Send comments/corrections/commendations to
 png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu

--- a/CHANGES
+++ b/CHANGES
@@ -906,6 +906,10 @@ version 1.0.10beta1 [March 14, 2001]
  Fixed bugs in png_combine_row() in pnggccrd.c and pngvcrd.c (C version)
  Added warnings when retrieving or setting gamma=0.
  Increased the first part of msg buffer from 16 to 18 in png_chunk_warning().
+version 1.0.10rc1 [March 23, 2001]
+  Changed all instances of memcpy, strcpy, and strlen to png_memcpy, png_strcpy,
+    and png_strlen.
+  Revised png_mmx_supported() function in pnggccrd.c to return proper value.

 Send comments/corrections/commendations to
 png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu

--- a/INSTALL
+++ b/INSTALL

-Installing libpng version 1.0.10beta1 - March 14, 2001
+Installing libpng version 1.0.10rc1 - March 23, 2001

 Before installing libpng, you must first install zlib.  zlib
 can usually be found wherever you got libpng.  zlib can be
@@ -10,7 +10,7 @@ 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.0.10beta1" or "lpng109" and "zlib-1.1.3"
+might be called "libpng-1.0.10rc1" or "lpng109" and "zlib-1.1.3"
 or "zlib113") so that you have directories called "zlib" and "libpng".

 Your directory structure should look like this:
@@ -59,8 +59,8 @@ The files that are presently available in the scripts directory
 include

 makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
- makefile.linux    =>  Linux/ELF makefile (gcc, creates libpng.so.2.1.0.10beta1)
- makefile.gcmmx    =>  Linux/ELF makefile (gcc, creates libpng.so.2.1.0.10beta1,
+ makefile.linux    =>  Linux/ELF makefile (gcc, creates libpng.so.2.1.0.10rc1)
+ makefile.gcmmx    =>  Linux/ELF makefile (gcc, creates libpng.so.2.1.0.10rc1,
                       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
@@ -76,9 +76,9 @@ include
 libpng.icc        =>  Project file for IBM VisualAge/C++ version 4.0 or later
 makefile.macosx   =>  MACOS X Makefile
 makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
- makefile.sggcc    =>  Silicon Graphics (gcc, creates libpng.so.2.1.0.10beta1)
+ makefile.sggcc    =>  Silicon Graphics (gcc, creates libpng.so.2.1.0.10rc1)
 makefile.sunos    =>  Sun makefile
- makefile.solaris  =>  Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.10beta1)
+ makefile.solaris  =>  Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.10rc1)
 makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
 makefile.mips     =>  MIPS makefile
 makefile.acorn    =>  Acorn makefile

--- a/KNOWNBUG
+++ b/KNOWNBUG

 Known bugs in libpng-1.0.10

-None as of March 14, 2001.
+None as of March 23, 2001.
--- a/LICENSE
+++ b/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.0.7, July 1, 2000, through 1.0.10beta1, March 14, 2001, are
+libpng versions 1.0.7, July 1, 2000, through 1.0.10rc1, March 23, 2001, are
 Copyright (c) 2000, 2001 Glenn Randers-Pehrson
 and are distributed according to the same disclaimer and license as libpng-1.0.6
 with the following individuals added to the list of Contributing Authors
@@ -99,4 +99,4 @@ certification mark of the Open Source Initiative.

 Glenn Randers-Pehrson
 randeg@alum.rpi.edu
-March 14, 2001
+March 23, 2001
--- a/README
+++ b/README
-README for libpng 1.0.10beta1 - March 14, 2001 (shared library 2.1)
+README for libpng 1.0.10rc1 - March 23, 2001 (shared library 2.1)
 See the note about version numbers near the top of png.h

 See INSTALL for instructions on how to install libpng.
@@ -182,9 +182,9 @@ Files in this distribution:
       descrip.mms      =>  VMS makefile for MMS or MMK
       makefile.std     =>  Generic UNIX makefile (cc, creates static libpng.a)
       makefile.linux   =>  Linux/ELF makefile
-                            (gcc, creates libpng.so.2.1.0.10beta1)
+                            (gcc, creates libpng.so.2.1.0.10rc1)
       makefile.gcmmx   =>  Linux/ELF makefile (gcc, creates
-                            libpng.so.2.1.0.10beta1, uses assembler code
+                            libpng.so.2.1.0.10rc1, 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
@@ -200,10 +200,10 @@ Files in this distribution:
       libpng.icc       =>  Project file, IBM VisualAge/C++ 4.0 or later
       makefile.macosx  =>  MACOS X Makefile
       makefile.sgi     =>  Silicon Graphics IRIX (cc, creates static lib)
-       makefile.sggcc   =>  Silicon Graphics (gcc, creates libpng.so.2.1.0.10beta1)
+       makefile.sggcc   =>  Silicon Graphics (gcc, creates libpng.so.2.1.0.10rc1)
       makefile.sunos   =>  Sun makefile
       makefile.solaris =>  Solaris 2.X makefile
-                            (gcc, creates libpng.so.2.1.0.10beta1)
+                            (gcc, creates libpng.so.2.1.0.10rc1)
       makefile.sco     =>  For SCO OSr5  ELF and Unixware 7 with Native cc
       makefile.mips    =>  MIPS makefile
       makefile.acorn   =>  Acorn makefile

--- a/Y2KINFO
+++ b/Y2KINFO
   Y2K compliance in libpng:
   =========================

-      March 14, 2001
+      March 23, 2001

      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.0.10beta1 are Y2K compliant.  It is my belief that earlier
+      upward through 1.0.10rc1 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/configure
+++ b/configure
 echo "
-  There is no \"configure\" script for Libpng-1.0.10beta1.  Instead, please
+  There is no \"configure\" script for Libpng-1.0.10rc1.  Instead, please
  copy the appropriate makefile for your system from the \"scripts\"
  directory.  Read the INSTALL file for more details.
 "

--- a/example.c
+++ b/example.c
@@ -494,7 +494,7 @@ row_callback(png_structp png_ptr, png_bytep new_row,
 * png_progressive_combine_row() passing in the row and the
 * old row.  You can call this function for NULL rows (it will
 * just return) and for non-interlaced images (it just does the
- * memcpy for you) if it will make the code easier.  Thus, you
+ * png_memcpy for you) if it will make the code easier.  Thus, you
 * can just do this for all cases:
 */


--- a/libpng.3
+++ b/libpng.3
-.TH LIBPNG 3 "March 14, 2001"
+.TH LIBPNG 3 "March 23, 2001"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.10beta1
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.10rc1
 .SH SYNOPSIS
 \fI\fB

@@ -747,7 +747,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.0.10beta1 - March 14, 2001
+ libpng version 1.0.10rc1 - March 23, 2001
 Updated and distributed by Glenn Randers-Pehrson
 <randeg@alum.rpi.edu>
 Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
@@ -3464,13 +3464,13 @@ application:

 .SH VIII. Y2K Compliance in libpng

-March 14, 2001
+March 23, 2001

 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.0.10beta1 are Y2K compliant.  It is my belief that earlier
+upward through 1.0.10rc1 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
@@ -3576,6 +3576,7 @@ the first widely used release:
 1.0.9beta7-10        1    10009  2.1.0.9beta7-10
 1.0.9rc2             1    10009  2.1.0.9rc2
 1.0.9                1    10009  2.1.0.9
+ 1.0.10beta1          1    10010  2.1.0.10beta1
 1.0.10rc1            1    10010  2.1.0.10rc1

 Henceforth the source version will match the shared-library minor
@@ -3584,7 +3585,9 @@ used for changes in backward compatibility, as it is intended.  The
 PNG_PNGLIB_VER macro, which is not used within libpng but is available
 for applications, is an unsigned integer of the form xyyzz corresponding
 to the source version x.y.z (leading zeros in y and z).  Beta versions
-are given the previous public release number plus a letter or two.
+were given the previous public release number plus a letter, until
+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)
@@ -3632,7 +3635,7 @@ possible without all of you.

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

-Libpng version 1.0.10beta1 - March 14, 2001:
+Libpng version 1.0.10rc1 - March 23, 2001:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu).

@@ -3649,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.0.7, July 1, 2000, through  1.0.10beta1, March 14, 2001, are
+libpng versions 1.0.7, July 1, 2000, through  1.0.10rc1, March 23, 2001, are
 Copyright (c) 2000-2001 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.0.6
 with the following individuals added to the list of Contributing Authors
@@ -3741,7 +3744,7 @@ certification mark of the Open Source Initiative.

 Glenn Randers-Pehrson
 randeg@alum.rpi.edu
-March 14, 2001
+March 23, 2001

 .\" end of man page

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

- libpng version 1.0.10beta1 - March 14, 2001
+ libpng version 1.0.10rc1 - March 23, 2001
 Updated and distributed by Glenn Randers-Pehrson
 <randeg@alum.rpi.edu>
 Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
@@ -2717,13 +2717,13 @@ application:

 VIII. Y2K Compliance in libpng

-March 14, 2001
+March 23, 2001

 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.0.10beta1 are Y2K compliant.  It is my belief that earlier
+upward through 1.0.10rc1 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.

 Libpng only has three year fields.  One is a 2-byte unsigned integer that

--- a/libpngpf.3
+++ b/libpngpf.3
-.TH LIBPNGPF 3 "March 14, 2001"
+.TH LIBPNGPF 3 "March 23, 2001"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.10beta1
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.10rc1
 (private functions)
 .SH SYNOPSIS
 \fB#include <png.h>\fP

--- a/png.5
+++ b/png.5
-.TH PNG 5 "March 14, 2001"
+.TH PNG 5 "March 23, 2001"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION

--- a/png.c
+++ b/png.c

 /* png.c - location for general purpose libpng functions
 *
- * libpng version 1.0.10beta1 - March 14, 2001
+ * libpng version 1.0.10rc1 - March 23, 2001
 * Copyright (c) 1998-2001 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.)
@@ -13,14 +13,14 @@
 #include "png.h"

 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_0_10beta1 Your_png_h_is_not_version_1_0_10beta1;
+typedef version_1_0_10rc1 Your_png_h_is_not_version_1_0_10rc1;

 /* Version information for C files.  This had better match the version
 * string defined in png.h.  */

 #ifdef PNG_USE_GLOBAL_ARRAYS
 /* png_libpng_ver was changed to a function in version 1.0.5c */
-const char png_libpng_ver[18] = "1.0.10beta1";
+const char png_libpng_ver[18] = "1.0.10rc1";

 /* png_sig was changed to a function in version 1.0.5c */
 /* Place to hold the signature string for a PNG file. */
@@ -626,7 +626,7 @@ png_charp PNGAPI
 png_get_copyright(png_structp png_ptr)
 {
   if (png_ptr != NULL || png_ptr == NULL)  /* silence compiler warning */
-   return ((png_charp) "\n libpng version 1.0.10beta1 - March 14, 2001\n\
+   return ((png_charp) "\n libpng version 1.0.10rc1 - March 23, 2001\n\
   Copyright (c) 1998-2001 Glenn Randers-Pehrson\n\
   Copyright (c) 1996, 1997 Andreas Dilger\n\
   Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.\n");
@@ -644,8 +644,8 @@ png_get_libpng_ver(png_structp png_ptr)
 {
   /* Version of *.c files used when building libpng */
   if(png_ptr != NULL) /* silence compiler warning about unused png_ptr */
-      return((png_charp) "1.0.10beta1");
-   return((png_charp) "1.0.10beta1");
+      return((png_charp) "1.0.10rc1");
+   return((png_charp) "1.0.10rc1");
 }

 png_charp PNGAPI

--- a/png.h
+++ b/png.h

 /* png.h - header file for PNG reference library
 *
- * libpng version 1.0.10beta1 - March 14, 2001
+ * libpng version 1.0.10rc1 - March 23, 2001
 * Copyright (c) 1998-2001 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.0.10beta1 - March 14, 2001: Glenn
+ *  libpng versions 0.97, January 1998, through 1.0.10rc1 - March 23, 2001: Glenn
 *  See also "Contributing Authors", below.
 *
 * Note about libpng version numbers:
@@ -65,6 +65,7 @@
 *    1.0.9rc2                 1    10009  2.1.0.9rc2
 *    1.0.9                    1    10009  2.1.0.9
 *    1.0.10beta1              1    10010  2.1.0.10beta1
+ *    1.0.10rc1                1    10010  2.1.0.10rc1
 *
 *    Henceforth the source version will match the shared-library major
 *    and minor numbers; the shared-library major version number will be
@@ -94,7 +95,7 @@
 * If you modify libpng you may insert additional notices immediately following
 * this sentence.
 *
- * libpng versions 1.0.7, July 1, 2000, through  1.0.10beta1, March 14, 2001, are
+ * libpng versions 1.0.7, July 1, 2000, through  1.0.10rc1, March 23, 2001, are
 * Copyright (c) 2000, 2001 Glenn Randers-Pehrson, and are
 * distributed according to the same disclaimer and license as libpng-1.0.6
 * with the following individuals added to the list of Contributing Authors
@@ -199,13 +200,13 @@
 * Y2K compliance in libpng:
 * =========================
 *
- *    March 14, 2001
+ *    March 23, 2001
 *
 *    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.0.10beta1 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.0.10rc1 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
@@ -261,7 +262,7 @@
 */

 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.0.10beta1"
+#define PNG_LIBPNG_VER_STRING "1.0.10rc1"

 #define PNG_LIBPNG_VER_SONUM   2
 #define PNG_LIBPNG_VER_DLLNUM  %DLLNUM%
@@ -281,7 +282,7 @@
 #define PNG_LIBPNG_BUILD_STABLE   4
 #define PNG_LIBPNG_BUILD_TYPEMASK 7
 #define PNG_LIBPNG_BUILD_PATCH    8 /* Can be OR'ed with STABLE only */
-#define PNG_LIBPNG_BUILD_TYPE 2
+#define PNG_LIBPNG_BUILD_TYPE 3

 /* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
 * We must not include leading zeros.
@@ -1182,9 +1183,9 @@ struct png_struct_def


 /* This prevents a compiler error in png_get_copyright() in png.c if png.c
-and png.h are both at * version 1.0.10beta1
+and png.h are both at * version 1.0.10rc1
 */
-typedef png_structp version_1_0_10beta1;
+typedef png_structp version_1_0_10rc1;

 typedef png_struct FAR * FAR * png_structpp;

@@ -2232,7 +2233,7 @@ extern PNG_EXPORT(int,png_mmx_support) PNGARG((void));
 /* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */

 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.0.10beta1 - March 14, 2001 (header)\n"
+   " libpng version 1.0.10rc1 - March 23, 2001 (header)\n"

 #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
 /* With these routines we avoid an integer divide, which will be slower on

--- a/pngasmrd.h
+++ b/pngasmrd.h
 /* pngasmrd.h - assembler version of utilities to read a PNG file
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 2001 Glenn Randers-Pehrson
 *

--- a/pngconf.h
+++ b/pngconf.h
 /* pngconf.h - machine configurable file for libpng
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

--- a/pngerror.c
+++ b/pngerror.c

 /* pngerror.c - stub functions for i/o and memory allocation
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

--- a/pnggccrd.c
+++ b/pnggccrd.c
@@ -6,7 +6,7 @@
 *     and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm
 *     for Intel's performance analysis of the MMX vs. non-MMX code.
 *
- * libpng version 1.0.10beta1 - March 14, 2001
+ * libpng version 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * Copyright (c) 1998, Intel Corporation
@@ -2531,7 +2531,7 @@ png_do_read_interlace(png_structp png_ptr)
            } // end of _mmx_supported ========================================

            else /* MMX not supported:  use modified C code - takes advantage
-                  *   of inlining of memcpy for a constant */
+                  *   of inlining of png_memcpy for a constant */
                 /* GRR 19991007:  does it?  or should pixel_bytes in each
                  *   block be replaced with immediate value (e.g., 1)? */
                 /* GRR 19991017:  replaced with constants in each case */
@@ -5148,18 +5148,16 @@ png_mmx_support(void)
        "jz .NOT_SUPPORTED    \n\t"  // non-zero = yes, MMX IS supported

        "movl $1, %%eax       \n\t"  // set return value to 1
-        "movl %%eax, _mmx_supported \n\t" // save in global static variable, too
-        "popl %%edx           \n\t"  // restore edx
-        "popl %%ecx           \n\t"  // restore ecx
-        "popl %%ebx           \n\t"  // restore ebx
-        "ret                  \n\t"  // DONE:  have MMX support
+        "jmp  .RETURN         \n\t"  // DONE:  have MMX support

    ".NOT_SUPPORTED:          \n\t"  // target label for jump instructions
        "movl $0, %%eax       \n\t"  // set return value to 0
-//      "movl %%eax, _mmx_supported \n\t" // save in global static variable, too
+    ".RETURN:          \n\t"  // target label for jump instructions
+        "movl %%eax, _mmx_supported \n\t" // save in global static variable, too
        "popl %%edx           \n\t"  // restore edx
        "popl %%ecx           \n\t"  // restore ecx
        "popl %%ebx           \n\t"  // restore ebx
+
 //      "ret                  \n\t"  // DONE:  no MMX support
                                     // (fall through to standard C "ret")

@@ -5172,10 +5170,11 @@ png_mmx_support(void)
 //      , "memory"   // if write to a variable gcc thought was in a reg
 //      , "cc"       // "condition codes" (flag bits)
    );
+#else     
+    _mmx_supported = 0;
 #endif /* PNG_MMX_CODE_SUPPORTED */

-    _mmx_supported = 0;
-    return 0;
+    return _mmx_supported;
 }

 #endif /* PNG_USE_PNGGCCRD */
--- a/pngget.c
+++ b/pngget.c

 /* pngget.c - retrieval of values from info struct
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

--- a/pngmem.c
+++ b/pngmem.c

 /* pngmem.c - stub functions for memory allocation
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

--- a/pngpread.c
+++ b/pngpread.c

 /* pngpread.c - read a png file in push mode
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -796,6 +796,19 @@ png_push_process_row(png_structp png_ptr)
                  png_read_push_finish_row(png_ptr);
               }
            }
+	    if (png_ptr->pass == 4 && png_ptr->height <= 4)
+	    {
+	        for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+                {
+                   png_push_have_row(png_ptr, NULL);
+                   png_read_push_finish_row(png_ptr);
+                }
+            }
+            if (png_ptr->pass == 6 && png_ptr->height <= 4)
+            {
+                png_push_have_row(png_ptr, NULL);
+                png_read_push_finish_row(png_ptr);
+            }
            break;
         }
         case 1:
@@ -1403,7 +1416,7 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 len
       }
 #endif

-       strcpy((png_charp)chunk.name, (png_charp)png_ptr->chunk_name);
+       png_strcpy((png_charp)chunk.name, (png_charp)png_ptr->chunk_name);
       chunk.data = (png_bytep)png_malloc(png_ptr, length);
       png_crc_read(png_ptr, chunk.data, length);
       chunk.size = length;

--- a/pngread.c
+++ b/pngread.c

 /* pngread.c - read a PNG file
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -715,7 +715,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
 * not called png_set_interlace_handling(), the display_row buffer will
 * be ignored, so pass NULL to it.
 *
- * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.10beta1
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.10rc1
 */

 void PNGAPI
@@ -764,7 +764,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row,
 * only call this function once.  If you desire to have an image for
 * each pass of a interlaced image, use png_read_rows() instead.
 *
- * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.10beta1
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.10rc1
 */
 void PNGAPI
 png_read_image(png_structp png_ptr, png_bytepp image)

--- a/pngrio.c
+++ b/pngrio.c

 /* pngrio.c - functions for data input
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

--- a/pngrtran.c
+++ b/pngrtran.c

 /* pngrtran.c - transforms the data in a row for PNG readers
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

--- a/pngrutil.c
+++ b/pngrutil.c

 /* pngrutil.c - utilities to read a PNG file
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -30,7 +30,7 @@ __inline double strtod(const char *nptr, char **endptr)
      MultiByteToWideChar(CP_ACP, 0, nptr, -1, str, len);
      result = wcstod(str, &end);
      len = WideCharToMultiByte(CP_ACP, 0, end, -1, NULL, 0, NULL, NULL);
-      *endptr = (char *)nptr + (strlen(nptr) - len + 1);
+      *endptr = (char *)nptr + (png_strlen(nptr) - len + 1);
      free(str);
   }
   return result;
@@ -1667,8 +1667,8 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
   }
 #else
 #ifdef PNG_FIXED_POINT_SUPPORTED
-   swidth = (png_charp)png_malloc(png_ptr, strlen(ep) + 1);
-   png_memcpy(swidth, ep, (png_size_t)strlen(ep));
+   swidth = (png_charp)png_malloc(png_ptr, png_strlen(ep) + 1);
+   png_memcpy(swidth, ep, (png_size_t)png_strlen(ep));
 #endif
 #endif

@@ -1685,8 +1685,8 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
   }
 #else
 #ifdef PNG_FIXED_POINT_SUPPORTED
-   sheight = (png_charp)png_malloc(png_ptr, strlen(ep) + 1);
-   png_memcpy(sheight, ep, (png_size_t)strlen(ep));
+   sheight = (png_charp)png_malloc(png_ptr, png_strlen(ep) + 1);
+   png_memcpy(sheight, ep, (png_size_t)png_strlen(ep));
 #endif
 #endif

@@ -2053,7 +2053,7 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
           length = (png_uint_32)65535L;
       }
 #endif
-       strcpy((png_charp)chunk.name, (png_charp)png_ptr->chunk_name);
+       png_strcpy((png_charp)chunk.name, (png_charp)png_ptr->chunk_name);
       chunk.data = (png_bytep)png_malloc(png_ptr, length);
       png_crc_read(png_ptr, chunk.data, length);
       chunk.size = length;

--- a/pngset.c
+++ b/pngset.c

 /* pngset.c - storage of image information into info struct
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -408,7 +408,7 @@ png_set_PLTE(png_structp png_ptr, png_infop info_ptr,
 #endif
   png_ptr->palette = (png_colorp)png_zalloc(png_ptr, (uInt)num_palette,
      sizeof (png_color));
-   memcpy(png_ptr->palette, palette, num_palette * sizeof (png_color));
+   png_memcpy(png_ptr->palette, palette, num_palette * sizeof (png_color));
   info_ptr->palette = png_ptr->palette;
   info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette;

@@ -532,7 +532,7 @@ png_set_iCCP(png_structp png_ptr, png_infop info_ptr,
      return;

   new_iccp_name = png_malloc(png_ptr, png_strlen(name)+1);
-   strcpy(new_iccp_name, name);
+   png_strcpy(new_iccp_name, name);
   new_iccp_profile = png_malloc(png_ptr, proflen);
   png_memcpy(new_iccp_profile, profile, (png_size_t)proflen);

@@ -736,7 +736,7 @@ png_set_tRNS(png_structp png_ptr, png_infop info_ptr,
       png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
 #endif
       png_ptr->trans = info_ptr->trans = png_malloc(png_ptr, num_trans);
-       memcpy(info_ptr->trans, trans, num_trans);
+       png_memcpy(info_ptr->trans, trans, num_trans);
 #ifdef PNG_FREE_ME_SUPPORTED
       info_ptr->free_me |= PNG_FREE_TRNS;
 #else

--- a/pngtest.c
+++ b/pngtest.c

 /* pngtest.c - a simple test program to test libpng
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -537,7 +537,7 @@ png_debug_free(png_structp png_ptr, png_voidp ptr)
               fprintf(STDERR, "Duplicate free of memory\n");
            /* We must free the list element too, but first kill
               the memory that is to be freed. */
-            memset(ptr, 0x55, pinfo->size);
+            png_memset(ptr, 0x55, pinfo->size);
            png_free_default(png_ptr, pinfo);
            pinfo=NULL;
            break;
@@ -1522,4 +1522,4 @@ main(int argc, char *argv[])
 }

 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_0_10beta1 your_png_h_is_not_version_1_0_10beta1;
+typedef version_1_0_10rc1 your_png_h_is_not_version_1_0_10rc1;
--- a/pngtrans.c
+++ b/pngtrans.c

 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -392,11 +392,12 @@ png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)
               sp += 8; dp += 6;
               for (i = 1; i < row_width; i++)
               {
-                  /* This could be (although memcpy is probably slower):
+                  /* This could be (although png_memcpy is probably slower):
                  png_memcpy(dp, sp, 6);
                  sp += 8;
                  dp += 6;
                  */
+
                  *dp++ = *sp++;
                  *dp++ = *sp++;
                  *dp++ = *sp++;
@@ -411,11 +412,12 @@ png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)
               /* This converts from XXRRGGBB or AARRGGBB to RRGGBB */
               for (i = 0; i < row_width; i++)
               {
-                  /* This could be (although memcpy is probably slower):
+                  /* This could be (although png_memcpy is probably slower):
                  png_memcpy(dp, sp, 6);
                  sp += 8;
                  dp += 6;
                  */
+
                  sp+=2;
                  *dp++ = *sp++;
                  *dp++ = *sp++;

--- a/pngvcrd.c
+++ b/pngvcrd.c
@@ -2,7 +2,7 @@
 *
 * For Intel x86 CPU and Microsoft Visual C++ compiler
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * Copyright (c) 1998, Intel Corporation
@@ -1777,7 +1777,7 @@ loop4_pass4:
            } /* end of mmx_supported */

            else /* MMX not supported:  use modified C code - takes advantage
-                  * of inlining of memcpy for a constant */
+                  * of inlining of png_memcpy for a constant */
            {
               if (pixel_bytes == 1)
               {

--- a/pngwio.c
+++ b/pngwio.c

 /* pngwio.c - functions for data output
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

--- a/pngwrite.c
+++ b/pngwrite.c

 /* pngwrite.c - general routines to write a PNG file
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

--- a/pngwtran.c
+++ b/pngwtran.c

 /* pngwtran.c - transforms the data in a row for PNG writers
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

--- a/pngwutil.c
+++ b/pngwutil.c

 /* pngwutil.c - utilities to write a PNG file
 *
- * libpng 1.0.10beta1 - March 14, 2001
+ * libpng 1.0.10rc1 - March 23, 2001
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2001 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1489,8 +1489,8 @@ png_write_sCAL(png_structp png_ptr, int unit, double width,double height)
   png_debug1(3, "sCAL total length = %d\n", total_len);
   png_write_chunk_start(png_ptr, (png_bytep)png_sCAL, (png_uint_32)total_len);
   png_write_chunk_data(png_ptr, (png_bytep)&unit, 1);
-   png_write_chunk_data(png_ptr, (png_bytep)wbuf, strlen(wbuf)+1);
-   png_write_chunk_data(png_ptr, (png_bytep)hbuf, strlen(hbuf));
+   png_write_chunk_data(png_ptr, (png_bytep)wbuf, png_strlen(wbuf)+1);
+   png_write_chunk_data(png_ptr, (png_bytep)hbuf, png_strlen(hbuf));

   png_write_chunk_end(png_ptr);
 }
@@ -1508,15 +1508,15 @@ png_write_sCAL_s(png_structp png_ptr, int unit, png_charp width,

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

-   strcpy(wbuf,(const char *)width);
-   strcpy(hbuf,(const char *)height);
+   png_strcpy(wbuf,(const char *)width);
+   png_strcpy(hbuf,(const char *)height);
   total_len = 1 + png_strlen(wbuf)+1 + png_strlen(hbuf);

   png_debug1(3, "sCAL total length = %d\n", total_len);
   png_write_chunk_start(png_ptr, (png_bytep)png_sCAL, (png_uint_32)total_len);
   png_write_chunk_data(png_ptr, (png_bytep)&unit, 1);
-   png_write_chunk_data(png_ptr, (png_bytep)wbuf, strlen(wbuf)+1);
-   png_write_chunk_data(png_ptr, (png_bytep)hbuf, strlen(hbuf));
+   png_write_chunk_data(png_ptr, (png_bytep)wbuf, png_strlen(wbuf)+1);
+   png_write_chunk_data(png_ptr, (png_bytep)hbuf, png_strlen(hbuf));

   png_write_chunk_end(png_ptr);
 }

--- a/projects/msvc/README.txt
+++ b/projects/msvc/README.txt
 Microsoft Developer Studio Build File, Format Version 6.00 for
-libpng 1.0.10beta1 (March 14, 2001) and zlib
+libpng 1.0.10rc1 (March 23, 2001) and zlib

 Copyright (C) 2000 Simon-Pierre Cadieux
 For conditions of distribution and use, see copyright notice in png.h

--- a/projects/msvc/png32ms.def
+++ b/projects/msvc/png32ms.def
@@ -6,7 +6,7 @@ LIBRARY
 DESCRIPTION "PNG image compression library for Windows"

 EXPORTS
-;Version 1.0.10beta1
+;Version 1.0.10rc1
  png_build_grayscale_palette  @1
  png_check_sig        @2
  png_chunk_error      @3

--- a/projects/wince/READMEE.WCE
+++ b/projects/wince/READMEE.WCE
@@ -8,9 +8,9 @@ libpng for WindowsCE Rel.1.0

 Introduction
 ============
-This is libpng 1.0.10beta1 ported to WindowsCE 2.0 and 2.11.
-libpng 1.0.10beta1 is a PNG reference library.
-See README, a document of original libpng 1.0.10beta1.
+This is libpng 1.0.10rc1 ported to WindowsCE 2.0 and 2.11.
+libpng 1.0.10rc1 is a PNG reference library.
+See README, a document of original libpng 1.0.10rc1.

 zlib for WindowsCE
 ==================
@@ -23,7 +23,7 @@ This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages
 arising from the use of this software.

-See README and LICENSE, documents of original libpng 1.0.10beta1, for conditions
+See README and LICENSE, documents of original libpng 1.0.10rc1, for conditions
 of use and distribution.

 Files

--- a/projects/wince/READMEJ.WCE
+++ b/projects/wince/READMEJ.WCE
@@ -24,7 +24,7 @@ libpng
 になったいかなる被害についても、作者、配布者、その他利用者以外の人物、
 団体に責任をとる義務はないものとします。

-その他、このソフトウェアの利用条件については、原版である libpng 1.0.10beta1に
+その他、このソフトウェアの利用条件については、原版である libpng 1.0.10rc1に
 準拠するものとします。詳しくは、付属の README,LICENSE をお読みください。

 収録内容

--- a/projects/wince/png32ce.def
+++ b/projects/wince/png32ce.def
@@ -5,7 +5,7 @@
 LIBRARY lpngce

 EXPORTS
-;Version 1.0.10beta1
+;Version 1.0.10rc1
  png_build_grayscale_palette  @1
  png_check_sig        @2
  png_chunk_error      @3

--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -18,7 +18,7 @@ RM = rm -f
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.10beta1
+PNGMIN = 1.0.10rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 prefix=/usr/local

--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -13,7 +13,7 @@ ZLIBINC=/usr/local/include
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.10beta1
+PNGMIN = 1.0.10rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 ALIGN=

--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -39,8 +39,8 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \
 # have to change it.
 PNGMAJ = 2
 #PNGDLL = $%DLLNUM% # msvc
-PNGDLL = 2 # cygwin 1.0.10beta1
-PNGMIN = 1.0.10beta1
+PNGDLL = 2 # cygwin 1.0.10rc1
+PNGMIN = 1.0.10rc1
 PNGMIN_BASE = 1.0.10
 PNGVER = $(PNGMAJ).$(PNGMIN)


--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -17,7 +17,7 @@ ZLIBINC=../zlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.10beta1
+PNGMIN = 1.0.10rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 CC=cc

--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -51,7 +51,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.10beta1
+PNGMIN = 1.0.10rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include

--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -34,7 +34,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.10beta1
+PNGMIN = 1.0.10rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include

--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -19,7 +19,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.10beta1
+PNGMIN = 1.0.10rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # where make install puts libpng.a and png.h

--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -34,7 +34,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.10beta1
+PNGMIN = 1.0.10rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include

--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -25,7 +25,7 @@ RANLIB=echo
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.10beta1
+PNGMIN = 1.0.10rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include

--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -19,8 +19,8 @@ CFLAGS=-I$(ZLIBINC) -O2 $(WARNMORE) -fPIC -mabi=n32
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 LDSHARED=gcc -shared

-VER=1.0.10beta1
-LIBS=libpng.so.1.0.10beta1
+VER=1.0.10rc1
+LIBS=libpng.so.1.0.10rc1
 SHAREDLIB=libpng.so
 libdir=$(prefix)/lib32


--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -25,7 +25,7 @@ CFLAGS=-I$(ZLIBINC) -O $(WARNMORE) -DPNG_USE_PNGGCCRD -DPNG_NO_ASSEMBLER_CODE
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 LDSHARED=cc -shared

-VER=1.0.10beta1
+VER=1.0.10rc1
 SONUM=2
 SHAREDLIB=libpng.so
 libdir=$(prefix)

--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -31,7 +31,7 @@ RANLIB=echo
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.10beta1
+PNGMIN = 1.0.10rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include

--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -5,7 +5,7 @@ unit pngdef;
 interface

 const
-  PNG_LIBPNG_VER_STRING = '1.0.10beta1';
+  PNG_LIBPNG_VER_STRING = '1.0.10rc1';
  PNG_LIBPNG_VER        =  10010;

 type