Imported from libpng-1.2.6rc4.tar

36d7bc75 · Glenn Randers-Pehrson · d029a75d · 36d7bc75 · 36d7bc75 · 36d7bc75
54 changed file
--- a/ANNOUNCE
+++ b/ANNOUNCE

-Libpng 1.2.6rc3 - August 10, 2004
+Libpng 1.2.6rc4 - August 10, 2004

 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.
@@ -115,6 +115,9 @@ version 1.2.6rc3 [August 10, 2004]
  Check handle_as_unknown status in pngpread.c, as in pngread.c previously.
  Restore "HANDLE_CHUNK_*" macros, but deprecated, for apps that use them.
  Added "rim" definitions for CONST4 and CONST6 in pnggccrd.c
+version 1.2.6rc4 [August 10, 2004]
+  Fixed mistake in pngtest.c introduced in 1.2.6rc2 (declaration of
+    "pinfo" was out of place).

 Send comments/corrections/commendations to
 png-implement@ccrc.wustl.edu or to glennrp@users.sourceforge.net

--- a/CHANGES
+++ b/CHANGES
@@ -1291,13 +1291,16 @@ version 1.2.6rc2 [August 7, 2004]
  Changed "HANDLE_CHUNK_*" to "PNG_HANDLE_CHUNK_*" (Cosmin)
  Added "-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)" to 15 *NIX makefiles.
  Added code to update the row_info->colortype in png_do_read_filler() (MSB).
-version 1.2.6rc3 [August 10, 2004]
+version 1.2.6rc3 [August 9, 2004]
  Eliminated use of "abs()" in testing cHRM and gAMA values, to avoid
    trouble with some 64-bit compilers.  Created PNG_OUT_OF_RANGE() macro.
  Revised documentation of png_set_keep_unknown_chunks().
  Check handle_as_unknown status in pngpread.c, as in pngread.c previously.
  Moved  "PNG_HANDLE_CHUNK_*" macros out of PNG_INTERNAL section of png.h
  Added "rim" definitions for CONST4 and CONST6 in pnggccrd.c
+version 1.2.6rc4 [August 10, 2004]
+  Fixed mistake in pngtest.c introduced in 1.2.6rc2 (declaration of
+    "pinfo" was out of place).

 Send comments/corrections/commendations to
 png-implement@ccrc.wustl.edu or to glennrp@users.sourceforge.net

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

-Installing libpng version 1.2.6rc3 - August 10, 2004
+Installing libpng version 1.2.6rc4 - August 10, 2004

 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.2.6rc3" or "lpng109" and "zlib-1.1.3"
+might be called "libpng-1.2.6rc4" 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:
@@ -64,8 +64,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 libpng12.so.0.1.2.6rc3)
- makefile.gcmmx    =>  Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.6rc3,
+ makefile.linux    =>  Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.6rc4)
+ makefile.gcmmx    =>  Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.6rc4,
                       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
@@ -85,10 +85,10 @@ include
 makefile.ne0bsd  =>  NetBSD/cc makefile, uses PNGGCCRD, makes libpng0.so
 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.6rc3)
+ makefile.sggcc    =>  Silicon Graphics (gcc, creates libpng12.so.0.1.2.6rc4)
 makefile.sunos    =>  Sun makefile
- makefile.solaris  =>  Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.6rc3)
- makefile.so9      =>  Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.6rc3)
+ makefile.solaris  =>  Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.6rc4)
+ makefile.so9      =>  Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.6rc4)
 makefile.32sunu   =>  Sun Ultra 32-bit makefile
 makefile.64sunu   =>  Sun Ultra 64-bit makefile
 makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc

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

-Known bugs in libpng version 1.2.6rc3
+Known bugs in libpng version 1.2.6rc4

 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when
   reading interlaced PNG files, when assembler code is enabled but running

--- a/README
+++ b/README
-README for libpng version 1.2.6rc3 - August 10, 2004 (shared library 12.0)
+README for libpng version 1.2.6rc4 - August 10, 2004 (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.

--- a/Y2KINFO
+++ b/Y2KINFO
@@ -7,7 +7,7 @@
      an official declaration.

      This is your unofficial assurance that libpng from version 0.71 and
-      upward through 1.2.6rc3 are Y2K compliant.  It is my belief that earlier
+      upward through 1.2.6rc4 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
 #!/bin/sh
 echo "
  There is no \"configure\" script in this distribution of
-  libpng-1.2.6rc3.
+  libpng-1.2.6rc4.

  Instead, please copy the appropriate makefile for your system from the
  \"scripts\" directory.  Read the INSTALL file for more details.

  Update, July 2004: you can get a "configure" based distribution
  from the libpng distribution sites.  Download the file
-  libpng-1.2.6rc3-config.tar.gz
+  libpng-1.2.6rc4-config.tar.gz
 "

--- a/libpng.3
+++ b/libpng.3
 .TH LIBPNG 3 "August 10, 2004"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6rc3
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6rc4
 .SH SYNOPSIS
 \fI\fB

@@ -773,7 +773,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.6rc3 - August 10, 2004
+ libpng version 1.2.6rc4 - August 10, 2004
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp@users.sourceforge.net>
 Copyright (c) 1998-2004 Glenn Randers-Pehrson
@@ -3663,7 +3663,7 @@ 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.6rc3 are Y2K compliant.  It is my belief that earlier
+upward through 1.2.6rc4 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
@@ -3862,7 +3862,7 @@ possible without all of you.

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

-Libpng version 1.2.6rc3 - August 10, 2004:
+Libpng version 1.2.6rc4 - August 10, 2004:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp@users.sourceforge.net).


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

- libpng version 1.2.6rc3 - August 10, 2004
+ libpng version 1.2.6rc4 - August 10, 2004
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp@users.sourceforge.net>
 Copyright (c) 1998-2004 Glenn Randers-Pehrson
@@ -2890,7 +2890,7 @@ 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.6rc3 are Y2K compliant.  It is my belief that earlier
+upward through 1.2.6rc4 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 "August 10, 2004"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6rc3
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6rc4
 (private functions)
 .SH SYNOPSIS
 \fB\fB#include <png.h>\fP\fP

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

 /* png.c - location for general purpose libpng functions
 *
- * libpng version 1.2.6rc3 - August 10, 2004
+ * libpng version 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 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_6rc3 Your_png_h_is_not_version_1_2_6rc3;
+typedef version_1_2_6rc4 Your_png_h_is_not_version_1_2_6rc4;

 /* Version information for C files.  This had better match the version
 * string defined in png.h.  */
@@ -678,7 +678,7 @@ png_charp PNGAPI
 png_get_copyright(png_structp png_ptr)
 {
   if (&png_ptr != NULL)  /* silence compiler warning about unused png_ptr */
-   return ((png_charp) "\n libpng version 1.2.6rc3 - August 10, 2004\n\
+   return ((png_charp) "\n libpng version 1.2.6rc4 - August 10, 2004\n\
   Copyright (c) 1998-2004 Glenn Randers-Pehrson\n\
   Copyright (c) 1996-1997 Andreas Dilger\n\
   Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");

--- a/png.h
+++ b/png.h
 /* png.h - header file for PNG reference library
 *
- * libpng version 1.2.6rc3 - August 10, 2004
+ * libpng version 1.2.6rc4 - August 10, 2004
 * Copyright (c) 1998-2004 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.)
@@ -8,7 +8,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.6rc3 - August 10, 2004: Glenn
+ *  libpng versions 0.97, January 1998, through 1.2.6rc4 - August 10, 2004: Glenn
 *  See also "Contributing Authors", below.
 *
 * Note about libpng version numbers:
@@ -248,7 +248,7 @@
 *    an official declaration.
 *
 *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.2.6rc3 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.2.6rc4 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
@@ -304,9 +304,9 @@
 */

 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.6rc3"
+#define PNG_LIBPNG_VER_STRING "1.2.6rc4"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.2.6rc3 - August 10, 2004 (header)\n"
+   " libpng version 1.2.6rc4 - August 10, 2004 (header)\n"

 #define PNG_LIBPNG_VER_SONUM   0
 #define PNG_LIBPNG_VER_DLLNUM  %DLLNUM%
@@ -318,7 +318,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  3
+#define PNG_LIBPNG_VER_BUILD  4

 #define PNG_LIBPNG_BUILD_ALPHA    1
 #define PNG_LIBPNG_BUILD_BETA     2
@@ -1310,7 +1310,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_6rc3;
+typedef png_structp version_1_2_6rc4;

 typedef png_struct FAR * FAR * png_structpp;


--- a/pngasmrd.h
+++ b/pngasmrd.h
 /* pngasmrd.h - assembler version of utilities to read a PNG file
 *
- * libpng 1.2.6rc3 - August 10, 2004
+ * libpng 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 2002-2004 Glenn Randers-Pehrson
 *

--- a/pngconf.h
+++ b/pngconf.h

 /* pngconf.h - machine configurable file for libpng
 *
- * libpng version 1.2.6rc3 - August 10, 2004
+ * libpng version 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 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 version 1.2.6rc3 - August 10, 2004
+ * libpng version 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 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.2.6rc3 - August 10, 2004
+ * libpng version 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 Glenn Randers-Pehrson
 * Copyright (c) 1998, Intel Corporation

--- a/pngget.c
+++ b/pngget.c

 /* pngget.c - retrieval of values from info struct
 *
- * libpng 1.2.6rc3 - August 10, 2004
+ * libpng 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 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 version 1.2.6rc3 - August 10, 2004
+ * libpng version 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 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 version 1.2.6rc3 - August 10, 2004
+ * libpng version 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

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

 /* pngread.c - read a PNG file
 *
- * libpng 1.2.6rc3 - August 10, 2004
+ * libpng 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -803,7 +803,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.2.6rc3
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.6rc4
 */

 void PNGAPI
@@ -853,7 +853,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.2.6rc3
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.6rc4
 */
 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.2.6rc3 - August 10, 2004
+ * libpng 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 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 version 1.2.6rc3 - August 10, 2004
+ * libpng version 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 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 version 1.2.6rc3 - August 10, 2004
+ * libpng version 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

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

 /* pngset.c - storage of image information into info struct
 *
- * libpng 1.2.6rc3 - August 10, 2004
+ * libpng 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

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

 /* pngtest.c - a simple test program to test libpng
 *
- * libpng 1.2.6rc3 - August 10, 2004
+ * libpng 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -511,8 +511,9 @@ png_debug_malloc(png_structp png_ptr, png_uint_32 size)
      buffer and once to get a new free list entry. */
   {
      /* Disable malloc_fn and free_fn */
+      memory_infop pinfo;
      png_set_mem_fn(png_ptr, NULL, NULL, NULL);
-      memory_infop pinfo = (memory_infop)png_malloc(png_ptr,
+      pinfo = (memory_infop)png_malloc(png_ptr,
         (png_uint_32)png_sizeof (*pinfo));
      pinfo->size = size;
      current_allocation += size;
@@ -1554,4 +1555,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_6rc3 your_png_h_is_not_version_1_2_6rc3;
+typedef version_1_2_6rc4 your_png_h_is_not_version_1_2_6rc4;
--- a/pngtrans.c
+++ b/pngtrans.c

 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
 *
- * libpng 1.2.6rc3 - August 10, 2004
+ * libpng 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

--- a/pngvcrd.c
+++ b/pngvcrd.c
@@ -2,7 +2,7 @@
 *
 * For Intel x86 CPU and Microsoft Visual C++ compiler
 *
- * libpng version 1.2.6rc3 - August 10, 2004
+ * libpng version 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 Glenn Randers-Pehrson
 * Copyright (c) 1998, Intel Corporation

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

 /* pngwio.c - functions for data output
 *
- * libpng 1.2.6rc3 - August 10, 2004
+ * libpng 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 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.2.6rc3 - August 10, 2004
+ * libpng 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 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 version 1.2.6rc3 - August 10, 2004
+ * libpng version 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 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 version 1.2.6rc3 - August 10, 2004
+ * libpng version 1.2.6rc4 - August 10, 2004
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2004 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@

 # Modeled after libxml-config.

-version=1.2.6rc3
+version=1.2.6rc4
 prefix=""
 libdir=""
 libs=""

--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -6,6 +6,6 @@ includedir=${exec_prefix}/include

 Name: libpng12
 Description: Loads and saves PNG files
-Version: 1.2.6rc3
+Version: 1.2.6rc4
 Libs: -L${libdir} -lpng12 -lz -lm
 Cflags: -I${includedir}/libpng12
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -33,7 +33,7 @@ RANLIB=echo

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6rc3
+PNGMIN = 1.2.6rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include

--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -33,7 +33,7 @@ RANLIB=echo

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6rc3
+PNGMIN = 1.2.6rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include

--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -18,7 +18,7 @@ RM = rm -f

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6rc3
+PNGMIN = 1.2.6rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)

 prefix=/usr/local

--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -12,7 +12,7 @@ ZLIBLIB=/usr/local/lib
 ZLIBINC=/usr/local/include

 PNGMAJ = 0
-PNGMIN = 1.2.6rc3
+PNGMIN = 1.2.6rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)

 ALIGN=

--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -79,7 +79,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng12
 PNGMAJ = 0
 CYGDLL = 12
-PNGMIN = 1.2.6rc3
+PNGMIN = 1.2.6rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)

 SHAREDLIB=cygpng$(CYGDLL).dll

--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -23,7 +23,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
 RANLIB=ranlib

 PNGMAJ = 0
-PNGMIN = 1.2.6rc3
+PNGMIN = 1.2.6rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12


--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -32,7 +32,7 @@ ZLIBLIB=../zlib
 ZLIBINC=../zlib

 PNGMAJ = 0
-PNGMIN = 1.2.6rc3
+PNGMIN = 1.2.6rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12


--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -15,7 +15,7 @@

 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6rc3
+PNGMIN = 1.2.6rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)

 CC=gcc

--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -41,7 +41,7 @@ RANLIB=ranlib
 #RANLIB=echo

 PNGMAJ = 0
-PNGMIN = 1.2.6rc3
+PNGMIN = 1.2.6rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12


--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -24,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 RANLIB=ranlib

 PNGMAJ = 0
-PNGMIN = 1.2.6rc3
+PNGMIN = 1.2.6rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12


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

 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6rc3
+PNGMIN = 1.2.6rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)

 CC=gcc

--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12

 LIB=	png12
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.6rc3
+SHLIB_MINOR=	1.2.6rc4
 SRCS=	pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 		pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 		pngwtran.c pngmem.c pngerror.c pngpread.c

--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng

 LIB=	png
 SHLIB_MAJOR=	3
-SHLIB_MINOR=	1.2.6rc3
+SHLIB_MINOR=	1.2.6rc4
 SRCS=	pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 		pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 		pngwtran.c pngmem.c pngerror.c pngpread.c

--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -7,7 +7,7 @@ LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat

 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.6rc3
+SHLIB_MINOR=	1.2.6rc4

 LIB=	png
 SRCS=	png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \

--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -24,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
 RANLIB=echo

 PNGMAJ = 0
-PNGMIN = 1.2.6rc3
+PNGMIN = 1.2.6rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12


--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -18,7 +18,7 @@ ZLIBINC=../zlib

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6rc3
+PNGMIN = 1.2.6rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 CC=gcc


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

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6rc3
+PNGMIN = 1.2.6rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Where make install puts libpng.a, libpng12.so, and libpng12/png.h

--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -34,7 +34,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
 RANLIB=echo

 PNGMAJ = 0
-PNGMIN = 1.2.6rc3
+PNGMIN = 1.2.6rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12


--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -30,7 +30,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
 RANLIB=echo

 PNGMAJ = 0
-PNGMIN = 1.2.6rc3
+PNGMIN = 1.2.6rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12


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

-; Version 1.2.6rc3
+; Version 1.2.6rc4

 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"

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

 EXPORTS
-;Version 1.2.6rc3
+;Version 1.2.6rc4
  png_build_grayscale_palette  @1
  png_check_sig        @2
  png_chunk_error      @3