Imported from libpng-1.0.11beta1.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 7827622..66dd338 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,26 +1,13 @@
-Libpng 1.0.10 - March 30, 2001
+Libpng 1.0.11beta1 - April 4, 2001
This is a public release of libpng, intended for use in production codes.
-Changes since the last public release (1.0.9):
+Changes since the last public release (1.0.10):
- Revised makefile.dec
- Reformatted libpng.3 to eliminate bad line breaks.
- Added checks for _mmx_supported in the read_filter_row function of pnggccrd.c
- Added prototype for png_mmx_support() near the top of pnggccrd.c
- Moved some error checking from png_handle_IHDR to png_set_IHDR.
- Added PNG_NO_READ_SUPPORTED and PNG_NO_WRITE_SUPPORTED macros.
- Revised png_mmx_support() function in pnggccrd.c
- Restored version 1.0.8 PNG_WRITE_EMPTY_PLTE_SUPPORTED behavior in pngwutil.c
- Fixed memory leak in contrib/visupng/PngFile.c
- Fixed bugs in png_combine_row() in pnggccrd.c and pngvcrd.c (C version)
- Added warnings when retrieving or setting gamma=0.
- Changed all instances of memcpy, strcpy, and strlen to png_memcpy, png_strcpy,
- and png_strlen.
- Fixed bug in progressive reading (pngpread.c) with small images (height < 8).
- Deleted extraneous space (introduced in 1.0.9) from line 42 of makefile.cygwin
- Added beos project files (Chris Herborth)
+ Added type casts on several png_malloc() calls (Dimitri Papadapoulos).
+ Removed a no-longer needed AIX work-around from pngconf.h
+ Changed several "//" single-line comments to C-style in pnggccrd.c
Send comments/corrections/commendations to
png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
diff --git a/CHANGES b/CHANGES
index ef64057..b595332 100644
--- a/CHANGES
+++ b/CHANGES
@@ -914,6 +914,10 @@
version 1.0.10 [March 30, 2001]
Deleted extraneous space (introduced in 1.0.9) from line 42 of makefile.cygwin
Added beos project files (Chris Herborth)
+version 1.0.11beta1 [April 4, 2001]
+ Added type casts on several png_malloc() calls (Dimitri Papadapoulos).
+ Removed a no-longer needed AIX work-around from pngconf.h
+ Changed several "//" single-line comments to C-style in pnggccrd.c
Send comments/corrections/commendations to
png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
diff --git a/INSTALL b/INSTALL
index 1dc078e..41332b7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.0.10 - March 30, 2001
+Installing libpng version 1.0.11beta1 - April 4, 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.0.10" or "lpng109" and "zlib-1.1.3"
+might be called "libpng-1.0.11beta1" 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:
@@ -60,8 +60,8 @@
include
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
- makefile.linux => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.10)
- makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.10,
+ makefile.linux => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.11beta1)
+ makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.11beta1,
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
@@ -77,9 +77,9 @@
libpng.icc => Project file for IBM VisualAge/C++ version 4.0 or later
makefile.macosx => MACOS X Makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
- makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.10)
+ makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.11beta1)
makefile.sunos => Sun makefile
- makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.10)
+ makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.11beta1)
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
makefile.mips => MIPS makefile
makefile.acorn => Acorn makefile
diff --git a/KNOWNBUG b/KNOWNBUG
index f7b21db..174f48c 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,4 +1,15 @@
Known bugs in libpng-1.0.10
-None as of March 30, 2001.
+1. April 1, 2001: Missing type casts on png_malloc() calls (Dimitri Papadopolous)
+
+ A call to png_malloc() in pngread.c is missing the (png_bytep) type cast,
+ and four calls in pngset.c are missing type casts, (png_charp), (png_charp),
+ (png_bytep), and (png_bytep), respectively.
+
+ STATUS: fixed in libpng-1.0.11beta1.
+
+2. April 3, 2001: "//" comments cause the SGI compiler (o32) to fail to
+ compile pnggccrd.c (Richard Kettlewell).
+
+ STATUS: fixed in libpng-1.0.11beta1.
diff --git a/LICENSE b/LICENSE
index f091acf..e16e77e 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.0.10, March 30, 2001, are
+libpng versions 1.0.7, July 1, 2000, through 1.0.11beta1, April 4, 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
@@ -99,4 +99,4 @@
Glenn Randers-Pehrson
randeg@alum.rpi.edu
-March 30, 2001
+April 4, 2001
diff --git a/README b/README
index b7565a0..3c931f5 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng 1.0.10 - March 30, 2001 (shared library 2.1)
+README for libpng 1.0.11beta1 - April 4, 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.
@@ -183,9 +183,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.10)
+ (gcc, creates libpng.so.2.1.0.11beta1)
makefile.gcmmx => Linux/ELF makefile (gcc, creates
- libpng.so.2.1.0.10, uses assembler code
+ libpng.so.2.1.0.11beta1, 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
@@ -201,10 +201,10 @@
libpng.icc => Project file, IBM VisualAge/C++ 4.0 or later
makefile.macosx => MACOS X Makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
- makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.10)
+ makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.11beta1)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng.so.2.1.0.10)
+ (gcc, creates libpng.so.2.1.0.11beta1)
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 cf7cd0d..0576337 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- March 30, 2001
+ April 4, 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.0.10 are Y2K compliant. It is my belief that earlier
+ upward through 1.0.11beta1 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 18b0cdc..41bb25b 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
echo "
- There is no \"configure\" script for Libpng-1.0.10. Instead, please
+ There is no \"configure\" script for Libpng-1.0.11beta1. 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 8d3b87a..10f0f9f 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "March 30, 2001"
+.TH LIBPNG 3 "April 4, 2001"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.10
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.11beta1
.SH SYNOPSIS
\fI\fB
@@ -747,7 +747,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.0.10 - March 30, 2001
+ libpng version 1.0.11beta1 - April 4, 2001
Updated and distributed by Glenn Randers-Pehrson
<randeg@alum.rpi.edu>
Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
@@ -3464,13 +3464,13 @@
.SH VIII. Y2K Compliance in libpng
-March 30, 2001
+April 4, 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.0.10 are Y2K compliant. It is my belief that earlier
+upward through 1.0.11beta1 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
@@ -3579,6 +3579,7 @@
1.0.10beta1 1 10010 2.1.0.10beta1
1.0.10rc1 1 10010 2.1.0.10rc1
1.0.10 1 10010 2.1.0.10
+ 1.0.11beta1 1 10011 2.1.0.11beta1
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3636,7 +3637,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.0.10 - March 30, 2001:
+Libpng version 1.0.11beta1 - April 4, 2001:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu).
@@ -3653,7 +3654,7 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.0.7, July 1, 2000, through 1.0.10, March 30, 2001, are
+libpng versions 1.0.7, July 1, 2000, through 1.0.11beta1, April 4, 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
@@ -3745,7 +3746,7 @@
Glenn Randers-Pehrson
randeg@alum.rpi.edu
-March 30, 2001
+April 4, 2001
.\" end of man page
diff --git a/libpng.txt b/libpng.txt
index dd43ab6..e65cb05 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.10 - March 30, 2001
+ libpng version 1.0.11beta1 - April 4, 2001
Updated and distributed by Glenn Randers-Pehrson
<randeg@alum.rpi.edu>
Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
@@ -2717,13 +2717,13 @@
VIII. Y2K Compliance in libpng
-March 30, 2001
+April 4, 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.0.10 are Y2K compliant. It is my belief that earlier
+upward through 1.0.11beta1 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 2308307..a6c0392 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "March 30, 2001"
+.TH LIBPNGPF 3 "April 4, 2001"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.10
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.11beta1
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index f1207b2..27aa6b2 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "March 30, 2001"
+.TH PNG 5 "April 4, 2001"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 5dd0ff6..6686135 100644
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
- * libpng version 1.0.10 - March 30, 2001
+ * libpng version 1.0.11beta1 - April 4, 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_0_10 Your_png_h_is_not_version_1_0_10;
+typedef version_1_0_11beta1 Your_png_h_is_not_version_1_0_11beta1;
/* 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.0.10";
+const char png_libpng_ver[18] = "1.0.11beta1";
/* png_sig was changed to a function in version 1.0.5c */
/* Place to hold the signature string for a PNG file. */
@@ -626,7 +626,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.0.10 - March 30, 2001\n\
+ return ((png_charp) "\n libpng version 1.0.11beta1 - April 4, 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");
@@ -644,8 +644,8 @@
{
/* Version of *.c files used when building libpng */
if(png_ptr != NULL) /* silence compiler warning about unused png_ptr */
- return((png_charp) "1.0.10");
- return((png_charp) "1.0.10");
+ return((png_charp) "1.0.11beta1");
+ return((png_charp) "1.0.11beta1");
}
png_charp PNGAPI
@@ -695,7 +695,7 @@
png_access_version_number(void)
{
/* Version of *.c files used when building libpng */
- return((png_uint_32) 10010L);
+ return((png_uint_32) 10011L);
}
diff --git a/png.h b/png.h
index dc0a3cc..b644d34 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.0.10 - March 30, 2001
+ * libpng version 1.0.11beta1 - April 4, 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.0.10 - March 30, 2001: Glenn
+ * libpng versions 0.97, January 1998, through 1.0.11beta1 - April 4, 2001: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -67,6 +67,7 @@
* 1.0.10beta1 1 10010 2.1.0.10beta1
* 1.0.10rc1 1 10010 2.1.0.10rc1
* 1.0.10 1 10010 2.1.0.10
+ * 1.0.11beta1 1 10011 2.1.0.11beta1
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -96,7 +97,7 @@
* If you modify libpng you may insert additional notices immediately following
* this sentence.
*
- * libpng versions 1.0.7, July 1, 2000, through 1.0.10, March 30, 2001, are
+ * libpng versions 1.0.7, July 1, 2000, through 1.0.11beta1, April 4, 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
@@ -201,13 +202,13 @@
* Y2K compliance in libpng:
* =========================
*
- * March 30, 2001
+ * April 4, 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.0.10 are Y2K compliant. It is my belief that earlier
+ * upward through 1.0.11beta1 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
@@ -263,7 +264,7 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.0.10"
+#define PNG_LIBPNG_VER_STRING "1.0.11beta1"
#define PNG_LIBPNG_VER_SONUM 2
#define PNG_LIBPNG_VER_DLLNUM %DLLNUM%
@@ -271,11 +272,11 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 0
-#define PNG_LIBPNG_VER_RELEASE 10
+#define PNG_LIBPNG_VER_RELEASE 11
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero: */
-#define PNG_LIBPNG_VER_BUILD 0
+#define PNG_LIBPNG_VER_BUILD 1
#define PNG_LIBPNG_BUILD_ALPHA 1
#define PNG_LIBPNG_BUILD_BETA 2
@@ -283,14 +284,14 @@
#define PNG_LIBPNG_BUILD_STABLE 4
#define PNG_LIBPNG_BUILD_TYPEMASK 7
#define PNG_LIBPNG_BUILD_PATCH 8 /* Can be OR'ed with STABLE only */
-#define PNG_LIBPNG_BUILD_TYPE 4
+#define PNG_LIBPNG_BUILD_TYPE 2
/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
* We must not include leading zeros.
* Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
* version 1.0.0 was mis-numbered 100 instead of 10000). From
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */
-#define PNG_LIBPNG_VER 10010 /* 1.0.10 */
+#define PNG_LIBPNG_VER 10011 /* 1.0.11 */
#ifndef PNG_VERSION_INFO_ONLY
@@ -1184,9 +1185,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.10
+and png.h are both at * version 1.0.11beta1
*/
-typedef png_structp version_1_0_10;
+typedef png_structp version_1_0_11beta1;
typedef png_struct FAR * FAR * png_structpp;
@@ -2234,7 +2235,7 @@
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.0.10 - March 30, 2001 (header)\n"
+ " libpng version 1.0.11beta1 - April 4, 2001 (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 108f0b5..fd5ca88 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.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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 54430bb..5d9a4c4 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,6 +1,6 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng 1.0.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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)
@@ -248,12 +248,6 @@
# endif /* __linux__ */
#endif /* PNG_SETJMP_SUPPORTED */
-#if defined(_AIX) && defined(__xlC__)
-/* This prevents "AIX/xlC" from generating an "index(s,c)" macro in strings.h
- * that conflicts with libpng's png_color_16.index */
-# undef __STR__
-#endif
-
#ifdef BSD
# include <strings.h>
#else
diff --git a/pngerror.c b/pngerror.c
index 79295d1..4858ee5 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,7 +1,7 @@
/* pngerror.c - stub functions for i/o and memory allocation
*
- * libpng 1.0.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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 9629479..cf38b56 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.0.10 - March 30, 2001
+ * libpng version 1.0.11beta1 - April 4, 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
@@ -4886,7 +4886,7 @@
#if defined(PNG_HAVE_ASSEMBLER_READ_FILTER_ROW)
-// Optimized png_read_filter_row routines
+/* Optimized png_read_filter_row routines */
void /* PRIVATE */
png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
@@ -4959,7 +4959,7 @@
*rp = (png_byte)(((int)(*rp) + (int)(*lp++)) & 0xff);
rp++;
}
- } //end !UseMMX_sub
+ } /* end !UseMMX_sub */
break;
case PNG_FILTER_VALUE_UP:
@@ -4983,7 +4983,7 @@
*rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
rp++;
}
- } //end !UseMMX_up
+ } /* end !UseMMX_up */
break;
case PNG_FILTER_VALUE_AVG:
@@ -5017,7 +5017,7 @@
((int)(*pp++ + *lp++) >> 1)) & 0xff);
rp++;
}
- } //end !UseMMX_avg
+ } /* end !UseMMX_avg */
break;
case PNG_FILTER_VALUE_PAETH:
@@ -5080,7 +5080,7 @@
*rp = (png_byte)(((int)(*rp) + p) & 0xff);
rp++;
}
- } //end !UseMMX_paeth
+ } /* end !UseMMX_paeth */
break;
default:
diff --git a/pngget.c b/pngget.c
index b055c36..cb16335 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
/* pngget.c - retrieval of values from info struct
*
- * libpng 1.0.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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 8c2bcea..d04825c 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@
/* pngmem.c - stub functions for memory allocation
*
- * libpng 1.0.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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/pngpread.c b/pngpread.c
index 719d438..876134a 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode
*
- * libpng 1.0.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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/pngread.c b/pngread.c
index 1d1b6ec..c571e82 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
- * libpng 1.0.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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)
@@ -715,7 +715,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.10
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.11beta1
*/
void PNGAPI
@@ -764,7 +764,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.10
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.11beta1
*/
void PNGAPI
png_read_image(png_structp png_ptr, png_bytepp image)
@@ -1322,7 +1322,7 @@
info_ptr->free_me |= PNG_FREE_ROWS;
#endif
for (row = 0; row < (int)info_ptr->height; row++)
- info_ptr->row_pointers[row] = png_malloc(png_ptr,
+ info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
png_get_rowbytes(png_ptr, info_ptr));
}
diff --git a/pngrio.c b/pngrio.c
index 60a4b4c..ad35cae 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,7 +1,7 @@
/* pngrio.c - functions for data input
*
- * libpng 1.0.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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 cd12505..2cefedf 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.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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 bd22c56..6d13755 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
- * libpng 1.0.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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 f966d4c..8565d3e 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
- * libpng 1.0.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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)
@@ -531,9 +531,9 @@
if (png_ptr == NULL || info_ptr == NULL || name == NULL || profile == NULL)
return;
- new_iccp_name = png_malloc(png_ptr, png_strlen(name)+1);
+ new_iccp_name = (png_charp)png_malloc(png_ptr, png_strlen(name)+1);
png_strcpy(new_iccp_name, name);
- new_iccp_profile = png_malloc(png_ptr, proflen);
+ new_iccp_profile = (png_charp)png_malloc(png_ptr, proflen);
png_memcpy(new_iccp_profile, profile, (png_size_t)proflen);
png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, 0);
@@ -735,7 +735,8 @@
#ifdef PNG_FREE_ME_SUPPORTED
png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
#endif
- png_ptr->trans = info_ptr->trans = png_malloc(png_ptr, num_trans);
+ png_ptr->trans = info_ptr->trans = (png_bytep)png_malloc(png_ptr,
+ num_trans);
png_memcpy(info_ptr->trans, trans, num_trans);
#ifdef PNG_FREE_ME_SUPPORTED
info_ptr->free_me |= PNG_FREE_TRNS;
@@ -899,7 +900,7 @@
if (chunk_list == NULL)
return;
old_num_chunks=png_ptr->num_chunk_list;
- new_list=png_malloc(png_ptr,5*(num_chunks+old_num_chunks));
+ new_list=(png_bytep)png_malloc(png_ptr,5*(num_chunks+old_num_chunks));
if(png_ptr->chunk_list != (png_bytep)NULL)
{
png_memcpy(new_list, png_ptr->chunk_list, 5*old_num_chunks);
diff --git a/pngtest.c b/pngtest.c
index 0e60c6e..d73c85c 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1,7 +1,7 @@
/* pngtest.c - a simple test program to test libpng
*
- * libpng 1.0.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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)
@@ -488,14 +488,15 @@
/* This calls the library allocator twice, once to get the requested
buffer and once to get a new free list entry. */
{
- memory_infop pinfo = png_malloc_default(png_ptr, sizeof *pinfo);
+ memory_infop pinfo = (memory_infop)png_malloc_default(png_ptr,
+ sizeof *pinfo);
pinfo->size = size;
current_allocation += size;
total_allocation += size;
num_allocations ++;
if (current_allocation > maximum_allocation)
maximum_allocation = current_allocation;
- pinfo->pointer = png_malloc_default(png_ptr, size);
+ pinfo->pointer = (png_voidp)png_malloc_default(png_ptr, size);
pinfo->next = pinformation;
pinformation = pinfo;
/* Make sure the caller isn't assuming zeroed memory. */
@@ -1522,4 +1523,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_0_10 your_png_h_is_not_version_1_0_10;
+typedef version_1_0_11beta1 your_png_h_is_not_version_1_0_11beta1;
diff --git a/pngtrans.c b/pngtrans.c
index c92e724..2fb1126 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.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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 13babae..cab8ea3 100644
--- a/pngvcrd.c
+++ b/pngvcrd.c
@@ -2,7 +2,7 @@
*
* For Intel x86 CPU and Microsoft Visual C++ compiler
*
- * libpng 1.0.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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 6746e8a..4db33ec 100644
--- a/pngwio.c
+++ b/pngwio.c
@@ -1,7 +1,7 @@
/* pngwio.c - functions for data output
*
- * libpng 1.0.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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 32a2a96..659d2c0 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file
*
- * libpng 1.0.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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)
@@ -1138,10 +1138,10 @@
if (png_ptr->filter_weights == NULL)
{
- png_ptr->filter_weights = (png_uint_16p) png_malloc(png_ptr,
+ png_ptr->filter_weights = (png_uint_16p)png_malloc(png_ptr,
(png_uint_32)(sizeof(png_uint_16) * num_weights));
- png_ptr->inv_filter_weights = (png_uint_16p) png_malloc(png_ptr,
+ png_ptr->inv_filter_weights = (png_uint_16p)png_malloc(png_ptr,
(png_uint_32)(sizeof(png_uint_16) * num_weights));
for (i = 0; i < num_weights; i++)
@@ -1173,10 +1173,10 @@
*/
if (png_ptr->filter_costs == NULL)
{
- png_ptr->filter_costs = (png_uint_16p) png_malloc(png_ptr,
+ png_ptr->filter_costs = (png_uint_16p)png_malloc(png_ptr,
(png_uint_32)(sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
- png_ptr->inv_filter_costs = (png_uint_16p) png_malloc(png_ptr,
+ png_ptr->inv_filter_costs = (png_uint_16p)png_malloc(png_ptr,
(png_uint_32)(sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
for (i = 0; i < PNG_FILTER_VALUE_LAST; i++)
diff --git a/pngwtran.c b/pngwtran.c
index 6b7c26f..c002b74 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.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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 753a15d..eaaa99b 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@
/* pngwutil.c - utilities to write a PNG file
*
- * libpng 1.0.10 - March 30, 2001
+ * libpng 1.0.11beta1 - April 4, 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)
@@ -730,7 +730,7 @@
}
/* make sure we include the NULL after the name */
- png_write_chunk_start(png_ptr, (png_bytep) png_sPLT,
+ png_write_chunk_start(png_ptr, (png_bytep)png_sPLT,
(png_uint_32)(name_len + 2 + palette_size));
png_write_chunk_data(png_ptr, (png_bytep)new_name, name_len + 1);
png_write_chunk_data(png_ptr, (png_bytep)&spalette->depth, 1);
diff --git a/projects/msvc/README.txt b/projects/msvc/README.txt
index 06dcb0b..c5889e6 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.0.10 (March 30, 2001) and zlib
+libpng 1.0.11beta1 (April 4, 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 1f5478e..188ab16 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.0.10
+;Version 1.0.11beta1
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
diff --git a/projects/wince/READMEE.WCE b/projects/wince/READMEE.WCE
index 3bbb26f..83d5566 100644
--- a/projects/wince/READMEE.WCE
+++ b/projects/wince/READMEE.WCE
@@ -8,9 +8,9 @@
Introduction
============
-This is libpng 1.0.10 ported to WindowsCE 2.0 and 2.11.
-libpng 1.0.10 is a PNG reference library.
-See README, a document of original libpng 1.0.10.
+This is libpng 1.0.11beta1 ported to WindowsCE 2.0 and 2.11.
+libpng 1.0.11beta1 is a PNG reference library.
+See README, a document of original libpng 1.0.11beta1.
zlib for WindowsCE
==================
@@ -23,7 +23,7 @@
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
-See README and LICENSE, documents of original libpng 1.0.10, for conditions
+See README and LICENSE, documents of original libpng 1.0.11beta1, for conditions
of use and distribution.
Files
diff --git a/projects/wince/READMEJ.WCE b/projects/wince/READMEJ.WCE
index 529a21b..21212f6 100644
--- a/projects/wince/READMEJ.WCE
+++ b/projects/wince/READMEJ.WCE
@@ -24,7 +24,7 @@
ÉÈÁ½¢©ÈéíQÉ¢ÄàAìÒAzzÒA»Ì¼pÒÈOÌl¨A
cÌÉÓCðÆé`±ÍÈ¢àÌƵܷB
-»Ì¼A±Ì\tgEFAÌpðÉ¢ÄÍA´ÅÅ é libpng 1.0.10É
+»Ì¼A±Ì\tgEFAÌpðÉ¢ÄÍA´ÅÅ é libpng 1.0.11beta1É
·éàÌƵܷBÚµÍAt®Ì README,LICENSE ð¨Çݾ³¢B
û^àe
diff --git a/projects/wince/png32ce.def b/projects/wince/png32ce.def
index 1eca576..2b5e10c 100644
--- a/projects/wince/png32ce.def
+++ b/projects/wince/png32ce.def
@@ -5,7 +5,7 @@
LIBRARY lpngce
EXPORTS
-;Version 1.0.10
+;Version 1.0.11beta1
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index c540053..d5d91ab 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -18,7 +18,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 2. You should not
# have to change it.
PNGMAJ = 2
-PNGMIN = 1.0.10
+PNGMIN = 1.0.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 4a32a21..e476d16 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -13,7 +13,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 2. You should not
# have to change it.
PNGMAJ = 2
-PNGMIN = 1.0.10
+PNGMIN = 1.0.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
ALIGN=
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 446cef7..8ffdb61 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -39,9 +39,9 @@
# have to change it.
PNGMAJ = 2
#PNGDLL = $1# msvc
-PNGDLL = 2# cygwin 1.0.10
-PNGMIN = 1.0.10
-PNGMIN_BASE = 1.0.10
+PNGDLL = 2# cygwin 1.0.11beta1
+PNGMIN = 1.0.11beta1
+PNGMIN_BASE = 1.0.11
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(PNGDLL).dll
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 3c71b32..64c5d35 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -17,7 +17,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 2. You should not
# have to change it.
PNGMAJ = 2
-PNGMIN = 1.0.10
+PNGMIN = 1.0.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=cc
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 38efec6..cd655aa 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -51,7 +51,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 2. You should not
# have to change it.
PNGMAJ = 2
-PNGMIN = 1.0.10
+PNGMIN = 1.0.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index e2c13d5..3f1cbb4 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -34,7 +34,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 2. You should not
# have to change it.
PNGMAJ = 2
-PNGMIN = 1.0.10
+PNGMIN = 1.0.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 8deae18..faa52a3 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -19,7 +19,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 2. You should not
# have to change it.
PNGMAJ = 2
-PNGMIN = 1.0.10
+PNGMIN = 1.0.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# where make install puts libpng.a and png.h
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 90b9f8d..5a0b407 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -34,7 +34,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 2. You should not
# have to change it.
PNGMAJ = 2
-PNGMIN = 1.0.10
+PNGMIN = 1.0.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 8cc5ac9..937f7d2 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -25,7 +25,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 2. You should not
# have to change it.
PNGMAJ = 2
-PNGMIN = 1.0.10
+PNGMIN = 1.0.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 3e438e2..844312e 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.10
-LIBS=libpng.so.1.0.10
+VER=1.0.11beta1
+LIBS=libpng.so.1.0.11beta1
SHAREDLIB=libpng.so
libdir=$(prefix)/lib32
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index ba3645b..c14655b 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -25,7 +25,7 @@
LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
LDSHARED=cc -shared
-VER=1.0.10
+VER=1.0.11beta1
SONUM=2
SHAREDLIB=libpng.so
libdir=$(prefix)
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 686b4e6..ff1dd94 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -31,7 +31,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 2. You should not
# have to change it.
PNGMAJ = 2
-PNGMIN = 1.0.10
+PNGMIN = 1.0.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas
index e070d4f..f025eba 100644
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -5,8 +5,8 @@
interface
const
- PNG_LIBPNG_VER_STRING = '1.0.10';
- PNG_LIBPNG_VER = 10010;
+ PNG_LIBPNG_VER_STRING = '1.0.11beta1';
+ PNG_LIBPNG_VER = 10011;
type
png_uint_32 = Cardinal;
