Imported from libpng-1.0.6h.tar

ANNOUNCE

 
-Libpng 1.0.6g - April 24, 2000
+Libpng 1.0.6h - April 24, 2000
 
 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.
@@ -33,7 +33,7 @@ version 1.0.6f [April 14, 2000]
   Removed superfluous prototype for png_set_itxt from png.h
   Removed "else" from pngread.c, after png_error(), and changed "0" to "length".
   Changed several png_errors about malformed ancillary chunks to png_warnings.
-version 1.0.6g [April 24, 2000]
+version 1.0.6h [April 24, 2000]
   Added png_pass-* arrays to pnggccrd.c when PNG_USE_LOCAL_ARRAYS is defined.
   Relocated paragraph about png_set_background() in libpng.3/libpng.txt
     and other revisions (Matthias Benckmann)

CHANGES

@@ -696,6 +696,9 @@ version 1.0.6g [April 24, 2000]
   Relocated info_ptr->free_me, png_ptr->free_me, and other info_ptr and
     png_ptr members to restore binary compatibility with libpng-1.0.5
     (breaks compatibility with libpng-1.0.6).
+version 1.0.6h [April 24, 2000]
+  Changed shared library so-number pattern from 2.x.y.z to xy.z (this builds
+    libpng.so.10 & libpng.so.10.6h instead of libpng.so.2 & libpng.so.2.1.0.6h)
 
 Send comments/corrections/commendations to
 png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu

INSTALL

 
-Installing libpng version 1.0.6g - April 24, 2000
+Installing libpng version 1.0.6h - April 24, 2000
 
 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.6g" or "lpng106" and "zlib-1.1.3"
+might be called "libpng-1.0.6h" or "lpng106" and "zlib-1.1.3"
 or "zlib113") so that you have directories called "zlib" and "libpng".
 
 Your directory structure should look like this:
@@ -47,8 +47,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.6g)
- makefile.gcmmx    =>  Linux/ELF makefile (gcc, creates libpng.so.2.1.0.6g,
+ makefile.linux    =>  Linux/ELF makefile (gcc, creates libpng.so.2.1.0.6h)
+ makefile.gcmmx    =>  Linux/ELF makefile (gcc, creates libpng.so.2.1.0.6h,
                        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
@@ -59,9 +59,9 @@ include
  makefile.ibmc     =>  IBM C/C++ version 3.x for Win32 and OS/2 (static)
  libpng.icc        =>  Project file for IBM VisualAge/C++ version 4.0 or later
  makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
- makefile.sggcc    =>  Silicon Graphics (gcc, creates libpng.so.2.1.0.6g)
+ makefile.sggcc    =>  Silicon Graphics (gcc, creates libpng.so.2.1.0.6h)
  makefile.sunos    =>  Sun makefile
- makefile.solaris  =>  Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.6g)
+ makefile.solaris  =>  Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.6h)
  makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
  makefile.mips     =>  MIPS makefile
  makefile.acorn    =>  Acorn makefile

LICENSE

@@ -5,7 +5,7 @@ Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
 Copyright (c) 1996, 1997 Andreas Dilger
 (libpng versions 0.90, December 1996, through 0.96, May 1997)
 Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
-(libpng versions 0.97, January 1998, through 1.0.6g, April 24, 2000)
+(libpng versions 0.97, January 1998, through 1.0.6h, April 24, 2000)
 
 For the purposes of this copyright and license, "Contributing Authors"
 is defined as the following set of individuals:

README

-README for libpng 1.0.6g - April 24, 2000 (shared library 2.1)
+README for libpng 1.0.6h - April 24, 2000 (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.
@@ -172,9 +172,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.6g)
+                            (gcc, creates libpng.so.2.1.0.6h)
        makefile.gcmmx   =>  Linux/ELF makefile (gcc, creates
-                            libpng.so.2.1.0.6g, uses assembler code
+                            libpng.so.2.1.0.6h, 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
@@ -185,10 +185,10 @@ Files in this distribution:
        makefile.ibmc    =>  IBM C/C++ version 3.x for Win32 and OS/2 (static)
        libpng.icc       =>  Project file, IBM VisualAge/C++ 4.0 or later
        makefile.sgi     =>  Silicon Graphics IRIX (cc, creates static lib)
-       makefile.sggcc   =>  Silicon Graphics (gcc, creates libpng.so.2.1.0.6g)
+       makefile.sggcc   =>  Silicon Graphics (gcc, creates libpng.so.2.1.0.6h)
        makefile.sunos   =>  Sun makefile
        makefile.solaris =>  Solaris 2.X makefile
-                            (gcc, creates libpng.so.2.1.0.6g)
+                            (gcc, creates libpng.so.2.1.0.6h)
        makefile.sco     =>  For SCO OSr5  ELF and Unixware 7 with Native cc
        makefile.mips    =>  MIPS makefile
        makefile.acorn   =>  Acorn makefile

Y2KINFO

@@ -7,7 +7,7 @@
       an official declaration.
 
       This is your unofficial assurance that libpng from version 0.71 and
-      upward through 1.0.6g are Y2K compliant.  It is my belief that earlier
+      upward through 1.0.6h 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

 echo "
-  There is no \"configure\" script for Libpng-1.0.6g.  Instead, please
+  There is no \"configure\" script for Libpng-1.0.6h.  Instead, please
   copy the appropriate makefile for your system from the \"scripts\"
   directory.  Read the INSTALL file for more details.
 "

libpng.3

 .TH LIBPNG 3 "April 24, 2000"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.6g
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.6h
 .SH SYNOPSIS
 \fI\fB
 
@@ -725,7 +725,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.6g - April 24, 2000
+ libpng version 1.0.6h - April 24, 2000
  Updated and distributed by Glenn Randers-Pehrson
  <randeg@alum.rpi.edu>
  Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
@@ -3243,7 +3243,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.0.6g are Y2K compliant.  It is my belief that earlier
+upward through 1.0.6h 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
@@ -3384,7 +3384,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.0.6g - April 24, 2000:
+Libpng version 1.0.6h - April 24, 2000:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu).
 
@@ -3399,7 +3399,7 @@ Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
 Copyright (c) 1996, 1997 Andreas Dilger
 (libpng versions 0.89c, May 1996, through 0.96, May 1997)
 Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
-(libpng versions 0.97, January 1998, through 1.0.6g, April 24, 2000)
+(libpng versions 0.97, January 1998, through 1.0.6h, April 24, 2000)
 
 For the purposes of this copyright and license, "Contributing Authors"
 is defined as the following set of individuals:

libpng.txt

 libpng.txt - A description on how to use and modify libpng
 
- libpng version 1.0.6g - April 24, 2000
+ libpng version 1.0.6h - April 24, 2000
  Updated and distributed by Glenn Randers-Pehrson
  <randeg@alum.rpi.edu>
  Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
@@ -2518,7 +2518,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.0.6g are Y2K compliant.  It is my belief that earlier
+upward through 1.0.6h 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

libpngpf.3

 .TH LIBPNGPF 3 "April 24, 2000"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.6g
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.6h
 (private functions)
 .SH SYNOPSIS
 \fB#include <png.h>\fP

png.c

 
 /* png.c - location for general purpose libpng functions
  *
- * libpng version 1.0.6g - April 24, 2000
+ * libpng version 1.0.6h - April 24, 2000
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
@@ -14,14 +14,14 @@
 #include "png.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_0_6g Your_png_h_is_not_version_1_0_6g;
+typedef version_1_0_6h Your_png_h_is_not_version_1_0_6h;
 
 /* 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 */
-char png_libpng_ver[12] = "1.0.6g";
+char png_libpng_ver[12] = "1.0.6h";
 
 /* png_sig was changed to a function in version 1.0.5c */
 /* Place to hold the signature string for a PNG file. */
@@ -561,7 +561,7 @@ png_charp
 png_get_copyright(png_structp png_ptr)
 {
    if (png_ptr != NULL || png_ptr == NULL)  /* silence compiler warning */
-   return ("\n libpng version 1.0.6g - April 24, 2000\n\
+   return ("\n libpng version 1.0.6h - April 24, 2000\n\
    Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.\n\
    Copyright (c) 1996, 1997 Andreas Dilger\n\
    Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson\n");
@@ -579,8 +579,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("1.0.6g");
-   return("1.0.6g");
+      return("1.0.6h");
+   return("1.0.6h");
 }
 
 png_charp

png.h

 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.0.6g - April 24, 2000
+ * libpng version 1.0.6h - April 24, 2000
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
@@ -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.6g - April 24, 2000: Glenn
+ *  libpng versions 0.97, January 1998, through 1.0.6h - April 24, 2000: Glenn
  *  See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -44,20 +44,26 @@
  *    1.0.4a-f                 1.0.4a-f 10005  2.1.0.4a-f
  *    1.0.5 (+ 2 patches)      1.0.5    10005  2.1.0.5
  *    1.0.5a-d                 1.0.5a-d 10006  2.1.0.5a-d
- *    1.0.5e-r                 1.0.5e-r 10100  2.1.0.5e-r (not compatible)
- *    1.0.5s-v                 1.0.5s-v 10006  2.1.0.5s-v (compatible)
- *    1.0.6 (+ 3 patches)      1.0.6    10006  2.1.0.6
- *    1.0.6d-g                 1.0.6d-g 10007  2.1.0.6d-g
- *    1.0.7                    1.0.7    10007  2.1.0.7    (still compatible)
+ *    1.0.5e-r                 1.0.5e-r 10100  2.1.0.5e-r (not source compatible)
+ *    1.0.5s-v                 1.0.5s-v 10006  2.1.0.5s-v (not binary compatible)
+ *    1.0.6 (+ 3 patches)      1.0.6    10006  2.1.0.6    (still binary incompat)
+ *    1.0.6d-f                 1.0.6d-f 10007  2.1.0.6d-f (still binary incompat)
+ *    1.0.6g                   1.0.6g   10007  2.1.0.6g   (compatible with 1.0.5)
+ *    1.0.6h                   1.0.6h   10007  10.6h      (compatible with 1.0.5)
+ *    1.0.7                    1.0.7    10007  10.7       (still compatible)
  *
- *    Henceforth the source version will match the shared-library minor
- *    and patch numbers; the shared-library major version number will be
+ *    Henceforth the source version will match the shared-library major
+ *    and minor numbers; the shared-library major version number will be
  *    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.
  *
+ *    Binary incompatibility exists only when applications make direct access
+ *    to the info_ptr or png_ptr members through png.h, and the compiled
+ *    application is loaded with a different version of the library.
+ *
  * See libpng.txt or libpng.3 for more information.  The PNG specification
  * is available as RFC 2083 <ftp://ftp.uu.net/graphics/png/documents/>
  * and as a W3C Recommendation <http://www.w3.org/TR/REC.png.html>
@@ -73,7 +79,7 @@
  * Copyright (c) 1996, 1997 Andreas Dilger
  * (libpng versions 0.89c, June 1996, through 0.96, May 1997)
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
- * (libpng versions 0.97, January 1998, through 1.0.6g, April 24, 2000)
+ * (libpng versions 0.97, January 1998, through 1.0.6h, April 24, 2000)
  *
  * For the purposes of this copyright and license, "Contributing Authors"
  * is defined as the following set of individuals:
@@ -154,7 +160,7 @@
  *    an official declaration.
  *
  *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.0.6g are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.0.6h 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
@@ -232,7 +238,7 @@ extern "C" {
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.0.6g"
+#define PNG_LIBPNG_VER_STRING "1.0.6h"
 
 /* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
  * We must not include leading zeros.
@@ -1082,9 +1088,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.6g
+and png.h are both at * version 1.0.6h
  */
-typedef png_structp version_1_0_6g;
+typedef png_structp version_1_0_6h;
 
 typedef png_struct FAR * FAR * png_structpp;
 
@@ -2078,7 +2084,7 @@ extern PNG_EXPORT(png_charp,png_get_header_version) PNGARG((png_structp png_ptr)
 extern PNG_EXPORT(png_charp,png_get_libpng_ver) PNGARG((png_structp png_ptr));
 
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.0.6g - April 24, 2000 (header)\n"
+   " libpng version 1.0.6h - April 24, 2000 (header)\n"
 
 #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
 /* With these routines we avoid an integer divide, which will be slower on

pngasmrd.h

 /* pngasmrd.h - assembler version of utilities to read a PNG file
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1999, 2000 Glenn Randers-Pehrson
  *

pngconf.h

 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger

pngerror.c

 
 /* pngerror.c - stub functions for i/o and memory allocation
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger

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 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, Intel Corporation
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson

pngget.c

 
 /* pngget.c - retrieval of values from info struct
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger

pngmem.c

 
 /* pngmem.c - stub functions for memory allocation
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger

pngpread.c

 
 /* pngpread.c - read a png file in push mode
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger

pngread.c

 
 /* pngread.c - read a PNG file
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
@@ -641,7 +641,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.6g.
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.6h.
  */
 
 void
@@ -690,7 +690,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.6g.
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.6h.
  */
 void
 png_read_image(png_structp png_ptr, png_bytepp image)

pngrio.c

 
 /* pngrio.c - functions for data input
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger

pngrtran.c

 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger

pngrutil.c

 
 /* pngrutil.c - utilities to read a PNG file
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger

pngset.c

 
 /* pngset.c - storage of image information into info struct
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger

pngtest.c

 
 /* pngtest.c - a simple test program to test libpng
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
@@ -1345,4 +1345,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_6g your_png_h_is_not_version_1_0_6g;
+typedef version_1_0_6h your_png_h_is_not_version_1_0_6h;

pngtrans.c

 
 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger

pngvcrd.c

@@ -2,7 +2,7 @@
  *
  * For Intel x86 CPU and Microsoft Visual C++ compiler
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, Intel Corporation
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson

pngwio.c

 
 /* pngwio.c - functions for data output
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger

pngwrite.c

 
 /* pngwrite.c - general routines to write a PNG file
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger

pngwtran.c

 
 /* pngwtran.c - transforms the data in a row for PNG writers
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger

pngwutil.c

 
 /* pngwutil.c - utilities to write a PNG file
  *
- * libpng 1.0.6g - April 24, 2000
+ * libpng 1.0.6h - April 24, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger

scripts/makefile.beos

 # makefile for libpng on BeOS x86 ELF with gcc
 # modified from makefile.linux by Sander Stoks
 # Copyright (C) 1996, 1997 Andreas Dilger
-# Copyright (C) 1999 Greg Roelofs
+# Copyright (C) 1999, 2000 Greg Roelofs
 # For conditions of distribution and use, see copyright notice in png.h
 
+# read libpng.txt or png.h to see why PNGMAJ is 10.  You should not
+# have to change it.
+PNGMAJ = 10
+PNGMIN = 6h
+PNGVER = $(PNGMAJ).$(PNGMIN)
 CC=gcc
 
 # Where the zlib library and include files are located
@@ -28,11 +33,6 @@ LDFLAGS=-L. -Wl,-soname=libpng.so.$(PNGMAJ) -L$(ZLIBLIB) -lz -lm
 RANLIB=ranlib
 #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.6g
-PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # where make install puts libpng.a, libpng.so*, and png.h
 prefix=/usr/local

scripts/makefile.dec

@@ -11,10 +11,10 @@ prefix=/usr/local
 ZLIBLIB=../zlib
 ZLIBINC=../zlib
 
-# read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
+# read libpng.txt or png.h to see why PNGMAJ is 10.  You should not
 # have to change it.
-PNGMAJ = 2
-PNGMIN = 1.0.6g
+PNGMAJ = 10
+PNGMIN = 6h
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 CC=cc

scripts/makefile.gcmmx

@@ -31,10 +31,10 @@ LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
 RANLIB=ranlib
 #RANLIB=echo
 
-# read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
+# read libpng.txt or png.h to see why PNGMAJ is 10.  You should not
 # have to change it.
-PNGMAJ = 2
-PNGMIN = 1.0.6g
+PNGMAJ = 10
+PNGMIN = 6h
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include

scripts/makefile.linux

 # makefile for libpng on Linux ELF with gcc
 # Copyright (C) 1996, 1997 Andreas Dilger
-# Copyright (C) 1998, 1999 Greg Roelofs
+# Copyright (C) 1998-2000, Greg Roelofs
 # For conditions of distribution and use, see copyright notice in png.h
 
 CC=gcc
@@ -31,10 +31,10 @@ LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
 RANLIB=ranlib
 #RANLIB=echo
 
-# read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
+# read libpng.txt or png.h to see why PNGMAJ is 10.  You should not
 # have to change it.
-PNGMAJ = 2
-PNGMIN = 1.0.6g
+PNGMAJ = 10
+PNGMIN = 6h
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include

scripts/makefile.sco

@@ -2,7 +2,7 @@
 # Contributed by Mike Hopkirk (hops@sco.com) modified from Makefile.lnx
 #   force ELF build dynamic linking, SONAME setting in lib and RPATH in app
 # Copyright (C) 1996, 1997 Andreas Dilger
-# Copyright (C) 1998 Greg Roelofs
+# Copyright (C) 1998, 2000 Greg Roelofs
 # For conditions of distribution and use, see copyright notice in png.h
 
 CC=cc
@@ -22,10 +22,10 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 #RANLIB=ranlib
 RANLIB=echo
 
-# read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
+# read libpng.txt or png.h to see why PNGMAJ is 10.  You should not
 # have to change it.
-PNGMAJ = 2
-PNGMIN = 1.0.6g
+PNGMAJ = 10
+PNGMIN = 6h
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include

scripts/makefile.sggcc

@@ -19,8 +19,8 @@ CFLAGS=-I$(ZLIBINC) -O2 $(WARNMORE) -fPIC -mabi=n32 # -g -DPNG_DEBUG=5
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 LDSHARED=gcc -shared
 
-VER=1.0.6g
-LIBS=libpng.so.1.0.6g
+VER=1.0.6h
+LIBS=libpng.so.1.0.6h
 SHAREDLIB=libpng.so
 libdir=$(prefix)/lib32
 

scripts/makefile.solaris

 # makefile for libpng on Solaris 2.x with gcc
 # Contributed by William L. Sebok, based on makefile.linux
 # Copyright (C) 1996, 1997 Andreas Dilger
-# Copyright (C) 1998 Greg Roelofs
+# Copyright (C) 1998, 2000 Greg Roelofs
 # For conditions of distribution and use, see copyright notice in png.h
 
 CC=gcc
@@ -28,10 +28,10 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng -lz -lm
 #RANLIB=ranlib
 RANLIB=echo
 
-# read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
+# read libpng.txt or png.h to see why PNGMAJ is 10.  You should not
 # have to change it.
-PNGMAJ = 2
-PNGMIN = 1.0.6g
+PNGMAJ = 10
+PNGMIN = 6h
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include

scripts/pngdef.pas

@@ -3,7 +3,7 @@ unit pngdef;
 interface
 
 const
-  PNG_LIBPNG_VER_STRING = '1.0.6g';
+  PNG_LIBPNG_VER_STRING = '1.0.6h';
   PNG_LIBPNG_VER        =  10007;
 
 type