Imported from libpng-1.2.2beta6.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index be93ee4..6241e5a 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.2.2beta5 - March 26, 2002
+Libpng 1.2.2beta6 - March 31, 2002
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.
@@ -44,6 +44,11 @@
Changed "()" to "{}" in pkgconfig/libpngNN.pc.
Revised makefiles to put png.h and pngconf.h only in $prefix/include/libpngNN
Revised makefiles to make symlink to libpng.so.NN in addition to libpngNN.so
+version 1.2.2beta6 [March 31, 2002]
+ Prevent png_zalloc() from trying to memset memory that it failed to acquire.
+ Add typecasts of PNG_MAX_UINT in pngset_cHRM_fixed() (Matt Holgate).
+ Ensure that the right function (user or default) is used to free the
+ png_struct after an error in png_create_read_struct_2().
Send comments/corrections/commendations to
png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
diff --git a/CHANGES b/CHANGES
index 3baa2e1..4efd53c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1054,6 +1054,11 @@
Changed "()" to "{}" in scripts/libpng.pc.in.
Revised makefiles to put png.h and pngconf.h only in $prefix/include/libpngNN
Revised makefiles to make symlink to libpng.so.NN in addition to libpngNN.so
+version 1.2.2beta6 [March 31, 2002]
+ Prevent png_zalloc() from trying to memset memory that it failed to acquire.
+ Add typecasts of PNG_MAX_UINT in pngset_cHRM_fixed() (Matt Holgate).
+ Ensure that the right function (user or default) is used to free the
+ png_struct after an error in png_create_read_struct_2().
Send comments/corrections/commendations to
png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
diff --git a/INSTALL b/INSTALL
index 400f95d..3ae3732 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.2beta5 - March 26, 2002
+Installing libpng version 1.2.2beta6 - March 31, 2002
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.2.2beta5" or "lpng109" and "zlib-1.1.3"
+might be called "libpng-1.2.2beta6" 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 @@
include
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
- makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.2beta5)
- makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.2beta5,
+ makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.2beta6)
+ makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.2beta6,
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
@@ -84,10 +84,10 @@
makefile.netbsd => NetBSD/cc makefile, uses PNGGCCRD
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.2beta5)
+ makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.2beta6)
makefile.sunos => Sun makefile
- makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.2beta5)
- makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.2beta5)
+ makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.2beta6)
+ makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.2beta6)
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
diff --git a/KNOWNBUG b/KNOWNBUG
index 895fe0d..3f16b26 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.2.2beta5
+Known bugs in libpng version 1.2.2beta6
1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when
reading interlaced PNG files, when assembler code is enabled.
diff --git a/LICENSE b/LICENSE
index b7dced3..0a6c9cd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -8,7 +8,7 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.0.7, July 1, 2000, through 1.2.2beta5, March 26, 2002, are
+libpng versions 1.0.7, July 1, 2000, through 1.2.2beta6, March 31, 2002, are
Copyright (c) 2000-2002 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 @@
Glenn Randers-Pehrson
randeg@alum.rpi.edu
-March 26, 2002
+March 31, 2002
diff --git a/README b/README
index 897045b..4f3b31a 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng 1.2.2beta5 - March 26, 2002 (shared library 2.1)
+README for libpng 1.2.2beta6 - March 31, 2002 (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.
@@ -187,9 +187,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 libpng12.so.0.1.2.2beta5)
+ (gcc, creates libpng12.so.0.1.2.2beta6)
makefile.gcmmx => Linux/ELF makefile (gcc, creates
- libpng12.so.0.1.2.2beta5, uses assembler code
+ libpng12.so.0.1.2.2beta6, 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
@@ -208,12 +208,12 @@
makefile.netbsd => NetBSD/cc makefile, uses PNGGCCRD
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
- makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.2beta5)
+ makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.2beta6)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng12.so.0.1.2.2beta5)
+ (gcc, creates libpng12.so.0.1.2.2beta6)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng12.so.0.1.2.2beta5)
+ (gcc, creates libpng12.so.0.1.2.2beta6)
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
diff --git a/Y2KINFO b/Y2KINFO
index ed56582..e973383 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- March 26, 2002
+ March 31, 2002
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.2beta5 are Y2K compliant. It is my belief that earlier
+ upward through 1.2.2beta6 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 79c7718..8b5bcf8 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
echo "
- There is no \"configure\" script for Libpng-1.2.2beta5. Instead, please
+ There is no \"configure\" script for Libpng-1.2.2beta6. 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 75dd999..b6ae7a7 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "March 26, 2002"
+.TH LIBPNG 3 "March 31, 2002"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.2beta5
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.2beta6
.SH SYNOPSIS
\fI\fB
@@ -795,7 +795,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.2beta5 - March 26, 2002
+ libpng version 1.2.2beta6 - March 31, 2002
Updated and distributed by Glenn Randers-Pehrson
<randeg@alum.rpi.edu>
Copyright (c) 1998-2002 Glenn Randers-Pehrson
@@ -3643,13 +3643,13 @@
.SH IX. Y2K Compliance in libpng
-March 26, 2002
+March 31, 2002
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.2beta5 are Y2K compliant. It is my belief that earlier
+upward through 1.2.2beta6 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
@@ -3772,7 +3772,7 @@
1.2.1beta-4 3 10201 3.1.2.1beta1-4
1.2.1rc1-2 3 10201 3.1.2.1rc1-2
1.2.1 3 10201 3.1.2.1
- 1.2.2beta1-4 12 10202 12.so.0.1.2.2beta1-4
+ 1.2.2beta1-6 12 10202 12.so.0.1.2.2beta1-6
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3830,7 +3830,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.2beta5 - March 26, 2002:
+Libpng version 1.2.2beta6 - March 31, 2002:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu).
@@ -3847,7 +3847,7 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.0.7, July 1, 2000, through 1.2.2beta5, March 26, 2002, are
+libpng versions 1.0.7, July 1, 2000, through 1.2.2beta6, March 31, 2002, are
Copyright (c) 2000-2002 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
@@ -3939,7 +3939,7 @@
Glenn Randers-Pehrson
randeg@alum.rpi.edu
-March 26, 2002
+March 31, 2002
.\" end of man page
diff --git a/libpng.txt b/libpng.txt
index 915053e..bc6c3b3 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.2.2beta5 - March 26, 2002
+ libpng version 1.2.2beta6 - March 31, 2002
Updated and distributed by Glenn Randers-Pehrson
<randeg@alum.rpi.edu>
Copyright (c) 1998-2002 Glenn Randers-Pehrson
@@ -2848,13 +2848,13 @@
IX. Y2K Compliance in libpng
-March 26, 2002
+March 31, 2002
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.2beta5 are Y2K compliant. It is my belief that earlier
+upward through 1.2.2beta6 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 5afd81c..22ddde8 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "March 26, 2002"
+.TH LIBPNGPF 3 "March 31, 2002"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.2beta5
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.2beta6
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index a9a9e02..371d701 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "March 26, 2002"
+.TH PNG 5 "March 31, 2002"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 388452a..f00a7a7 100644
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
- * libpng version 1.2.2beta5 - March 26, 2002
+ * libpng version 1.2.2beta6 - March 31, 2002
* Copyright (c) 1998-2002 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_2_2beta5 Your_png_h_is_not_version_1_2_2beta5;
+typedef version_1_2_2beta6 Your_png_h_is_not_version_1_2_2beta6;
/* 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.2.2beta5";
+const char png_libpng_ver[18] = "1.2.2beta6";
/* png_sig was changed to a function in version 1.0.5c */
/* Place to hold the signature string for a PNG file. */
@@ -148,6 +148,9 @@
p->flags=save_flags;
#ifndef PNG_NO_ZALLOC_ZERO
+ if (ptr == NULL)
+ return ((voidpf)ptr);
+
if (num_bytes > (png_uint_32)0x8000L)
{
png_memset(ptr, 0, (png_size_t)0x8000L);
@@ -660,7 +663,7 @@
png_get_copyright(png_structp png_ptr)
{
if (png_ptr != NULL || png_ptr == NULL) /* silence compiler warning */
- return ((png_charp) "\n libpng version 1.2.2beta5 - March 26, 2002\n\
+ return ((png_charp) "\n libpng version 1.2.2beta6 - March 31, 2002\n\
Copyright (c) 1998-2002 Glenn Randers-Pehrson\n\
Copyright (c) 1996-1997 Andreas Dilger\n\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
@@ -678,8 +681,8 @@
{
/* Version of *.c files used when building libpng */
if(png_ptr != NULL) /* silence compiler warning about unused png_ptr */
- return((png_charp) "1.2.2beta5");
- return((png_charp) "1.2.2beta5");
+ return((png_charp) "1.2.2beta6");
+ return((png_charp) "1.2.2beta6");
}
png_charp PNGAPI
diff --git a/png.h b/png.h
index 8c5e555..38001a1 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.2beta5 - March 26, 2002
+ * libpng version 1.2.2beta6 - March 31, 2002
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -9,7 +9,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- * libpng versions 0.97, January 1998, through 1.2.2beta5 - March 26, 2002: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.2beta6 - March 31, 2002: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -81,7 +81,7 @@
* 1.2.1beta1-4 3 10201 3.1.2.1beta1-4
* 1.2.1rc1-2 3 10201 3.1.2.1rc1-2
* 1.2.1 3 10201 3.1.2.1
- * 1.2.2beta1-4 12 10202 12.so.0.1.2.2beta1-4
+ * 1.2.2beta1-6 12 10202 12.so.0.1.2.2beta1-6
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -111,7 +111,7 @@
* If you modify libpng you may insert additional notices immediately following
* this sentence.
*
- * libpng versions 1.0.7, July 1, 2000, through 1.2.2beta5, March 26, 2002, are
+ * libpng versions 1.0.7, July 1, 2000, through 1.2.2beta6, March 31, 2002, 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
@@ -216,13 +216,13 @@
* Y2K compliance in libpng:
* =========================
*
- * March 26, 2002
+ * March 31, 2002
*
* 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.2beta5 are Y2K compliant. It is my belief that earlier
+ * upward through 1.2.2beta6 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
@@ -278,7 +278,7 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.2beta5"
+#define PNG_LIBPNG_VER_STRING "1.2.2beta6"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM %DLLNUM%
@@ -290,7 +290,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 5
+#define PNG_LIBPNG_VER_BUILD 6
#define PNG_LIBPNG_BUILD_ALPHA 1
#define PNG_LIBPNG_BUILD_BETA 2
@@ -1258,9 +1258,9 @@
/* This prevents a compiler error in png.c if png.c and png.h are both at
- version 1.2.2beta5
+ version 1.2.2beta6
*/
-typedef png_structp version_1_2_2beta5;
+typedef png_structp version_1_2_2beta6;
typedef png_struct FAR * FAR * png_structpp;
@@ -2389,7 +2389,7 @@
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.2beta5 - March 26, 2002 (header)\n"
+ " libpng version 1.2.2beta6 - March 31, 2002 (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 dc52a69..39ad638 100644
--- a/pngasmrd.h
+++ b/pngasmrd.h
@@ -1,6 +1,6 @@
/* pngasmrd.h - assembler version of utilities to read a PNG file
*
- * libpng 1.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 2002 Glenn Randers-Pehrson
*
diff --git a/pngconf.h b/pngconf.h
index 3f634d8..755163f 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,6 +1,6 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng 1.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngerror.c b/pngerror.c
index 8d86508..f5882a0 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,7 +1,7 @@
/* pngerror.c - stub functions for i/o and memory allocation
*
- * libpng 1.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pnggccrd.c b/pnggccrd.c
index 93bab96..7c96f63 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 version 1.2.2beta5 - March 26, 2002
+ * libpng version 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* Copyright (c) 1998, Intel Corporation
diff --git a/pngget.c b/pngget.c
index 85341cb..f49c515 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
/* pngget.c - retrieval of values from info struct
*
- * libpng 1.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngmem.c b/pngmem.c
index 237e964..4987d88 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@
/* pngmem.c - stub functions for memory allocation
*
- * libpng 1.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngpread.c b/pngpread.c
index c538337..8493860 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode
*
- * libpng 1.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngread.c b/pngread.c
index 2800847..e5fc3f1 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
- * libpng 1.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -68,7 +68,13 @@
{
png_free(png_ptr, png_ptr->zbuf);
png_ptr->zbuf=NULL;
- png_destroy_struct(png_ptr);
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_destroy_struct_2((png_voidp)png_ptr,
+ (png_free_ptr)free_fn,
+ (png_voidp)mem_ptr);
+#else
+ png_destroy_struct((png_voidp)png_ptr);
+#endif
return (NULL);
}
#ifdef USE_FAR_KEYWORD
@@ -776,7 +782,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.2.2beta5
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.2beta6
*/
void PNGAPI
@@ -825,7 +831,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.2.2beta5
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.2beta6
*/
void PNGAPI
png_read_image(png_structp png_ptr, png_bytepp image)
diff --git a/pngrio.c b/pngrio.c
index 0c831f9..8bcb79a 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,7 +1,7 @@
/* pngrio.c - functions for data input
*
- * libpng 1.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrtran.c b/pngrtran.c
index abc132f..13863ad 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,7 +1,7 @@
/* pngrtran.c - transforms the data in a row for PNG readers
*
- * libpng 1.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrutil.c b/pngrutil.c
index 7085e3c..f2e6a6f 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
- * libpng 1.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngset.c b/pngset.c
index ece865b..1fe45c8 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
- * libpng 1.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -100,10 +100,10 @@
"Ignoring attempt to set negative chromaticity value");
return;
}
- if (white_x > PNG_MAX_UINT || white_y > PNG_MAX_UINT ||
- red_x > PNG_MAX_UINT || red_y > PNG_MAX_UINT ||
- green_x > PNG_MAX_UINT || green_y > PNG_MAX_UINT ||
- blue_x > PNG_MAX_UINT || blue_y > PNG_MAX_UINT)
+ if (white_x > (double) PNG_MAX_UINT || white_y > (double) PNG_MAX_UINT ||
+ red_x > (double) PNG_MAX_UINT || red_y > (double) PNG_MAX_UINT ||
+ green_x > (double) PNG_MAX_UINT || green_y > (double) PNG_MAX_UINT ||
+ blue_x > (double) PNG_MAX_UINT || blue_y > (double) PNG_MAX_UINT)
{
png_warning(png_ptr,
"Ignoring attempt to set chromaticity value exceeding 21474.83");
@@ -169,7 +169,7 @@
if (png_ptr == NULL || info_ptr == NULL)
return;
- if (int_gamma > PNG_MAX_UINT)
+ if (int_gamma > (png_fixed_point) PNG_MAX_UINT)
{
png_warning(png_ptr, "Limiting gamma to 21474.83");
gamma=PNG_MAX_UINT;
diff --git a/pngtest.c b/pngtest.c
index 5cdf9e8..bf36268 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1,7 +1,7 @@
/* pngtest.c - a simple test program to test libpng
*
- * libpng 1.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1512,4 +1512,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_2beta5 your_png_h_is_not_version_1_2_2beta5;
+typedef version_1_2_2beta6 your_png_h_is_not_version_1_2_2beta6;
diff --git a/pngtrans.c b/pngtrans.c
index 2f1a150..da6200d 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.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngvcrd.c b/pngvcrd.c
index 96270a8..c80c513 100644
--- a/pngvcrd.c
+++ b/pngvcrd.c
@@ -2,7 +2,7 @@
*
* For Intel x86 CPU and Microsoft Visual C++ compiler
*
- * libpng version 1.2.2beta5 - March 26, 2002
+ * libpng version 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* Copyright (c) 1998, Intel Corporation
diff --git a/pngwio.c b/pngwio.c
index 95b0df5..38b0563 100644
--- a/pngwio.c
+++ b/pngwio.c
@@ -1,7 +1,7 @@
/* pngwio.c - functions for data output
*
- * libpng 1.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwrite.c b/pngwrite.c
index 4216328..088fe7b 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file
*
- * libpng 1.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwtran.c b/pngwtran.c
index 2770df6..a70b740 100644
--- a/pngwtran.c
+++ b/pngwtran.c
@@ -1,7 +1,7 @@
/* pngwtran.c - transforms the data in a row for PNG writers
*
- * libpng 1.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwutil.c b/pngwutil.c
index 8104e85..3e871dd 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@
/* pngwutil.c - utilities to write a PNG file
*
- * libpng 1.2.2beta5 - March 26, 2002
+ * libpng 1.2.2beta6 - March 31, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/projects/msvc/README.txt b/projects/msvc/README.txt
index c791e1f..b413f6f 100644
--- a/projects/msvc/README.txt
+++ b/projects/msvc/README.txt
@@ -1,5 +1,5 @@
Microsoft Developer Studio Build File, Format Version 6.00 for
-libpng 1.2.2beta5 (March 26, 2002) and zlib
+libpng 1.2.2beta6 (March 31, 2002) and zlib
Copyright (C) 2000 Simon-Pierre Cadieux
For conditions of distribution and use, see copyright notice in png.h
diff --git a/projects/msvc/png32ms.def b/projects/msvc/png32ms.def
index f392b10..5677738 100644
--- a/projects/msvc/png32ms.def
+++ b/projects/msvc/png32ms.def
@@ -6,7 +6,7 @@
DESCRIPTION "PNG image compression library for Windows"
EXPORTS
-;Version 1.2.2beta5
+;Version 1.2.2beta6
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
diff --git a/projects/netware.txt b/projects/netware.txt
index 51c1976..f0819c2 100644
--- a/projects/netware.txt
+++ b/projects/netware.txt
@@ -1,6 +1,6 @@
A set of project files is available for Netware. Get
-libpng-1.2.2beta5-project-netware.zip from a libpng distribution
+libpng-1.2.2beta6-project-netware.zip from a libpng distribution
site such as http://libpng.sourceforge.net
Put the zip file in this directory (projects) and then run
-"unzip -a libpng-1.2.2beta5-project-netware.zip"
+"unzip -a libpng-1.2.2beta6-project-netware.zip"
diff --git a/projects/wince.txt b/projects/wince.txt
index 18021fb..5ebf608 100644
--- a/projects/wince.txt
+++ b/projects/wince.txt
@@ -1,6 +1,6 @@
A set of project files is available for WinCE. Get
-libpng-1.2.2beta5-project-wince.zip from a libpng distribution
+libpng-1.2.2beta6-project-wince.zip from a libpng distribution
site such as http://libpng.sourceforge.net
Put the zip file in this directory (projects) and then run
-"unzip -a libpng-1.2.2beta5-project-wince.zip"
+"unzip -a libpng-1.2.2beta6-project-wince.zip"
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 1edaeb1..e4e96fb 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -6,6 +6,6 @@
Name: libpng12
Description: Loads and saves PNG files
-Version: 1.2.2beta5
+Version: 1.2.2beta6
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}/libpng12
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index e50cbc1..6c068a6 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -33,7 +33,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 9a48040..f07bc49 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -33,7 +33,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index d5688fd..57cc44c 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -18,7 +18,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index d092bcc..15ffd49 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -14,7 +14,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
ALIGN=
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index d352511..417eb35 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -39,7 +39,7 @@
# have to change it.
PNGMAJ = 0
#PNGDLL = $12
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
PNGMIN_BASE = 1.2.2
PNGVER = $(PNGMAJ).$(PNGMIN)
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index f712893..beb3b22 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -25,7 +25,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 9ea5aa6..3da6737 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -17,7 +17,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 4e65335..5b9ba30 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -15,7 +15,7 @@
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=gcc
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index e08cb72..aeb2b10 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -35,7 +35,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 297357e..4823bb4 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -19,7 +19,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 3cd1e78..a614790 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -5,7 +5,7 @@
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=gcc
diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx
index 0bf5729..aa117d7 100644
--- a/scripts/makefile.macosx
+++ b/scripts/makefile.macosx
@@ -20,7 +20,7 @@
LDSHARED=cc -lz -dynamiclib -compatibility_version $(VER) -current_version $(VER)
PNGMAJ = 0
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
VER = $(PNGMAJ).$(PNGMIN)
LIBNAME=libpng12
SHAREDLIB_POSTFIX=dylib
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index f93f52b..61cc76a 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@
LIB=png
# Shared lib name should be png12.
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.2beta5
+SHLIB_MINOR= 1.2.2beta6
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
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index afab58b..07506de 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -25,7 +25,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index b06d67a..399549e 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -24,7 +24,7 @@
LDSHARED=CC $(ABI) -shared
PNGMAJ = 0
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
# See "man dso" for info about shared objects
LIBS=libpng12.so.$(PNGMAJ).$(PNGVER)
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index a60a132..a8c08b2 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -31,7 +31,7 @@
# See "man dso" for info about shared objects
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
RANLIB=echo
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 2db8e5c..a15cb2d 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -35,7 +35,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index bdb0831..f196190 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -32,7 +32,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
-PNGMIN = 1.2.2beta5
+PNGMIN = 1.2.2beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas
index 09fcfd5..776c6f6 100644
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -7,7 +7,7 @@
interface
const
- PNG_LIBPNG_VER_STRING = '1.2.2beta5';
+ PNG_LIBPNG_VER_STRING = '1.2.2beta6';
PNG_LIBPNG_VER = 10202;
type
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index ffca71a..3556016 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.2.2beta5
+; Version 1.2.2beta6
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
