Imported from libpng-1.0.11.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index c32e364..40efcbf 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.0.11rc1 - April 20, 2001
+Libpng 1.0.11 - April 27, 2001
This is a public release of libpng, intended for use in production codes.
@@ -10,9 +10,9 @@
Changed several "//" single-line comments to C-style in pnggccrd.c
Removed PNGAPI from private functions whose prototypes did not have PNGAPI.
Updated scripts/pngos2.def
- Added makefile.netbsd
Added a check for NULL return from user's malloc_fn().
Removed some useless type casts of the NULL pointer.
+ Added makefile.netbsd
Send comments/corrections/commendations to
png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
diff --git a/CHANGES b/CHANGES
index 401894d..15e9449 100644
--- a/CHANGES
+++ b/CHANGES
@@ -923,11 +923,13 @@
Updated scripts/pngos2.def
version 1.0.11beta3 [April 14, 2001]
Added checking the results of many instances of png_malloc() for NULL
-version 1.0.11rc1 [April 20, 2001]
+version 1.0.11beta4 [April 20, 2001]
Undid the changes from version 1.0.11beta3. Added a check for NULL return
from user's malloc_fn().
Removed some useless type casts of the NULL pointer.
- Added makefile.netbsd .
+ Added makefile.netbsd
+version 1.0.11 [April 27, 2001]
+ Revised makefile.netbsd
Send comments/corrections/commendations to
png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
diff --git a/INSTALL b/INSTALL
index 683808b..e81b1de 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.0.11rc1 - April 20, 2001
+Installing libpng version 1.0.11 - April 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.0.11rc1" or "lpng109" and "zlib-1.1.3"
+might be called "libpng-1.0.11" 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.11rc1)
- makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.11rc1,
+ makefile.linux => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.11)
+ makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.11,
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
@@ -78,9 +78,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.0.11rc1)
+ makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.11)
makefile.sunos => Sun makefile
- makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.11rc1)
+ makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.11)
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 241ce53..d596deb 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,31 +1,7 @@
-Known bugs in libpng-1.0.10
+Known bugs in libpng-1.0.11
-1. April 1, 2001: Missing type casts on png_malloc() calls (Dimitri Papadopolous)
+1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when
+ reading interlaced PNG files, when assembler code is enabled.
- 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.
-
-3. April 5, 2001: The prototypes don't match several functions.
-
- Functions png_info_init, png_zalloc, and several others have PNGAPI
- in the C functions but not in the prototypes in png.h. The functions
- involved are all either deprecated or intended only for internal use.
-
- STATUS: PNGAPI was removed from the C code in libpng-1.0.11beta2.
-
-4. April 14, 2001: Many instances of png_malloc() are not followed by
- a check to make sure it didn't return NULL.
-
- STATUS: This only seems to matter if the user is using a custom
- malloc_fn() that returns NULL. In libpng-1.0.11rc1 the return from
- malloc_fn() will be checked for NULL and png_error() issued if one
- is found.
+ STATUS: Under investigation.
diff --git a/LICENSE b/LICENSE
index 544c536..68f7381 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.11rc1, April 20, 2001, are
+libpng versions 1.0.7, July 1, 2000, through 1.0.11, April 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
@@ -99,4 +99,4 @@
Glenn Randers-Pehrson
randeg@alum.rpi.edu
-April 20, 2001
+April 27, 2001
diff --git a/README b/README
index 320284c..3692bfb 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng 1.0.11rc1 - April 20, 2001 (shared library 2.1)
+README for libpng 1.0.11 - April 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.
@@ -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.11rc1)
+ (gcc, creates libpng.so.2.1.0.11)
makefile.gcmmx => Linux/ELF makefile (gcc, creates
- libpng.so.2.1.0.11rc1, uses assembler code
+ libpng.so.2.1.0.11, 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
@@ -202,10 +202,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.0.11rc1)
+ makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.11)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng.so.2.1.0.11rc1)
+ (gcc, creates libpng.so.2.1.0.11)
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 909f048..84feed2 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- April 20, 2001
+ April 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.0.11rc1 are Y2K compliant. It is my belief that earlier
+ upward through 1.0.11 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 d8bb912..a4eff0f 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
echo "
- There is no \"configure\" script for Libpng-1.0.11rc1. Instead, please
+ There is no \"configure\" script for Libpng-1.0.11. 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 58e6e57..170a384 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "April 20, 2001"
+.TH LIBPNG 3 "April 27, 2001"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.11rc1
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.11
.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.11rc1 - April 20, 2001
+ libpng version 1.0.11 - April 27, 2001
Updated and distributed by Glenn Randers-Pehrson
<randeg@alum.rpi.edu>
Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
@@ -3468,13 +3468,13 @@
.SH VIII. Y2K Compliance in libpng
-April 20, 2001
+April 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.0.11rc1 are Y2K compliant. It is my belief that earlier
+upward through 1.0.11 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
@@ -3585,6 +3585,7 @@
1.0.10 1 10010 2.1.0.10
1.0.11beta1-3 1 10011 2.1.0.11beta1-3
1.0.11rc1 1 10011 2.1.0.11rc1
+ 1.0.11 1 10011 2.1.0.11
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3642,7 +3643,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.0.11rc1 - April 20, 2001:
+Libpng version 1.0.11 - April 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).
@@ -3659,7 +3660,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.11rc1, April 20, 2001, are
+libpng versions 1.0.7, July 1, 2000, through 1.0.11, April 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
@@ -3751,7 +3752,7 @@
Glenn Randers-Pehrson
randeg@alum.rpi.edu
-April 20, 2001
+April 27, 2001
.\" end of man page
diff --git a/libpng.txt b/libpng.txt
index c0330b2..d7f766e 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.11rc1 - April 20, 2001
+ libpng version 1.0.11 - April 27, 2001
Updated and distributed by Glenn Randers-Pehrson
<randeg@alum.rpi.edu>
Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
@@ -2721,13 +2721,13 @@
VIII. Y2K Compliance in libpng
-April 20, 2001
+April 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.0.11rc1 are Y2K compliant. It is my belief that earlier
+upward through 1.0.11 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 7813413..bd7325e 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "April 20, 2001"
+.TH LIBPNGPF 3 "April 27, 2001"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.11rc1
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.11
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index c3b659c..c9eaebc 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "April 20, 2001"
+.TH PNG 5 "April 27, 2001"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index f1cd3f3..e2cf0b7 100644
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
- * libpng version 1.0.11rc1 - April 20, 2001
+ * libpng version 1.0.11 - April 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_0_11rc1 Your_png_h_is_not_version_1_0_11rc1;
+typedef version_1_0_11 Your_png_h_is_not_version_1_0_11;
/* 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.11rc1";
+const char png_libpng_ver[18] = "1.0.11";
/* png_sig was changed to a function in version 1.0.5c */
/* Place to hold the signature string for a PNG file. */
@@ -627,7 +627,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.11rc1 - April 20, 2001\n\
+ return ((png_charp) "\n libpng version 1.0.11 - April 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");
@@ -645,8 +645,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.11rc1");
- return((png_charp) "1.0.11rc1");
+ return((png_charp) "1.0.11");
+ return((png_charp) "1.0.11");
}
png_charp PNGAPI
diff --git a/png.h b/png.h
index 8e85083..a8fc40c 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.0.11rc1 - April 20, 2001
+ * libpng version 1.0.11 - April 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.0.11rc1 - April 20, 2001: Glenn
+ * libpng versions 0.97, January 1998, through 1.0.11 - April 27, 2001: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -69,6 +69,7 @@
* 1.0.10 1 10010 2.1.0.10
* 1.0.11beta1-3 1 10011 2.1.0.11beta1-3
* 1.0.11rc1 1 10011 2.1.0.11rc1
+ * 1.0.11 1 10011 2.1.0.11
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -98,7 +99,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.11rc1, April 20, 2001, are
+ * libpng versions 1.0.7, July 1, 2000, through 1.0.11, April 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
@@ -203,13 +204,13 @@
* Y2K compliance in libpng:
* =========================
*
- * April 20, 2001
+ * April 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.0.11rc1 are Y2K compliant. It is my belief that earlier
+ * upward through 1.0.11 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
@@ -265,7 +266,7 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.0.11rc1"
+#define PNG_LIBPNG_VER_STRING "1.0.11"
#define PNG_LIBPNG_VER_SONUM 2
#define PNG_LIBPNG_VER_DLLNUM %DLLNUM%
@@ -277,7 +278,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 1
+#define PNG_LIBPNG_VER_BUILD 0
#define PNG_LIBPNG_BUILD_ALPHA 1
#define PNG_LIBPNG_BUILD_BETA 2
@@ -285,7 +286,7 @@
#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 3
+#define PNG_LIBPNG_BUILD_TYPE 4
/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
* We must not include leading zeros.
@@ -1186,9 +1187,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.11rc1
+and png.h are both at * version 1.0.11
*/
-typedef png_structp version_1_0_11rc1;
+typedef png_structp version_1_0_11;
typedef png_struct FAR * FAR * png_structpp;
@@ -2236,7 +2237,7 @@
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.0.11rc1 - April 20, 2001 (header)\n"
+ " libpng version 1.0.11 - April 27, 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 0a93de4..1ed10e4 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.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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 59a7dc0..14a0707 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,6 +1,6 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng 1.0.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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 76528b6..c991b53 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,7 +1,7 @@
/* pngerror.c - stub functions for i/o and memory allocation
*
- * libpng 1.0.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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 8648689..b4703ee 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.11rc1 - April 20, 2001
+ * libpng version 1.0.11 - April 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 dd7426a..5348c60 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
/* pngget.c - retrieval of values from info struct
*
- * libpng 1.0.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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 e7fdf8b..425df56 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@
/* pngmem.c - stub functions for memory allocation
*
- * libpng 1.0.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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/pngpread.c b/pngpread.c
index 2c008a2..9b4a9e5 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode
*
- * libpng 1.0.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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/pngread.c b/pngread.c
index d77ecda..f84ede8 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
- * libpng 1.0.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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)
@@ -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.11rc1
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.11
*/
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.11rc1
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.11
*/
void PNGAPI
png_read_image(png_structp png_ptr, png_bytepp image)
diff --git a/pngrio.c b/pngrio.c
index 5fbc668..4290624 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,7 +1,7 @@
/* pngrio.c - functions for data input
*
- * libpng 1.0.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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 6780026..af7631e 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.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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 8ae86ac..284f636 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
- * libpng 1.0.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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 49f9702..61de5dd 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
- * libpng 1.0.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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/pngtest.c b/pngtest.c
index e017ad5..03e7da3 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1,7 +1,7 @@
/* pngtest.c - a simple test program to test libpng
*
- * libpng 1.0.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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)
@@ -1511,4 +1511,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_0_11rc1 your_png_h_is_not_version_1_0_11rc1;
+typedef version_1_0_11 your_png_h_is_not_version_1_0_11;
diff --git a/pngtrans.c b/pngtrans.c
index 4475ab0..a3b80a3 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.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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 c46e3c1..b00a56d 100644
--- a/pngvcrd.c
+++ b/pngvcrd.c
@@ -2,7 +2,7 @@
*
* For Intel x86 CPU and Microsoft Visual C++ compiler
*
- * libpng 1.0.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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 530c885..a5bd457 100644
--- a/pngwio.c
+++ b/pngwio.c
@@ -1,7 +1,7 @@
/* pngwio.c - functions for data output
*
- * libpng 1.0.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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 10c04aa..e0291d3 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file
*
- * libpng 1.0.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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/pngwtran.c b/pngwtran.c
index 7322087..fc18c60 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.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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 a900986..b8c8222 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@
/* pngwutil.c - utilities to write a PNG file
*
- * libpng 1.0.11rc1 - April 20, 2001
+ * libpng 1.0.11 - April 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/projects/msvc/README.txt b/projects/msvc/README.txt
index cc14ab5..7550360 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.11rc1 (April 20, 2001) and zlib
+libpng 1.0.11 (April 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 b5c9b8b..7afd54c 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.11rc1
+;Version 1.0.11
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 80b359b..714555e 100644
--- a/projects/wince/READMEE.WCE
+++ b/projects/wince/READMEE.WCE
@@ -8,9 +8,9 @@
Introduction
============
-This is libpng 1.0.11rc1 ported to WindowsCE 2.0 and 2.11.
-libpng 1.0.11rc1 is a PNG reference library.
-See README, a document of original libpng 1.0.11rc1.
+This is libpng 1.0.11 ported to WindowsCE 2.0 and 2.11.
+libpng 1.0.11 is a PNG reference library.
+See README, a document of original libpng 1.0.11.
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.11rc1, for conditions
+See README and LICENSE, documents of original libpng 1.0.11, for conditions
of use and distribution.
Files
diff --git a/projects/wince/READMEJ.WCE b/projects/wince/READMEJ.WCE
index 8a090de..8c19f86 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.11rc1É
+»Ì¼A±Ì\tgEFAÌpðÉ¢ÄÍA´ÅÅ é libpng 1.0.11É
·éàÌƵܷBÚµÍAt®Ì README,LICENSE ð¨Çݾ³¢B
û^àe
diff --git a/projects/wince/png32ce.def b/projects/wince/png32ce.def
index 83cf33a..e7016ec 100644
--- a/projects/wince/png32ce.def
+++ b/projects/wince/png32ce.def
@@ -5,7 +5,7 @@
LIBRARY lpngce
EXPORTS
-;Version 1.0.11rc1
+;Version 1.0.11
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 3bc88e4..be7691f 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.11rc1
+PNGMIN = 1.0.11
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index c8aa168..46a7b1a 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.11rc1
+PNGMIN = 1.0.11
PNGVER = $(PNGMAJ).$(PNGMIN)
ALIGN=
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 78416b5..76ac4bf 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -39,8 +39,8 @@
# have to change it.
PNGMAJ = 2
#PNGDLL = $1# msvc
-PNGDLL = 2# cygwin 1.0.11rc1
-PNGMIN = 1.0.11rc1
+PNGDLL = 2# cygwin 1.0.11
+PNGMIN = 1.0.11
PNGMIN_BASE = 1.0.11
PNGVER = $(PNGMAJ).$(PNGMIN)
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index a124b72..f1f3746 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.11rc1
+PNGMIN = 1.0.11
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=cc
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index a5aea3b..7f00df1 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.11rc1
+PNGMIN = 1.0.11
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index d1192df..9e6ff2f 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.11rc1
+PNGMIN = 1.0.11
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 7b58513..8899a77 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.11rc1
+PNGMIN = 1.0.11
PNGVER = $(PNGMAJ).$(PNGMIN)
# where make install puts libpng.a and png.h
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 0d561e7..15aad02 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.11rc1
+PNGMIN = 1.0.11
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index d151213..b9032cf 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -1,89 +1,42 @@
-# makefile for libpng on NetBSD
-# Copyright (C) 2001 Glenn Randers-Pehrson
-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
+# makefile for libpng for NetBSD for the standard
+# make obj && make depend && make && make test
+# make includes && make install
+# Copyright (C) 2001 Patrick R.L. Welche
# For conditions of distribution and use, see copyright notice in png.h
-# where make install puts libpng.a and png.h
-# pkgsrc will want prefix=${PREFIX}
-prefix=/usr/local
-INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
+LOCALBASE?=/usr/local
+LIBDIR= ${LOCALBASE}/lib
+MANDIR= ${LOCALBASE}/man
+INCSDIR=${LOCALBASE}/include
-# The zlib library and include files are part of the standard system
+LIB=png
+SHLIB_MAJOR= 2
+SHLIB_MINOR= 1.0.11
+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
+INCS= png.h pngconf.h
+MAN= libpng.3 libpngpf.3 png.5
-# read libpng.txt or png.h to see why PNGMAJ is 2. You should not
-# have to change it.
-PNGMAJ = 2
-PNGMIN = 1.0.11rc1
-PNGVER = $(PNGMAJ).$(PNGMIN)
+CPPFLAGS+=-I${.CURDIR} -DPNG_USE_PNGGCCRD
-CC=cc
-# You can define PNG_ASSEMBLER_CODE_SUPPORTED if building for Intel x86
-CFLAGS=-O2 -DPNG_USE_PNGGCCRD # -DPNG_ASSEMBLER_CODE_SUPPORTED -g -DPNG_DEBUG=1
-LDFLAGS=-Wl,-R${LIBPATH} -L. -lpng -lz -lm
+CPPFLAGS+=-DPNG_NO_ASSEMBLER_CODE
+# something like this for mmx assembler, but it core dumps for me at the moment
+# .if ${MACHINE_ARCH} == "i386"
+# MKLINT= no
+# .else
+# CPPFLAGS+=-DPNG_NO_ASSEMBLER_CODE
+# .endif
-#RANLIB=echo
-RANLIB=ranlib
+CLEANFILES+=pngtest.o pngtest
-OBJS = pnggccrd.o png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+pngtest.o: pngtest.c
+ ${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}
-all: libpng.so libpng.a pngtest
+pngtest: pngtest.o libpng.a
+ ${CC} ${LDFLAGS} ${.ALLSRC} -o${.TARGET} -lz -lm
-libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
- $(RANLIB) $@
+test: pngtest
+ cd ${.CURDIR} && ${.OBJDIR}/pngtest
-libpng.so: libpng.so.$(PNGMAJ)
- ln -f -s libpng.so.$(PNGMAJ) libpng.so
-
-libpng.so.$(PNGMAJ): libpng.so.$(PNGVER)
- ln -f -s libpng.so.$(PNGVER) libpng.so.$(PNGMAJ)
-
-libpng.so.$(PNGVER): $(OBJS)
- $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) -lz -lm
-
-pngtest: pngtest.o libpng.a
- $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-
-test: pngtest
- ./pngtest
-
-install: libpng.a libpng.so.$(PNGVER)
- -@mkdir $(INCPATH)
- -@mkdir $(LIBPATH)
- cp png.h $(INCPATH)
- cp pngconf.h $(INCPATH)
- chmod 644 $(INCPATH)/png.h
- chmod 644 $(INCPATH)/pngconf.h
- cp libpng.a $(LIBPATH)
- cp libpng.so.$(PNGVER) $(LIBPATH)
- chmod 644 $(LIBPATH)/libpng.a
- chmod 644 $(LIBPATH)/libpng.so.$(PNGVER)
- -@/bin/rm -f $(LIBPATH)/libpng.so.$(PNGMAJ) $(LIBPATH)/libpng.so
- (cd $(LIBPATH); ln -f -s libpng.so.$(PNGVER) libpng.so.$(PNGMAJ); \
- ln -f -s libpng.so.$(PNGMAJ) libpng.so)
-
-clean:
- rm -f *.o libpng.a pngtest pngout.png libpng.so*
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-pnggccrd.o: png.h pngconf.h
-png.o: png.h pngconf.h
-pngerror.o: png.h pngconf.h
-pngrio.o: png.h pngconf.h
-pngwio.o: png.h pngconf.h
-pngmem.o: png.h pngconf.h
-pngset.o: png.h pngconf.h
-pngget.o: png.h pngconf.h
-pngread.o: png.h pngconf.h
-pngrtran.o: png.h pngconf.h
-pngrutil.o: png.h pngconf.h
-pngtest.o: png.h pngconf.h
-pngtrans.o: png.h pngconf.h
-pngwrite.o: png.h pngconf.h
-pngwtran.o: png.h pngconf.h
-pngwutil.o: png.h pngconf.h
-pngpread.o: png.h pngconf.h
+.include <bsd.lib.mk>
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 9a8661f..546adc3 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.11rc1
+PNGMIN = 1.0.11
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index baddb56..4431112 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.11rc1
-LIBS=libpng.so.1.0.11rc1
+VER=1.0.11
+LIBS=libpng.so.1.0.11
SHAREDLIB=libpng.so
libdir=$(prefix)/lib32
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 3504eb5..50831c9 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.11rc1
+VER=1.0.11
SONUM=2
SHAREDLIB=libpng.so
libdir=$(prefix)
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 8de6fd6..0a972f7 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.11rc1
+PNGMIN = 1.0.11
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas
index 522b165..583ab48 100644
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -7,7 +7,7 @@
interface
const
- PNG_LIBPNG_VER_STRING = '1.0.11rc1';
+ PNG_LIBPNG_VER_STRING = '1.0.11';
PNG_LIBPNG_VER = 10011;
type
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index c885bbd..b4b73f7 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.0.11rc1
+; Version 1.0.11
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
