Imported from libpng-1.2.1beta3.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 2910431..46c15d6 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,16 +1,23 @@
-Libpng 1.2.1beta2 - October 25, 2001
+Libpng 1.2.1beta3 - October 27, 2001
-This is a public release of libpng, intended for use in production codes.
+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.
Changes since the last public release (1.2.0):
+version 1.2.1beta1 [October 19, 2001]
Revised makefile.std in contrib/pngminus
Include background_1 in png_struct regardless of gamma support.
Revised makefile.netbsd and makefile.macosx, added makefile.darwin.
Revised example.c to provide more details about using row_callback().
+version 1.2.1beta2 [October 25, 2001]
Added type cast to each NULL appearing in a function call, except for
WINCE functions.
+ Added makefile.so9.
+version 1.2.1beta3 [October 27, 2001]
+ Removed type casts from all NULLs.
+ Simplified png_create_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 7e602d3..b82ec4b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -989,6 +989,10 @@
version 1.2.1beta2 [October 25, 2001]
Added type cast to each NULL appearing in a function call, except for
WINCE functions.
+ Added makefile.so9.
+version 1.2.1beta3 [October 27, 2001]
+ Removed type casts from all NULLs.
+ Simplified png_create_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 20fc953..9b1ab8f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.1beta2 - October 25, 2001
+Installing libpng version 1.2.1beta3 - October 27, 2001
Before installing libpng, you must first install zlib. zlib
can usually be found wherever you got libpng. zlib can be
@@ -10,7 +10,7 @@
version of zlib that's installed.
You can rename the directories that you downloaded (they
-might be called "libpng-1.2.1beta2" or "lpng109" and "zlib-1.1.3"
+might be called "libpng-1.2.1beta3" 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 libpng.so.2.1.2.1beta2)
- makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.2.1.2.1beta2,
+ makefile.linux => Linux/ELF makefile (gcc, creates libpng.so.2.1.2.1beta3)
+ makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.2.1.2.1beta3,
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
@@ -82,9 +82,9 @@
makefile.macosx => MACOS X Makefile
makefile.netbsd => NetBSD/cc makefile, uses PNGGCCRD
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
- makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.2.1beta2)
+ makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.2.1beta3)
makefile.sunos => Sun makefile
- makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.2.1beta2)
+ makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.2.1beta3)
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 c7702a3..cb2483d 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.1beta2, October 25, 2001, are
+libpng versions 1.0.7, July 1, 2000, through 1.2.1beta3, October 27, 2001, are
Copyright (c) 2000 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
-October 25, 2001
+October 27, 2001
diff --git a/README b/README
index 50f67e9..71203de 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng 1.2.1beta2 - October 25, 2001 (shared library 2.1)
+README for libpng 1.2.1beta3 - October 27, 2001 (shared library 2.1)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@@ -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 libpng.so.2.1.2.1beta2)
+ (gcc, creates libpng.so.2.1.2.1beta3)
makefile.gcmmx => Linux/ELF makefile (gcc, creates
- libpng.so.2.1.2.1beta2, uses assembler code
+ libpng.so.2.1.2.1beta3, 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
@@ -206,10 +206,10 @@
makefile.macosx => MACOS X Makefile
makefile.netbsd => NetBSD/cc makefile, uses PNGGCCRD
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
- makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.2.1beta2)
+ makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.2.1beta3)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng.so.2.1.2.1beta2)
+ (gcc, creates libpng.so.2.1.2.1beta3)
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 191d979..dfa724f 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- October 25, 2001
+ October 27, 2001
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
- upward through 1.2.1beta2 are Y2K compliant. It is my belief that earlier
+ upward through 1.2.1beta3 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 7ba4647..33f4596 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
echo "
- There is no \"configure\" script for Libpng-1.2.1beta2. Instead, please
+ There is no \"configure\" script for Libpng-1.2.1beta3. Instead, please
copy the appropriate makefile for your system from the \"scripts\"
directory. Read the INSTALL file for more details.
"
diff --git a/example.c b/example.c
index b41250c..a72bedc 100644
--- a/example.c
+++ b/example.c
@@ -114,7 +114,7 @@
if (info_ptr == NULL)
{
fclose(fp);
- png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
+ png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
return (ERROR);
}
@@ -126,7 +126,7 @@
if (setjmp(png_jmpbuf(png_ptr)))
{
/* Free all of the memory associated with the png_ptr and info_ptr */
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
fclose(fp);
/* If we get here, we had a problem reading the file */
return (ERROR);
@@ -157,7 +157,7 @@
* adjustment), then you can read the entire image (including
* pixels) into the info structure with this call:
*/
- png_read_png(png_ptr, info_ptr, png_transforms, (png_voidp)NULL);
+ png_read_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL);
#else
/* OK, you're doing it the hard way, with the lower-level functions */
@@ -167,7 +167,7 @@
png_read_info(png_ptr, info_ptr);
png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
- &interlace_type, (int *)NULL, (int *)NULL);
+ &interlace_type, int_p_NULL, int_p_NULL);
/**** Set up the data transformations you want. Note that these are all
**** optional. Only call them if you want/need them. Many of the
@@ -277,7 +277,7 @@
png_color std_color_cube[MAX_SCREEN_COLORS];
png_set_dither(png_ptr, std_color_cube, MAX_SCREEN_COLORS,
- MAX_SCREEN_COLORS, (png_uint_16p)NULL, 0);
+ MAX_SCREEN_COLORS, png_uint_16p_NULL, 0);
}
/* This reduces the image to the palette supplied in the file */
else if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette))
@@ -354,17 +354,17 @@
#ifdef single /* Read the image a single row at a time */
for (y = 0; y < height; y++)
{
- png_read_rows(png_ptr, &row_pointers[y], (png_bytepp)NULL, 1);
+ png_read_rows(png_ptr, &row_pointers[y], png_bytepp_NULL, 1);
}
#else no_single /* Read the image several rows at a time */
for (y = 0; y < height; y += number_of_rows)
{
#ifdef sparkle /* Read the image using the "sparkle" effect. */
- png_read_rows(png_ptr, &row_pointers[y], (png_bytepp)NULL,
+ png_read_rows(png_ptr, &row_pointers[y], png_bytepp_NULL,
number_of_rows);
#else no_sparkle /* Read the image using the "rectangle" effect */
- png_read_rows(png_ptr, (png_bytepp)NULL, &row_pointers[y],
+ png_read_rows(png_ptr, png_bytepp_NULL, &row_pointers[y],
number_of_rows);
#endif no_sparkle /* use only one of these two methods */
}
@@ -382,7 +382,7 @@
/* At this point you have read the entire image */
/* clean up after the read, and free any memory allocated - REQUIRED */
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
/* close the file */
fclose(fp);
@@ -415,13 +415,13 @@
if (*info_ptr == NULL)
{
- png_destroy_read_struct(png_ptr, info_ptr, (png_infopp)NULL);
+ png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
return (ERROR);
}
if (setjmp(png_jmpbuf((*png_ptr))))
{
- png_destroy_read_struct(png_ptr, info_ptr, (png_infopp)NULL);
+ png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
return (ERROR);
}
@@ -450,7 +450,7 @@
if (setjmp(png_jmpbuf((*png_ptr))))
{
/* Free the png_ptr and info_ptr memory on error */
- png_destroy_read_struct(png_ptr, info_ptr, (png_infopp)NULL);
+ png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
return (ERROR);
}
@@ -582,7 +582,7 @@
if (info_ptr == NULL)
{
fclose(fp);
- png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+ png_destroy_write_struct(&png_ptr, png_infopp_NULL);
return (ERROR);
}
@@ -614,7 +614,7 @@
* image info living info in the structure. You could "|" many
* PNG_TRANSFORM flags into the png_transforms integer here.
*/
- png_write_png(png_ptr, info_ptr, png_transforms, (png_voidp)NULL);
+ png_write_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL);
#else
/* This is the hard way */
diff --git a/libpng.3 b/libpng.3
index 89406bc..a7a4388 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "October 25, 2001"
+.TH LIBPNG 3 "October 27, 2001"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.1beta2
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.1beta3
.SH SYNOPSIS
\fI\fB
@@ -787,7 +787,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.1beta2 - October 25, 2001
+ libpng version 1.2.1beta3 - October 27, 2001
Updated and distributed by Glenn Randers-Pehrson
<randeg@alum.rpi.edu>
Copyright (c) 1998-2001 Glenn Randers-Pehrson
@@ -3635,13 +3635,13 @@
.SH IX. Y2K Compliance in libpng
-October 25, 2001
+October 27, 2001
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.1beta2 are Y2K compliant. It is my belief that earlier
+upward through 1.2.1beta3 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
@@ -3761,7 +3761,7 @@
1.2.0beta3-5 3 10200 3.1.2.0beta3-5
1.2.0rc1 3 10200 3.1.2.0rc1
1.2.0 3 10200 3.1.2.0
- 1.2.1beta1 3 10201 3.1.2.1beta1
+ 1.2.1beta-3 3 10201 3.1.2.1beta1-3
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3819,7 +3819,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.1beta2 - October 25, 2001:
+Libpng version 1.2.1beta3 - October 27, 2001:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu).
@@ -3836,7 +3836,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.1beta2, October 25, 2001, are
+libpng versions 1.0.7, July 1, 2000, through 1.2.1beta3, October 27, 2001, are
Copyright (c) 2000-2001 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.0.6
with the following individuals added to the list of Contributing Authors
@@ -3928,7 +3928,7 @@
Glenn Randers-Pehrson
randeg@alum.rpi.edu
-October 25, 2001
+October 27, 2001
.\" end of man page
diff --git a/libpng.txt b/libpng.txt
index d9963fe..45fe99e 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.1beta2 - October 25, 2001
+ libpng version 1.2.1beta3 - October 27, 2001
Updated and distributed by Glenn Randers-Pehrson
<randeg@alum.rpi.edu>
Copyright (c) 1998-2001 Glenn Randers-Pehrson
@@ -2848,13 +2848,13 @@
IX. Y2K Compliance in libpng
-October 25, 2001
+October 27, 2001
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.1beta2 are Y2K compliant. It is my belief that earlier
+upward through 1.2.1beta3 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 81aba25..c4d5192 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "October 25, 2001"
+.TH LIBPNGPF 3 "October 27, 2001"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.1beta2
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.1beta3
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 293c1a5..27bfb78 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "October 25, 2001"
+.TH PNG 5 "October 27, 2001"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index e6b2c56..6037fad 100644
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
- * libpng version 1.2.1beta2 - October 25, 2001
+ * libpng version 1.2.1beta3 - October 27, 2001
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -13,14 +13,14 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_1beta2 Your_png_h_is_not_version_1_2_1beta2;
+typedef version_1_2_1beta3 Your_png_h_is_not_version_1_2_1beta3;
/* 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.1beta2";
+const char png_libpng_ver[18] = "1.2.1beta3";
/* png_sig was changed to a function in version 1.0.5c */
/* Place to hold the signature string for a PNG file. */
@@ -248,7 +248,7 @@
#else
png_destroy_struct((png_voidp)info_ptr);
#endif
- *info_ptr_ptr = (png_infop)NULL;
+ *info_ptr_ptr = NULL;
}
}
@@ -551,7 +551,7 @@
if (png_ptr->num_chunk_list)
{
png_free(png_ptr, png_ptr->chunk_list);
- png_ptr->chunk_list=(png_bytep)NULL;
+ png_ptr->chunk_list=NULL;
png_ptr->num_chunk_list=0;
}
#endif
@@ -646,7 +646,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.1beta2 - October 25, 2001\n\
+ return ((png_charp) "\n libpng version 1.2.1beta3 - October 27, 2001\n\
Copyright (c) 1998-2001 Glenn Randers-Pehrson\n\
Copyright (c) 1996, 1997 Andreas Dilger\n\
Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.\n");
@@ -664,8 +664,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.1beta2");
- return((png_charp) "1.2.1beta2");
+ return((png_charp) "1.2.1beta3");
+ return((png_charp) "1.2.1beta3");
}
png_charp PNGAPI
diff --git a/png.h b/png.h
index 9a15720..b65eeab 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.1beta2 - October 25, 2001
+ * libpng version 1.2.1beta3 - October 27, 2001
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -9,7 +9,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- * libpng versions 0.97, January 1998, through 1.2.1beta2 - October 25, 2001: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.1beta3 - October 27, 2001: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -78,7 +78,7 @@
* 1.2.0beta3-5 3 10200 3.1.2.0beta3-5
* 1.2.0rc1 3 10200 3.1.2.0rc1
* 1.2.0 3 10200 3.1.2.0
- * 1.2.1beta1-2 3 10201 3.1.2.1beta1-2
+ * 1.2.1beta1-3 3 10201 3.1.2.1beta1-3
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -108,7 +108,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.1beta2, October 25, 2001, are
+ * libpng versions 1.0.7, July 1, 2000, through 1.2.1beta3, October 27, 2001, are
* Copyright (c) 2000, 2001 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.0.6
* with the following individuals added to the list of Contributing Authors
@@ -213,13 +213,13 @@
* Y2K compliance in libpng:
* =========================
*
- * October 25, 2001
+ * October 27, 2001
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
- * upward through 1.2.1beta2 are Y2K compliant. It is my belief that earlier
+ * upward through 1.2.1beta3 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
@@ -275,7 +275,7 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.1beta2"
+#define PNG_LIBPNG_VER_STRING "1.2.1beta3"
#define PNG_LIBPNG_VER_SONUM 3
#define PNG_LIBPNG_VER_DLLNUM %DLLNUM%
@@ -287,7 +287,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 2
+#define PNG_LIBPNG_VER_BUILD 3
#define PNG_LIBPNG_BUILD_ALPHA 1
#define PNG_LIBPNG_BUILD_BETA 2
@@ -323,6 +323,22 @@
* which applications aren't expected to use directly.
*/
+#define int_p_NULL NULL /* (int *)NULL */
+#define png_bytep_NULL NULL /* (png_bytep)NULL */
+#define png_bytepp_NULL NULL /* (png_bytepp)NULL */
+#define png_doublep_NULL NULL /* (png_doublep)NULL */
+#define png_error_ptr_NULL NULL /* (png_error_ptr)NULL */
+#define png_flush_ptr_NULL NULL /* (png_flush_ptr)NULL */
+#define png_free_ptr_NULL NULL /* (png_free_ptr)NULL */
+#define png_infopp_NULL NULL /* (png_infopp)NULL */
+#define png_malloc_ptr_NULL NULL /* (png_malloc_ptr)NULL */
+#define png_read_status_ptr_NULL NULL /* (png_read_status_ptr)NULL */
+#define png_rw_ptr_NULL NULL /* (png_rw_ptr)NULL */
+#define png_structp_NULL NULL /* (png_structp)NULL */
+#define png_uint_16p_NULL NULL /* (png_uint_16p)NULL */
+#define png_voidp_NULL NULL /* (png_voidp)NULL */
+#define png_write_status_ptr_NULL NULL /* (png_write_status_ptr)NULL */
+
/* variables declared in png.c - only it needs to define PNG_NO_EXTERN */
#if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN)
/* Version information for C files, stored in png.c. This had better match
@@ -1217,9 +1233,9 @@
/* This prevents a compiler error in png_get_copyright() in png.c if png.c
- and png.h are both at version 1.2.1beta2
+ and png.h are both at version 1.2.1beta3
*/
-typedef png_structp version_1_2_1beta2;
+typedef png_structp version_1_2_1beta3;
typedef png_struct FAR * FAR * png_structpp;
@@ -2336,7 +2352,7 @@
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.1beta2 - October 25, 2001 (header)\n"
+ " libpng version 1.2.1beta3 - October 27, 2001 (header)\n"
#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
/* With these routines we avoid an integer divide, which will be slower on
@@ -2949,15 +2965,17 @@
#endif
#if defined(PNG_READ_BACKGROUND_SUPPORTED)
-PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info, png_bytep row,
- png_color_16p trans_values, png_color_16p background
#if defined(PNG_READ_GAMMA_SUPPORTED)
- , png_color_16p background_1,
+PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info, png_bytep row,
+ png_color_16p trans_values, png_color_16p background,
+ png_color_16p background_1,
png_bytep gamma_table, png_bytep gamma_from_1, png_bytep gamma_to_1,
png_uint_16pp gamma_16, png_uint_16pp gamma_16_from_1,
- png_uint_16pp gamma_16_to_1, int gamma_shift
+ png_uint_16pp gamma_16_to_1, int gamma_shift));
+#else
+PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info, png_bytep row,
+ png_color_16p trans_values, png_color_16p background));
#endif
- ));
#endif
#if defined(PNG_READ_GAMMA_SUPPORTED)
diff --git a/pngasmrd.h b/pngasmrd.h
index ee90d18..9d3e7a2 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.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 2001 Glenn Randers-Pehrson
*
diff --git a/pngconf.h b/pngconf.h
index cf65368..ba0a5aa 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,6 +1,6 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng 1.2.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngerror.c b/pngerror.c
index 2b12219..72ea362 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,7 +1,7 @@
/* pngerror.c - stub functions for i/o and memory allocation
*
- * libpng 1.2.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pnggccrd.c b/pnggccrd.c
index b3cb653..ed9d864 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.1beta2 - October 25, 2001
+ * libpng version 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* Copyright (c) 1998, Intel Corporation
diff --git a/pngget.c b/pngget.c
index 3f9705b..9d6138f 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
/* pngget.c - retrieval of values from info struct
*
- * libpng 1.2.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngmem.c b/pngmem.c
index 2578949..53cccdb 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@
/* pngmem.c - stub functions for memory allocation
*
- * libpng 1.2.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -27,7 +27,7 @@
png_create_struct(int type)
{
#ifdef PNG_USER_MEM_SUPPORTED
- return (png_create_struct_2(type, (png_malloc_ptr)NULL, (png_voidp)NULL));
+ return (png_create_struct_2(type, png_malloc_ptr_NULL, png_voidp_NULL));
}
/* Alternate version of png_create_struct, for use with user-defined malloc. */
@@ -43,39 +43,30 @@
else if (type == PNG_STRUCT_PNG)
size = sizeof(png_struct);
else
- return ((png_voidp)NULL);
+ return (NULL);
#ifdef PNG_USER_MEM_SUPPORTED
if(malloc_fn != NULL)
{
- if (mem_ptr != NULL)
- {
- png_struct dummy_struct;
- png_structp png_ptr = &dummy_struct;
- png_ptr->mem_ptr=mem_ptr;
- struct_ptr = (*(malloc_fn))(png_ptr, size);
- }
- else
- struct_ptr = (*(malloc_fn))((png_structp)NULL, size);
- if (struct_ptr != NULL)
- png_memset(struct_ptr, 0, size);
- return (struct_ptr);
+ png_struct dummy_struct;
+ png_structp png_ptr = &dummy_struct;
+ png_ptr->mem_ptr=mem_ptr;
+ struct_ptr = (*(malloc_fn))(png_ptr, size);
}
+ else
#endif /* PNG_USER_MEM_SUPPORTED */
- if ((struct_ptr = (png_voidp)farmalloc(size)) != NULL)
- {
+ struct_ptr = (png_voidp)farmalloc(size));
+ if (struct_ptr != NULL)
png_memset(struct_ptr, 0, size);
- }
return (struct_ptr);
}
-
/* Free memory allocated by a png_create_struct() call */
void /* PRIVATE */
png_destroy_struct(png_voidp struct_ptr)
{
#ifdef PNG_USER_MEM_SUPPORTED
- png_destroy_struct_2(struct_ptr, (png_free_ptr)NULL, (png_voidp)NULL);
+ png_destroy_struct_2(struct_ptr, png_free_ptr_NULL, png_voidp_NULL);
}
/* Free memory allocated by a png_create_struct() call */
@@ -126,7 +117,7 @@
png_voidp ret;
#endif
if (png_ptr == NULL || size == 0)
- return ((png_voidp)NULL);
+ return (NULL);
#ifdef PNG_USER_MEM_SUPPORTED
if(png_ptr->malloc_fn != NULL)
@@ -297,7 +288,7 @@
png_create_struct(int type)
{
#ifdef PNG_USER_MEM_SUPPORTED
- return (png_create_struct_2(type, (png_malloc_ptr)NULL, (png_voidp)NULL));
+ return (png_create_struct_2(type, png_malloc_ptr_NULL, png_voidp_NULL));
}
/* Allocate memory for a png_struct or a png_info. The malloc and
@@ -315,7 +306,7 @@
else if (type == PNG_STRUCT_PNG)
size = sizeof(png_struct);
else
- return ((png_voidp)NULL);
+ return (NULL);
#ifdef PNG_USER_MEM_SUPPORTED
if(malloc_fn != NULL)
@@ -328,7 +319,9 @@
struct_ptr = (*(malloc_fn))(png_ptr, size);
}
else
- struct_ptr = (*(malloc_fn))((png_structp)NULL, size);
+ {
+ struct_ptr = (*(malloc_fn))(png_structp_NULL, size);
+ }
if (struct_ptr != NULL)
png_memset(struct_ptr, 0, size);
return (struct_ptr);
@@ -357,7 +350,7 @@
png_destroy_struct(png_voidp struct_ptr)
{
#ifdef PNG_USER_MEM_SUPPORTED
- png_destroy_struct_2(struct_ptr, (png_free_ptr)NULL, (png_voidp)NULL);
+ png_destroy_struct_2(struct_ptr, png_free_ptr_NULL, png_voidp_NULL);
}
/* Free memory allocated by a png_create_struct() call */
@@ -402,7 +395,7 @@
{
png_voidp ret;
if (png_ptr == NULL || size == 0)
- return ((png_voidp)NULL);
+ return (NULL);
#ifdef PNG_USER_MEM_SUPPORTED
if(png_ptr->malloc_fn != NULL)
diff --git a/pngpread.c b/pngpread.c
index c612e46..5c97687 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode
*
- * libpng 1.2.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -792,7 +792,7 @@
{
for (i = 0; i < 4 && png_ptr->pass == 2; i++)
{
- png_push_have_row(png_ptr, (png_bytep)NULL);
+ png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
}
@@ -800,13 +800,13 @@
{
for (i = 0; i < 2 && png_ptr->pass == 4; i++)
{
- png_push_have_row(png_ptr, (png_bytep)NULL);
+ png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
}
if (png_ptr->pass == 6 && png_ptr->height <= 4)
{
- png_push_have_row(png_ptr, (png_bytep)NULL);
+ png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
break;
@@ -823,7 +823,7 @@
{
for (i = 0; i < 4 && png_ptr->pass == 2; i++)
{
- png_push_have_row(png_ptr, (png_bytep)NULL);
+ png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
}
@@ -839,14 +839,14 @@
}
for (i = 0; i < 4 && png_ptr->pass == 2; i++)
{
- png_push_have_row(png_ptr, (png_bytep)NULL);
+ png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
if (png_ptr->pass == 4) /* pass 3 might be empty */
{
for (i = 0; i < 2 && png_ptr->pass == 4; i++)
{
- png_push_have_row(png_ptr, (png_bytep)NULL);
+ png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
}
@@ -864,7 +864,7 @@
{
for (i = 0; i < 2 && png_ptr->pass == 4; i++)
{
- png_push_have_row(png_ptr, (png_bytep)NULL);
+ png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
}
@@ -880,12 +880,12 @@
}
for (i = 0; i < 2 && png_ptr->pass == 4; i++)
{
- png_push_have_row(png_ptr, (png_bytep)NULL);
+ png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
if (png_ptr->pass == 6) /* pass 5 might be empty */
{
- png_push_have_row(png_ptr, (png_bytep)NULL);
+ png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
break;
@@ -900,7 +900,7 @@
}
if (png_ptr->pass == 6) /* skip top generated row */
{
- png_push_have_row(png_ptr, (png_bytep)NULL);
+ png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
break;
@@ -911,7 +911,7 @@
png_read_push_finish_row(png_ptr);
if (png_ptr->pass != 6)
break;
- png_push_have_row(png_ptr, (png_bytep)NULL);
+ png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
}
@@ -1072,8 +1072,8 @@
text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
text_ptr->key = key;
#ifdef PNG_iTXt_SUPPORTED
- text_ptr->lang = (char *)NULL;
- text_ptr->lang_key = (char *)NULL;
+ text_ptr->lang = NULL;
+ text_ptr->lang_key = NULL;
#endif
text_ptr->text = text;
@@ -1257,8 +1257,8 @@
text_ptr->compression = PNG_TEXT_COMPRESSION_zTXt;
text_ptr->key = key;
#ifdef PNG_iTXt_SUPPORTED
- text_ptr->lang = (char *)NULL;
- text_ptr->lang_key = (char *)NULL;
+ text_ptr->lang = NULL;
+ text_ptr->lang_key = NULL;
#endif
text_ptr->text = text;
diff --git a/pngread.c b/pngread.c
index ba03cb6..79ac8a0 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
- * libpng 1.2.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -22,7 +22,7 @@
#ifdef PNG_USER_MEM_SUPPORTED
return (png_create_read_struct_2(user_png_ver, error_ptr, error_fn,
- warn_fn, (png_voidp)NULL, (png_malloc_ptr)NULL, (png_free_ptr)NULL));
+ warn_fn, png_voidp_NULL, png_malloc_ptr_NULL, png_free_ptr_NULL));
}
/* Alternate create PNG structure for reading, and allocate any memory needed. */
@@ -50,9 +50,7 @@
#else
if ((png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG)) == NULL)
#endif
- {
- return (png_structp)NULL;
- }
+ return (NULL);
#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
png_init_mmx_flags(png_ptr); /* 1.2.0 addition */
@@ -68,7 +66,7 @@
png_free(png_ptr, png_ptr->zbuf);
png_ptr->zbuf=NULL;
png_destroy_struct(png_ptr);
- return (png_structp)NULL;
+ return (NULL);
}
#ifdef USE_FAR_KEYWORD
png_memcpy(png_ptr->jmpbuf,jmpbuf,sizeof(jmp_buf));
@@ -139,7 +137,7 @@
png_ptr->zstream.next_out = png_ptr->zbuf;
png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
- png_set_read_fn(png_ptr, (png_voidp)NULL, (png_rw_ptr)NULL);
+ png_set_read_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL);
return (png_ptr);
}
@@ -165,7 +163,7 @@
if(sizeof(png_struct) > png_struct_size || sizeof(png_info) > png_info_size)
{
char msg[80];
- png_ptr->warning_fn=(png_error_ptr)NULL;
+ png_ptr->warning_fn=NULL;
if (user_png_ver)
{
sprintf(msg, "Application was compiled with png.h from libpng-%.20s",
@@ -179,7 +177,7 @@
#endif
if(sizeof(png_struct) > png_struct_size)
{
- png_ptr->error_fn=(png_error_ptr)NULL;
+ png_ptr->error_fn=NULL;
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
png_ptr->flags=0;
#endif
@@ -188,7 +186,7 @@
}
if(sizeof(png_info) > png_info_size)
{
- png_ptr->error_fn=(png_error_ptr)NULL;
+ png_ptr->error_fn=NULL;
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
png_ptr->flags=0;
#endif
@@ -217,7 +215,7 @@
#ifdef PNG_LEGACY_SUPPORTED
png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
#else
- png_ptr->warning_fn=(png_error_ptr)NULL;
+ png_ptr->warning_fn=NULL;
png_warning(png_ptr,
"Application uses deprecated png_read_init() and should be recompiled.");
break;
@@ -267,7 +265,7 @@
png_ptr->zstream.next_out = png_ptr->zbuf;
png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
- png_set_read_fn(png_ptr, (png_voidp)NULL, (png_rw_ptr)NULL);
+ png_set_read_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL);
}
/* Read the information before the actual image data. This has been
@@ -769,7 +767,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.1beta2
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.1beta3
*/
void PNGAPI
@@ -796,14 +794,14 @@
for (i = 0; i < num_rows; i++)
{
png_bytep rptr = *rp;
- png_read_row(png_ptr, rptr, (png_bytep)NULL);
+ png_read_row(png_ptr, rptr, png_bytep_NULL);
rp++;
}
else if(dp != NULL)
for (i = 0; i < num_rows; i++)
{
png_bytep dptr = *dp;
- png_read_row(png_ptr, (png_bytep)NULL, dptr);
+ png_read_row(png_ptr, png_bytep_NULL, dptr);
dp++;
}
}
@@ -818,7 +816,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.1beta2
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.1beta3
*/
void PNGAPI
png_read_image(png_structp png_ptr, png_bytepp image)
@@ -848,7 +846,7 @@
rp = image;
for (i = 0; i < image_height; i++)
{
- png_read_row(png_ptr, *rp, (png_bytep)NULL);
+ png_read_row(png_ptr, *rp, png_bytep_NULL);
rp++;
}
}
@@ -1081,7 +1079,7 @@
#else
png_destroy_struct((png_voidp)info_ptr);
#endif
- *info_ptr_ptr = (png_infop)NULL;
+ *info_ptr_ptr = NULL;
}
if (end_info_ptr != NULL)
@@ -1095,7 +1093,7 @@
#else
png_destroy_struct((png_voidp)end_info_ptr);
#endif
- *end_info_ptr_ptr = (png_infop)NULL;
+ *end_info_ptr_ptr = NULL;
}
if (png_ptr != NULL)
@@ -1106,7 +1104,7 @@
#else
png_destroy_struct((png_voidp)png_ptr);
#endif
- *png_ptr_ptr = (png_structp)NULL;
+ *png_ptr_ptr = NULL;
}
}
diff --git a/pngrio.c b/pngrio.c
index f1c745e..8cb05d4 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,7 +1,7 @@
/* pngrio.c - functions for data input
*
- * libpng 1.2.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrtran.c b/pngrtran.c
index 9feefe6..2b57688 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.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrutil.c b/pngrutil.c
index 436ab8e..5da8037 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
- * libpng 1.2.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngset.c b/pngset.c
index 2443393..c3a1c1a 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
- * libpng 1.2.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -676,8 +676,8 @@
#endif
{
#ifdef PNG_iTXt_SUPPORTED
- textp->lang=(png_charp)NULL;
- textp->lang_key=(png_charp)NULL;
+ textp->lang=NULL;
+ textp->lang_key=NULL;
#endif
textp->text=textp->key + key_len + 1;
}
diff --git a/pngtest.c b/pngtest.c
index f594d40..e89d912 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1,7 +1,7 @@
/* pngtest.c - a simple test program to test libpng
*
- * libpng 1.2.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -481,7 +481,7 @@
png_debug_malloc directly, with png_ptr == NULL which is OK */
if (size == 0)
- return (png_voidp)(NULL);
+ return (NULL);
/* This calls the library allocator twice, once to get the requested
buffer and once to get a new free list entry. */
@@ -594,7 +594,7 @@
#endif
char inbuf[256], outbuf[256];
- row_buf = (png_bytep)NULL;
+ row_buf = NULL;
#if defined(_WIN32_WCE)
MultiByteToWideChar(CP_ACP, 0, inname, -1, path, MAX_PATH);
@@ -621,12 +621,12 @@
png_debug(0, "Allocating read and write structures\n");
#ifdef PNG_USER_MEM_SUPPORTED
- read_ptr = png_create_read_struct_2(PNG_LIBPNG_VER_STRING, (png_voidp)NULL,
- (png_error_ptr)NULL, (png_error_ptr)NULL, (png_voidp)NULL,
+ read_ptr = png_create_read_struct_2(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+ png_error_ptr_NULL, png_error_ptr_NULL, png_voidp_NULL,
(png_malloc_ptr)png_debug_malloc, (png_free_ptr)png_debug_free);
#else
- read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, (png_voidp)NULL,
- (png_error_ptr)NULL, (png_error_ptr)NULL);
+ read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+ png_error_ptr_NULL, png_error_ptr_NULL);
#endif
#if defined(PNG_NO_STDIO)
png_set_error_fn(read_ptr, (png_voidp)inname, pngtest_error,
@@ -634,12 +634,12 @@
#endif
#ifdef PNG_WRITE_SUPPORTED
#ifdef PNG_USER_MEM_SUPPORTED
- write_ptr = png_create_write_struct_2(PNG_LIBPNG_VER_STRING, (png_voidp)NULL,
- (png_error_ptr)NULL, (png_error_ptr)NULL, (png_voidp)NULL,
+ write_ptr = png_create_write_struct_2(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+ png_error_ptr_NULL, png_error_ptr_NULL, png_voidp_NULL,
(png_malloc_ptr)png_debug_malloc, (png_free_ptr)png_debug_free);
#else
- write_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, (png_voidp)NULL,
- (png_error_ptr)NULL, (png_error_ptr)NULL);
+ write_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+ png_error_ptr_NULL, png_error_ptr_NULL);
#endif
#if defined(PNG_NO_STDIO)
png_set_error_fn(write_ptr, (png_voidp)inname, pngtest_error,
@@ -727,9 +727,9 @@
else
{
#ifdef PNG_WRITE_SUPPORTED
- png_set_write_status_fn(write_ptr, (png_write_status_ptr)NULL);
+ png_set_write_status_fn(write_ptr, png_write_status_ptr_NULL);
#endif
- png_set_read_status_fn(read_ptr, (png_read_status_ptr)NULL);
+ png_set_read_status_fn(read_ptr, png_read_status_ptr_NULL);
}
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
@@ -749,11 +749,11 @@
#define HANDLE_CHUNK_ALWAYS 3
#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
png_set_keep_unknown_chunks(read_ptr, HANDLE_CHUNK_ALWAYS,
- (png_bytep)NULL, 0);
+ png_bytep_NULL, 0);
#endif
#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
png_set_keep_unknown_chunks(write_ptr, HANDLE_CHUNK_IF_SAFE,
- (png_bytep)NULL, 0);
+ png_bytep_NULL, 0);
#endif
png_debug(0, "Reading info struct\n");
@@ -1058,7 +1058,7 @@
png_debug2(0, "0x%08lx (%ld bytes)\n", (unsigned long)row_buf,
png_get_rowbytes(read_ptr, read_info_ptr));
#endif /* !SINGLE_ROWBUF_ALLOC */
- png_read_rows(read_ptr, (png_bytepp)&row_buf, (png_bytepp)NULL, 1);
+ png_read_rows(read_ptr, (png_bytepp)&row_buf, png_bytepp_NULL, 1);
#ifdef PNG_WRITE_SUPPORTED
#ifdef PNGTEST_TIMING
@@ -1512,4 +1512,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_1beta2 your_png_h_is_not_version_1_2_1beta2;
+typedef version_1_2_1beta3 your_png_h_is_not_version_1_2_1beta3;
diff --git a/pngtrans.c b/pngtrans.c
index 617c3a8..871db41 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.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngvcrd.c b/pngvcrd.c
index c17a2de..6d27a3d 100644
--- a/pngvcrd.c
+++ b/pngvcrd.c
@@ -2,7 +2,7 @@
*
* For Intel x86 CPU and Microsoft Visual C++ compiler
*
- * libpng 1.2.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* Copyright (c) 1998, Intel Corporation
diff --git a/pngwio.c b/pngwio.c
index e85124c..d648164 100644
--- a/pngwio.c
+++ b/pngwio.c
@@ -1,7 +1,7 @@
/* pngwio.c - functions for data output
*
- * libpng 1.2.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwrite.c b/pngwrite.c
index 1ca7a37..9301fd8 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file
*
- * libpng 1.2.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -424,7 +424,7 @@
{
#ifdef PNG_USER_MEM_SUPPORTED
return (png_create_write_struct_2(user_png_ver, error_ptr, error_fn,
- warn_fn, (png_voidp)NULL, (png_malloc_ptr)NULL, (png_free_ptr)NULL));
+ warn_fn, png_voidp_NULL, png_malloc_ptr_NULL, png_free_ptr_NULL));
}
/* Alternate initialize png_ptr structure, and allocate any memory needed */
@@ -448,9 +448,7 @@
#else
if ((png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG)) == NULL)
#endif /* PNG_USER_MEM_SUPPORTED */
- {
- return ((png_structp)NULL);
- }
+ return (NULL);
#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
png_init_mmx_flags(png_ptr); /* 1.2.0 addition */
@@ -466,7 +464,7 @@
png_free(png_ptr, png_ptr->zbuf);
png_ptr->zbuf=NULL;
png_destroy_struct(png_ptr);
- return ((png_structp)NULL);
+ return (NULL);
}
#ifdef USE_FAR_KEYWORD
png_memcpy(png_ptr->jmpbuf,jmpbuf,sizeof(jmp_buf));
@@ -521,12 +519,12 @@
png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
(png_uint_32)png_ptr->zbuf_size);
- png_set_write_fn(png_ptr, (png_voidp)NULL, (png_rw_ptr)NULL,
- (png_flush_ptr)NULL);
+ png_set_write_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL,
+ png_flush_ptr_NULL);
#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT,
- 1, (png_doublep)NULL, (png_doublep)NULL);
+ 1, png_doublep_NULL, png_doublep_NULL);
#endif
return ((png_structp)png_ptr);
@@ -551,7 +549,7 @@
if(sizeof(png_struct) > png_struct_size || sizeof(png_info) > png_info_size)
{
char msg[80];
- png_ptr->warning_fn=(png_error_ptr)NULL;
+ png_ptr->warning_fn=NULL;
if (user_png_ver)
{
sprintf(msg, "Application was compiled with png.h from libpng-%.20s",
@@ -565,7 +563,7 @@
#endif
if(sizeof(png_struct) > png_struct_size)
{
- png_ptr->error_fn=(png_error_ptr)NULL;
+ png_ptr->error_fn=NULL;
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
png_ptr->flags=0;
#endif
@@ -574,7 +572,7 @@
}
if(sizeof(png_info) > png_info_size)
{
- png_ptr->error_fn=(png_error_ptr)NULL;
+ png_ptr->error_fn=NULL;
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
png_ptr->flags=0;
#endif
@@ -601,7 +599,7 @@
#ifdef PNG_LEGACY_SUPPORTED
png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
#else
- png_ptr->warning_fn=(png_error_ptr)NULL;
+ png_ptr->warning_fn=NULL;
png_warning(png_ptr,
"Application uses deprecated png_write_init() and should be recompiled.");
break;
@@ -635,8 +633,8 @@
png_memcpy(png_ptr->jmpbuf, tmp_jmp, sizeof (jmp_buf));
#endif
- png_set_write_fn(png_ptr, (png_voidp)NULL, (png_rw_ptr)NULL,
- (png_flush_ptr)NULL);
+ png_set_write_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL,
+ png_flush_ptr_NULL);
/* initialize zbuf - compression buffer */
png_ptr->zbuf_size = PNG_ZBUF_SIZE;
@@ -645,7 +643,7 @@
#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT,
- 1, (png_doublep)NULL, (png_doublep)NULL);
+ 1, png_doublep_NULL, png_doublep_NULL);
#endif
}
@@ -970,7 +968,7 @@
#else
png_destroy_struct((png_voidp)info_ptr);
#endif
- *info_ptr_ptr = (png_infop)NULL;
+ *info_ptr_ptr = NULL;
}
if (png_ptr != NULL)
@@ -982,7 +980,7 @@
#else
png_destroy_struct((png_voidp)png_ptr);
#endif
- *png_ptr_ptr = (png_structp)NULL;
+ *png_ptr_ptr = NULL;
}
}
diff --git a/pngwtran.c b/pngwtran.c
index 385895c..3779046 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.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwutil.c b/pngwutil.c
index 3e1b345..d420933 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@
/* pngwutil.c - utilities to write a PNG file
*
- * libpng 1.2.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -608,7 +608,7 @@
PNG_IEND;
#endif
png_debug(1, "in png_write_IEND\n");
- png_write_chunk(png_ptr, (png_bytep)png_IEND, (png_bytep)NULL,
+ png_write_chunk(png_ptr, (png_bytep)png_IEND, png_bytep_NULL,
(png_size_t)0);
png_ptr->mode |= PNG_HAVE_IEND;
}
diff --git a/projects/msvc/README.txt b/projects/msvc/README.txt
index c5314ae..a2b3eb0 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.1beta2 (October 25, 2001) and zlib
+libpng 1.2.1beta3 (October 27, 2001) 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 677ff29..52a8643 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.1beta2
+;Version 1.2.1beta3
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
diff --git a/projects/netware.txt b/projects/netware.txt
index 7aa8a67..de3cd1c 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.1beta2-project-netware.zip from a libpng distribution
+libpng-1.2.1beta3-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.1beta2-project-netware.zip"
+"unzip -a libpng-1.2.1beta3-project-netware.zip"
diff --git a/projects/wince.txt b/projects/wince.txt
index 5d30c76..ae14bd9 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.1beta2-project-wince.zip from a libpng distribution
+libpng-1.2.1beta3-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.1beta2-project-wince.zip"
+"unzip -a libpng-1.2.1beta3-project-wince.zip"
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 78eaaf9..553bee5 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -18,7 +18,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 3. You should not
# have to change it.
PNGMAJ = 3
-PNGMIN = 1.2.1beta2
+PNGMIN = 1.2.1beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index a3508f4..07aa69d 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -13,7 +13,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 3. You should not
# have to change it.
PNGMAJ = 3
-PNGMIN = 1.2.1beta2
+PNGMIN = 1.2.1beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
ALIGN=
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 9c42c67..17f27f0 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -39,7 +39,7 @@
# have to change it.
PNGMAJ = 3
#PNGDLL = $3
-PNGMIN = 1.2.1beta2
+PNGMIN = 1.2.1beta3
PNGMIN_BASE = 1.2.1
PNGVER = $(PNGMAJ).$(PNGMIN)
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index d18ac2b..8b1a7cd 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -24,7 +24,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 3. You should not
# have to change it.
PNGMAJ = 3
-PNGMIN = 1.2.1beta2
+PNGMIN = 1.2.1beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 3ab2cd8..bdf22cb 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -17,7 +17,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 3. You should not
# have to change it.
PNGMAJ = 3
-PNGMIN = 1.2.1beta2
+PNGMIN = 1.2.1beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=cc
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index f112eb6..6a7d9cb 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -55,7 +55,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 3. You should not
# have to change it.
PNGMAJ = 3
-PNGMIN = 1.2.1beta2
+PNGMIN = 1.2.1beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index ca0baba..86f3a70 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -34,7 +34,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 3. You should not
# have to change it.
PNGMAJ = 3
-PNGMIN = 1.2.1beta2
+PNGMIN = 1.2.1beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 51e90a9..edc4a17 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -19,7 +19,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 3. You should not
# have to change it.
PNGMAJ = 3
-PNGMIN = 1.2.1beta2
+PNGMIN = 1.2.1beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
# where make install puts libpng.a and png.h
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index bcd9956..d60a1ee 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -34,7 +34,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 3. You should not
# have to change it.
PNGMAJ = 3
-PNGMIN = 1.2.1beta2
+PNGMIN = 1.2.1beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx
index 0cbacfb..44d8cfd 100644
--- a/scripts/makefile.macosx
+++ b/scripts/makefile.macosx
@@ -19,7 +19,7 @@
LDSHARED=cc -lz -dynamiclib -compatibility_version $(VER) -current_version $(VER)
PNGMAJ = 3
-PNGMIN = 1.2.1beta2
+PNGMIN = 1.2.1beta3
VER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng
SHAREDLIB_POSTFIX=dylib
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index 17fa7ca..37cdc9f 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -11,7 +11,7 @@
LIB=png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.2.1beta2
+SHLIB_MINOR= 1.2.1beta3
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 79c1caa..82aedf8 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -25,7 +25,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 3. You should not
# have to change it.
PNGMAJ = 3
-PNGMIN = 1.2.1beta2
+PNGMIN = 1.2.1beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 05abb2f..f0d97d5 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -22,7 +22,7 @@
LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
LDSHARED=CC $(ABI) -shared
-VER=1.2.1beta2
+VER=1.2.1beta3
# See "man dso" for info about shared objects
SONUM=3
LIBS=libpng.so.$(SONUM).$(VER)
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 05888c7..18fdaaa 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -27,7 +27,7 @@
LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
LDSHARED=cc $(ABI) -shared
-VER=1.2.1beta2
+VER=1.2.1beta3
# See "man dso" for info about shared objects
SONUM=3
SHAREDLIB=libpng.so
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 701bc2c..5e2e377 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -35,7 +35,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 3. You should not
# have to change it.
PNGMAJ = 3
-PNGMIN = 1.2.1beta2
+PNGMIN = 1.2.1beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 1f075cd..402ffea 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -31,7 +31,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 3. You should not
# have to change it.
PNGMAJ = 3
-PNGMIN = 1.2.1beta2
+PNGMIN = 1.2.1beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas
index 1c9771c..1c06a0a 100644
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -7,7 +7,7 @@
interface
const
- PNG_LIBPNG_VER_STRING = '1.2.1beta2';
+ PNG_LIBPNG_VER_STRING = '1.2.1beta3';
PNG_LIBPNG_VER = 10201;
type
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index c521424..08feedf 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.2.1beta2
+; Version 1.2.1beta3
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
