Imported from libpng-1.0.6h.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 03ca582..fbf5b32 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-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 @@
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)
diff --git a/CHANGES b/CHANGES
index 752eb58..5075b8d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -696,6 +696,9 @@
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
diff --git a/INSTALL b/INSTALL
index 7ef00c3..ed6e16d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-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 @@
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 @@
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 @@
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
diff --git a/LICENSE b/LICENSE
index cd76479..777cd00 100644
--- a/LICENSE
+++ b/LICENSE
@@ -5,7 +5,7 @@
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:
diff --git a/README b/README
index abab501..5f69529 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-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 @@
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 @@
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
diff --git a/Y2KINFO b/Y2KINFO
index 2c5fe69..820a449 100644
--- 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.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
diff --git a/configure b/configure
index 0f55c5a..8d2d7e6 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
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.
"
diff --git a/libpng.3 b/libpng.3
index a462167..67bd0ff 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
.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 @@
.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 @@
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 @@
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) 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:
diff --git a/libpng.txt b/libpng.txt
index 7bd87c1..eb93969 100644
--- a/libpng.txt
+++ b/libpng.txt
@@ -1,6 +1,6 @@
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 @@
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
diff --git a/libpngpf.3 b/libpngpf.3
index c12e130..76d92ae 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
.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
diff --git a/png.c b/png.c
index d094068..b0671b3 100644
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@
/* 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_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 @@
{
/* 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
diff --git a/png.h b/png.h
index 4688938..fd527b6 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* 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 @@
*/
/* 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 @@
};
/* 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_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
diff --git a/pngasmrd.h b/pngasmrd.h
index 13eb609..db2d5f8 100644
--- a/pngasmrd.h
+++ b/pngasmrd.h
@@ -1,6 +1,6 @@
/* 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
*
diff --git a/pngconf.h b/pngconf.h
index 1a47219..ea8da81 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* 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
diff --git a/pngerror.c b/pngerror.c
index f2ded30..63853a1 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,7 +1,7 @@
/* 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
diff --git a/pnggccrd.c b/pnggccrd.c
index 41e8a03..76cec6b 100644
--- 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 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
diff --git a/pngget.c b/pngget.c
index 1aed10f..2dc5b44 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
/* 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
diff --git a/pngmem.c b/pngmem.c
index 05ed9cc..12a4fd8 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@
/* 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
diff --git a/pngpread.c b/pngpread.c
index 73a9581..a8eee72 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
/* 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
diff --git a/pngread.c b/pngread.c
index 98095b3..dac3d98 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
/* 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 @@
* 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 @@
* 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)
diff --git a/pngrio.c b/pngrio.c
index 182a217..cec81b7 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,7 +1,7 @@
/* 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
diff --git a/pngrtran.c b/pngrtran.c
index 0bea51e..bd60d1d 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,7 +1,7 @@
/* 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
diff --git a/pngrutil.c b/pngrutil.c
index 693e064..8e5cf7f 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
/* 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
diff --git a/pngset.c b/pngset.c
index 91d618d..2817b1f 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
/* 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
diff --git a/pngtest.c b/pngtest.c
index c903f7c..22435d4 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1,7 +1,7 @@
/* 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 @@
}
/* 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;
diff --git a/pngtrans.c b/pngtrans.c
index d79d758..95e1d05 100644
--- a/pngtrans.c
+++ b/pngtrans.c
@@ -1,7 +1,7 @@
/* 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
diff --git a/pngvcrd.c b/pngvcrd.c
index e721dd6..be72d58 100644
--- a/pngvcrd.c
+++ b/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
diff --git a/pngwio.c b/pngwio.c
index 6df4326..2edc761 100644
--- a/pngwio.c
+++ b/pngwio.c
@@ -1,7 +1,7 @@
/* 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
diff --git a/pngwrite.c b/pngwrite.c
index a8f8a56..c787c50 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
/* 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
diff --git a/pngwtran.c b/pngwtran.c
index 4e1b78a..1ff2090 100644
--- a/pngwtran.c
+++ b/pngwtran.c
@@ -1,7 +1,7 @@
/* 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
diff --git a/pngwutil.c b/pngwutil.c
index aab0b38..029e9e8 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@
/* 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
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index f05aa24..dc29ddf 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -1,9 +1,14 @@
# 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 @@
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
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 94af110..06a4e51 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -11,10 +11,10 @@
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
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index a268712..882f711 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -31,10 +31,10 @@
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
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 4d9aa9c..6a98648 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -1,6 +1,6 @@
# 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 @@
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
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 62cb0b0..794d6e7 100644
--- a/scripts/makefile.sco
+++ b/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 @@
#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
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index a685831..f251956 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -19,8 +19,8 @@
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
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 25b04c3..ad1e93b 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -1,7 +1,7 @@
# 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 @@
#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
diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas
index 112a435..b7af172 100644
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -3,7 +3,7 @@
interface
const
- PNG_LIBPNG_VER_STRING = '1.0.6g';
+ PNG_LIBPNG_VER_STRING = '1.0.6h';
PNG_LIBPNG_VER = 10007;
type
