Imported from libpng-1.2.4rc1.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 27f0859..ce0a192 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.2.4beta3 - June 28, 2002
+Libpng 1.2.4rc1 - July 2, 2002
This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version.
@@ -20,11 +20,14 @@
Added "test-installed" targets to makefile.linux, makefile.gcmmx,
makefile.sgi, and makefile.sggcc.
version 1.2.4beta3 [June 28, 2002]
- Plug memory leak of row_buf in pngtest.c when there is a png_error().
+ Plugged memory leak of row_buf in pngtest.c when there is a png_error().
Detect buffer overflow in pngpread.c when IDAT is corrupted with extra data.
Added "test-installed" target to makefile.32sunu, makefile.64sunu,
makefile.beos, makefile.darwin, makefile.dec, makefile.macosx,
- makefile.solaris, and makefile.so9.
+ makefile.solaris, makefile.hpux, makefile.hpgcc, and makefile.so9.
+version 1.2.4rc1 [July 2, 2002]
+ Added "test-installed" target to makefile.cygwin and makefile.sco.
+ Revised pnggccrd.c to be able to back out version 1.0.x via PNG_1_0_X macro.
Send comments/corrections/commendations to
png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
diff --git a/CHANGES b/CHANGES
index 15b3e28..e9ba20c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1139,11 +1139,14 @@
Added "test-installed" target to makefile.linux, makefile.gcmmx,
makefile.sgi, and makefile.sggcc.
version 1.2.4beta3 [June 28, 2002]
- Plug memory leak of row_buf in pngtest.c when there is a png_error().
+ Plugged memory leak of row_buf in pngtest.c when there is a png_error().
Detect buffer overflow in pngpread.c when IDAT is corrupted with extra data.
Added "test-installed" target to makefile.32sunu, makefile.64sunu,
makefile.beos, makefile.darwin, makefile.dec, makefile.macosx,
- makefile.solaris, and makefile.so9.
+ makefile.solaris, makefile.hpux, makefile.hpgcc, and makefile.so9.
+version 1.2.4rc1 [July 2, 2002]
+ Added "test-installed" target to makefile.cygwin and makefile.sco.
+ Revised pnggccrd.c to be able to back out version 1.0.x via PNG_1_0_X macro.
Send comments/corrections/commendations to
png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
diff --git a/INSTALL b/INSTALL
index 2589a43..a00b1c3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.4beta3 - June 28, 2002
+Installing libpng version 1.2.4rc1 - July 2, 2002
Before installing libpng, you must first install zlib. zlib
can usually be found wherever you got libpng. zlib can be
@@ -10,7 +10,7 @@
version of zlib that's installed.
You can rename the directories that you downloaded (they
-might be called "libpng-1.2.4beta3" or "lpng109" and "zlib-1.1.4"
+might be called "libpng-1.2.4rc1" or "lpng109" and "zlib-1.1.4"
or "zlib114") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:
@@ -68,8 +68,8 @@
include
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
- makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.4beta3)
- makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.4beta3,
+ makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.4rc1)
+ makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.4rc1,
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
@@ -90,10 +90,10 @@
makefile.ne0bsd => NetBSD/cc makefile, uses PNGGCCRD, makes libpng0.so
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
- makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.4beta3)
+ makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.4rc1)
makefile.sunos => Sun makefile
- makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.4beta3)
- makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.4beta3)
+ makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.4rc1)
+ makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.4rc1)
makefile.32sunu => Sun Ultra 32-bit makefile
makefile.64sunu => Sun Ultra 64-bit makefile
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
@@ -158,9 +158,9 @@
mangle.in => Function-decoration macros added to png.h by the
makefiles.
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12m.so.0.1.2.4beta3)
+ (gcc, creates libpng12m.so.0.1.2.4rc1)
makefile.gcmmx => Linux/ELF makefile (gcc, creates
- libpng12.so.0m.1.2.4beta3, uses assembler code
+ libpng12.so.0m.1.2.4rc1, uses assembler code
tuned for Intel MMX platform)
makefile.sgi => Silicon Graphics (cc, creates libpng12m.so)
makefile.sggcc => Silicon Graphics (gcc, creates libpng12m.so)
diff --git a/KNOWNBUG b/KNOWNBUG
index 64ba734..e0e22a6 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,15 +1,7 @@
-Known bugs in libpng version 1.2.4beta3
+Known bugs in libpng version 1.2.4rc1
-1. May 28, 2002: Makefile.so9 has bugs. The last line under the
- install-headers target should be
-
- (cd $(DI); ln -f -s $(LIBNAME) libpng; ln -f -s $(LIBNAME)/* .)
-
- and the last line under the install-static target should be
-
-
-2. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when
+1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when
reading interlaced PNG files, when assembler code is enabled.
STATUS: Under investigation. The change to pnggccrd.c in libpng-1.2.1
diff --git a/LICENSE b/LICENSE
index e7b12b0..9652186 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.4beta3, June 28, 2002, are
+libpng versions 1.0.7, July 1, 2000, through 1.2.4rc1, July 2, 2002, are
Copyright (c) 2000-2002 Glenn Randers-Pehrson
and are distributed according to the same disclaimer and license as libpng-1.0.6
with the following individuals added to the list of Contributing Authors
@@ -99,4 +99,4 @@
Glenn Randers-Pehrson
randeg@alum.rpi.edu
-June 28, 2002
+July 2, 2002
diff --git a/README b/README
index 5ca7fdb..4d52fdd 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng 1.2.4beta3 - June 28, 2002 (shared library 12.0)
+README for libpng 1.2.4rc1 - July 2, 2002 (shared library 12.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@@ -187,9 +187,9 @@
descrip.mms => VMS makefile for MMS or MMK
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.4beta3)
+ (gcc, creates libpng12.so.0.1.2.4rc1)
makefile.gcmmx => Linux/ELF makefile (gcc, creates
- libpng12.so.0.1.2.4beta3, uses assembler code
+ libpng12.so.0.1.2.4rc1, 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
@@ -210,12 +210,12 @@
makefile.ne0bsd => NetBSD/cc makefile, PNGGCCRD, makes libpng0.so
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
- makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.4beta3)
+ makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.4rc1)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng12.so.0.1.2.4beta3)
+ (gcc, creates libpng12.so.0.1.2.4rc1)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng12.so.0.1.2.4beta3)
+ (gcc, creates libpng12.so.0.1.2.4rc1)
makefile.32sunu => Sun Ultra 32-bit makefile
makefile.64sunu => Sun Ultra 64-bit makefile
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
@@ -248,9 +248,9 @@
mangle.in => Function-decoration macros added to png.h by the
makefiles.
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12m.so.0.1.2.4beta3)
+ (gcc, creates libpng12m.so.0.1.2.4rc1)
makefile.gcmmx => Linux/ELF makefile (gcc, creates
- libpng12.so.0m.1.2.4beta3, uses assembler code
+ libpng12.so.0m.1.2.4rc1, uses assembler code
tuned for Intel MMX platform)
makefile.sgi => Silicon Graphics (cc, creates libpng12m.so)
makefile.sggcc => Silicon Graphics (gcc, creates libpng12m.so)
diff --git a/Y2KINFO b/Y2KINFO
index be27507..e7423dc 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- June 28, 2002
+ July 2, 2002
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
- upward through 1.2.4beta3 are Y2K compliant. It is my belief that earlier
+ upward through 1.2.4rc1 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 4bd62f9..08db447 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
echo "
- There is no \"configure\" script for Libpng-1.2.4beta3. Instead, please
+ There is no \"configure\" script for Libpng-1.2.4rc1. Instead, please
copy the appropriate makefile for your system from the \"scripts\"
directory. Read the INSTALL file for more details.
"
diff --git a/contrib/pngsuite/README b/contrib/pngsuite/README
new file mode 100644
index 0000000..714d12c
--- /dev/null
+++ b/contrib/pngsuite/README
@@ -0,0 +1,85 @@
+
+pngsuite
+--------
+(c) Willem van Schaik, 1999
+
+Permission to use, copy, and distribute these images for any purpose and
+without fee is hereby granted.
+
+These 15 images are part of the much larger PngSuite test-set of
+images, available for developers of PNG supporting software. The
+complete set, available at http:/www.schaik.com/pngsuite/, contains
+a variety of images to test interlacing, gamma settings, ancillary
+chunks, etc.
+
+The images in this directory represent the basic PNG color-types:
+grayscale (1-16 bit deep), full color (8 or 16 bit), paletted
+(1-8 bit) and grayscale or color images with alpha channel. You
+can use them to test the proper functioning of PNG software.
+
+ filename depth type
+ ------------ ------ --------------
+ basn0g01.png 1-bit grayscale
+ basn0g02.png 2-bit grayscale
+ basn0g04.png 4-bit grayscale
+ basn0g08.png 8-bit grayscale
+ basn0g16.png 16-bit grayscale
+ basn2c08.png 8-bit truecolor
+ basn2c16.png 16-bit truecolor
+ basn3p01.png 1-bit paletted
+ basn3p02.png 2-bit paletted
+ basn3p04.png 4-bit paletted
+ basn3p08.png 8-bit paletted
+ basn4a08.png 8-bit gray with alpha
+ basn4a16.png 16-bit gray with alpha
+ basn6a08.png 8-bit RGBA
+ basn6a16.png 16-bit RGBA
+
+Here is the correct result of typing "pngtest -m *.png" in
+this directory:
+
+Testing basn0g01.png: PASS (524 zero samples)
+ Filter 0 was used 32 times
+Testing basn0g02.png: PASS (448 zero samples)
+ Filter 0 was used 32 times
+Testing basn0g04.png: PASS (520 zero samples)
+ Filter 0 was used 32 times
+Testing basn0g08.png: PASS (3 zero samples)
+ Filter 1 was used 9 times
+ Filter 4 was used 23 times
+Testing basn0g16.png: PASS (1 zero samples)
+ Filter 1 was used 1 times
+ Filter 2 was used 31 times
+Testing basn2c08.png: PASS (6 zero samples)
+ Filter 1 was used 5 times
+ Filter 4 was used 27 times
+Testing basn2c16.png: PASS (592 zero samples)
+ Filter 1 was used 1 times
+ Filter 4 was used 31 times
+Testing basn3p01.png: PASS (512 zero samples)
+ Filter 0 was used 32 times
+Testing basn3p02.png: PASS (448 zero samples)
+ Filter 0 was used 32 times
+Testing basn3p04.png: PASS (544 zero samples)
+ Filter 0 was used 32 times
+Testing basn3p08.png: PASS (4 zero samples)
+ Filter 0 was used 32 times
+Testing basn4a08.png: PASS (32 zero samples)
+ Filter 1 was used 1 times
+ Filter 4 was used 31 times
+Testing basn4a16.png: PASS (64 zero samples)
+ Filter 0 was used 1 times
+ Filter 1 was used 2 times
+ Filter 2 was used 1 times
+ Filter 4 was used 28 times
+Testing basn6a08.png: PASS (160 zero samples)
+ Filter 1 was used 1 times
+ Filter 4 was used 31 times
+Testing basn6a16.png: PASS (1072 zero samples)
+ Filter 1 was used 4 times
+ Filter 4 was used 28 times
+libpng passes test
+
+Willem van Schaik
+<willem@schaik.com>
+October 1999
diff --git a/libpng.3 b/libpng.3
index 0f4ed9e..8b0f992 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "June 28, 2002"
+.TH LIBPNG 3 "July 2, 2002"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.4beta3
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.4rc1
.SH SYNOPSIS
\fI\fB
@@ -791,7 +791,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.4beta3 - June 28, 2002
+ libpng version 1.2.4rc1 - July 2, 2002
Updated and distributed by Glenn Randers-Pehrson
<randeg@alum.rpi.edu>
Copyright (c) 1998-2002 Glenn Randers-Pehrson
@@ -3641,13 +3641,13 @@
.SH IX. Y2K Compliance in libpng
-June 28, 2002
+July 2, 2002
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.4beta3 are Y2K compliant. It is my belief that earlier
+upward through 1.2.4rc1 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
@@ -3779,6 +3779,7 @@
1.2.3rc1-6 12 10203 12.so.0.1.2.3rc1-6
1.2.3 12 10203 12.so.0.1.2.3
1.2.4beta1-3 13 10204 12.so.0.1.2.4beta1-3
+ 1.2.4rc1 13 10204 12.so.0.1.2.4rc1
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3836,7 +3837,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.4beta3 - June 28, 2002:
+Libpng version 1.2.4rc1 - July 2, 2002:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu).
@@ -3853,7 +3854,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.4beta3, June 28, 2002, are
+libpng versions 1.0.7, July 1, 2000, through 1.2.4rc1, July 2, 2002, are
Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.0.6
with the following individuals added to the list of Contributing Authors
@@ -3945,7 +3946,7 @@
Glenn Randers-Pehrson
randeg@alum.rpi.edu
-June 28, 2002
+July 2, 2002
.\" end of man page
diff --git a/libpng.txt b/libpng.txt
index 835d039..cb61618 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.4beta3 - June 28, 2002
+ libpng version 1.2.4rc1 - July 2, 2002
Updated and distributed by Glenn Randers-Pehrson
<randeg@alum.rpi.edu>
Copyright (c) 1998-2002 Glenn Randers-Pehrson
@@ -2850,13 +2850,13 @@
IX. Y2K Compliance in libpng
-June 28, 2002
+July 2, 2002
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.4beta3 are Y2K compliant. It is my belief that earlier
+upward through 1.2.4rc1 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 06d55b4..d922e3c 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "June 28, 2002"
+.TH LIBPNGPF 3 "July 2, 2002"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.4beta3
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.4rc1
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 9f227d7..4dd918d 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "June 28, 2002"
+.TH PNG 5 "July 2, 2002"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index e3eb13c..7eea330 100644
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
- * libpng version 1.2.4beta3 - June 28, 2002
+ * libpng version 1.2.4rc1 - July 2, 2002
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -13,14 +13,14 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_4beta3 Your_png_h_is_not_version_1_2_4beta3;
+typedef version_1_2_4rc1 Your_png_h_is_not_version_1_2_4rc1;
/* 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.4beta3";
+const char png_libpng_ver[18] = "1.2.4rc1";
/* png_sig was changed to a function in version 1.0.5c */
/* Place to hold the signature string for a PNG file. */
@@ -135,7 +135,11 @@
}
/* Function to allocate memory for zlib and clear it to 0. */
+#ifdef PNG_1_0_X
+void PNGAPI
+#else
voidpf /* private */
+#endif
png_zalloc(voidpf png_ptr, uInt items, uInt size)
{
png_uint_32 num_bytes = (png_uint_32)items * size;
@@ -166,7 +170,11 @@
}
/* function to free memory for zlib */
+#ifdef PNG_1_0_X
+void PNGAPI
+#else
void /* private */
+#endif
png_zfree(voidpf png_ptr, voidpf ptr)
{
png_free((png_structp)png_ptr, (png_voidp)ptr);
@@ -663,7 +671,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.4beta3 - June 28, 2002\n\
+ return ((png_charp) "\n libpng version 1.2.4rc1 - July 2, 2002\n\
Copyright (c) 1998-2002 Glenn Randers-Pehrson\n\
Copyright (c) 1996-1997 Andreas Dilger\n\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
@@ -681,8 +689,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.4beta3");
- return((png_charp) "1.2.4beta3");
+ return((png_charp) "1.2.4rc1");
+ return((png_charp) "1.2.4rc1");
}
png_charp PNGAPI
diff --git a/png.h b/png.h
index 28fa1cc..1236b92 100644
--- a/png.h
+++ b/png.h
@@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.4beta3 - June 28, 2002
+ * libpng version 1.2.4rc1 - July 2, 2002
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -8,7 +8,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.4beta3 - June 28, 2002: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.4rc1 - July 2, 2002: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -89,6 +89,8 @@
* 1.2.3rc1-6 12 10203 12.so.0.1.2.3rc1-6
* 1.2.3 12 10203 12.so.0.1.2.3
* 1.2.4beta1-3 13 10204 12.so.0.1.2.4beta1-3
+ * 1.0.14rc1 13 10014 10.so.0.1.0.14rc1
+ * 1.2.4rc1 13 10204 12.so.0.1.2.4rc1
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -118,7 +120,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.4beta3, June 28, 2002, are
+ * libpng versions 1.0.7, July 1, 2000, through 1.2.4rc1, July 2, 2002, are
* Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.0.6
* with the following individuals added to the list of Contributing Authors
@@ -223,13 +225,13 @@
* Y2K compliance in libpng:
* =========================
*
- * June 28, 2002
+ * July 2, 2002
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
- * upward through 1.2.4beta3 are Y2K compliant. It is my belief that earlier
+ * upward through 1.2.4rc1 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
@@ -285,7 +287,7 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.4beta3"
+#define PNG_LIBPNG_VER_STRING "1.2.4rc1"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM %DLLNUM%
@@ -297,7 +299,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 3
+#define PNG_LIBPNG_VER_BUILD 1
#define PNG_LIBPNG_BUILD_ALPHA 1
#define PNG_LIBPNG_BUILD_BETA 2
@@ -305,7 +307,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 2
+#define PNG_LIBPNG_BUILD_TYPE 3
/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
* We must not include leading zeros.
@@ -1259,10 +1261,11 @@
png_free_ptr free_fn; /* function for freeing memory */
#endif
+/* New member added in libpng-1.0.13 and 1.2.0 */
png_bytep big_row_buf; /* buffer to save current (unfiltered) row */
#if defined(PNG_READ_DITHER_SUPPORTED)
-/* The following three members were added at version 1.2.4 */
+/* The following three members were added at version 1.0.14 and 1.2.4 */
png_bytep dither_sort; /* working sort array */
png_bytep index_to_palette; /* where the original index currently is */
/* in the palette */
@@ -1274,9 +1277,9 @@
/* This prevents a compiler error in png.c if png.c and png.h are both at
- version 1.2.4beta3
+ version 1.2.4rc1
*/
-typedef png_structp version_1_2_4beta3;
+typedef png_structp version_1_2_4rc1;
typedef png_struct FAR * FAR * png_structpp;
@@ -1536,7 +1539,7 @@
extern PNG_EXPORT(void,png_read_update_info) PNGARG((png_structp png_ptr,
png_infop info_ptr));
-/* read a one or more rows of image data. */
+/* read one or more rows of image data. */
extern PNG_EXPORT(void,png_read_rows) PNGARG((png_structp png_ptr,
png_bytepp row, png_bytepp display_row, png_uint_32 num_rows));
@@ -1826,13 +1829,26 @@
extern PNG_EXPORT(png_voidp,png_malloc) PNGARG((png_structp png_ptr,
png_uint_32 size));
+#if defined(PNG_1_0_X)
+# define png_malloc_warn png_malloc
+#else
/* Added at libpng version 1.2.4 */
extern PNG_EXPORT(png_voidp,png_malloc_warn) PNGARG((png_structp png_ptr,
png_uint_32 size));
+#endif
/* frees a pointer allocated by png_malloc() */
extern PNG_EXPORT(void,png_free) PNGARG((png_structp png_ptr, png_voidp ptr));
+#if defined(PNG_1_0_X)
+/* Function to allocate memory for zlib. */
+extern PNG_EXPORT(voidpf,png_zalloc) PNGARG((voidpf png_ptr, uInt items,
+ uInt size));
+
+/* Function to free memory for zlib */
+extern PNG_EXPORT(void,png_zfree) PNGARG((voidpf png_ptr, voidpf ptr));
+#endif
+
/* Free data that was allocated internally */
extern PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr,
png_infop info_ptr, png_uint_32 free_me, int num));
@@ -2403,7 +2419,7 @@
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.4beta3 - June 28, 2002 (header)\n"
+ " libpng version 1.2.4rc1 - July 2, 2002 (header)\n"
#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
/* With these routines we avoid an integer divide, which will be slower on
@@ -2674,6 +2690,7 @@
PNG_EXTERN void png_info_destroy PNGARG((png_structp png_ptr,
png_infop info_ptr));
+#ifndef PNG_1_0_X
/* Function to allocate memory for zlib. */
PNG_EXTERN voidpf png_zalloc PNGARG((voidpf png_ptr, uInt items, uInt size));
@@ -2699,6 +2716,12 @@
PNG_EXTERN void PNGAPI png_default_flush PNGARG((png_structp png_ptr));
#endif
#endif
+#else /* PNG_1_0_X */
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+PNG_EXTERN void png_push_fill_buffer PNGARG((png_structp png_ptr,
+ png_bytep buffer, png_size_t length));
+#endif
+#endif /* PNG_1_0_X */
/* Reset the CRC variable */
PNG_EXTERN void png_reset_crc PNGARG((png_structp png_ptr));
@@ -2863,7 +2886,7 @@
png_charp text));
#endif
-#if defined(PNG_TEXT_SUPPORTED) /* Added at version 1.2.4 */
+#if defined(PNG_TEXT_SUPPORTED) /* Added at version 1.0.14 and 1.2.4 */
PNG_EXTERN int png_set_text_2 PNGARG((png_structp png_ptr,
png_infop info_ptr, png_textp text_ptr, int num_text));
#endif
diff --git a/pngasmrd.h b/pngasmrd.h
index 294d8fd..2aa837c 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.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 2002 Glenn Randers-Pehrson
*
diff --git a/pngconf.h b/pngconf.h
index 7357194..5a26c8c 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,6 +1,6 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng 1.2.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngerror.c b/pngerror.c
index 1d39647..912aef2 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,7 +1,7 @@
/* pngerror.c - stub functions for i/o and memory allocation
*
- * libpng 1.2.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pnggccrd.c b/pnggccrd.c
index 5c1a9cc..eb35ab0 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.4beta3 - June 28, 2002
+ * libpng version 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* Copyright (c) 1998, Intel Corporation
@@ -1504,8 +1504,10 @@
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
if (_mmx_supported == 2) {
+#if !defined(PNG_1_0_X)
/* this should have happened in png_init_mmx_flags() already */
png_warning(png_ptr, "asm_flags may not have been initialized");
+#endif
png_mmx_support();
}
#endif
@@ -5135,11 +5137,11 @@
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
#if !defined(PNG_1_0_X)
if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_SUB) &&
-#else
- if (
-#endif
(row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) &&
(row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold))
+#else
+ if (_mmx_supported)
+#endif
{
png_read_filter_row_mmx_sub(row_info, row);
}
@@ -5164,11 +5166,11 @@
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
#if !defined(PNG_1_0_X)
if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_UP) &&
-#else
- if (
-#endif
(row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) &&
(row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold))
+#else
+ if (_mmx_supported)
+#endif
{
png_read_filter_row_mmx_up(row_info, row, prev_row);
}
@@ -5192,11 +5194,11 @@
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
#if !defined(PNG_1_0_X)
if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_AVG) &&
-#else
- if (
-#endif
(row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) &&
(row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold))
+#else
+ if (_mmx_supported)
+#endif
{
png_read_filter_row_mmx_avg(row_info, row, prev_row);
}
@@ -5230,11 +5232,11 @@
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
#if !defined(PNG_1_0_X)
if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_PAETH) &&
-#else
- if (
-#endif
(row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) &&
(row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold))
+#else
+ if (_mmx_supported)
+#endif
{
png_read_filter_row_mmx_paeth(row_info, row, prev_row);
}
diff --git a/pngget.c b/pngget.c
index bf6292c..300671e 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
/* pngget.c - retrieval of values from info struct
*
- * libpng 1.2.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngmem.c b/pngmem.c
index bd69095..5752566 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@
/* pngmem.c - stub functions for memory allocation
*
- * libpng 1.2.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -494,7 +494,10 @@
#endif /* Not Borland DOS special memory handler */
-/* This function was added at libpng version 1.3.0. The png_malloc_warn()
+#if defined(PNG_1_0_X)
+# define png_malloc_warn png_malloc
+#else
+/* This function was added at libpng version 1.2.3. The png_malloc_warn()
* function will issue a png_warning and return NULL instead of issuing a
* png_error, if it fails to allocate the requested memory.
*/
@@ -509,6 +512,7 @@
png_ptr->flags=save_flags;
return(ptr);
}
+#endif
png_voidp PNGAPI
png_memcpy_check (png_structp png_ptr, png_voidp s1, png_voidp s2,
diff --git a/pngpread.c b/pngpread.c
index f33172a..33cc235 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode
*
- * libpng 1.2.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngread.c b/pngread.c
index f557b24..456a105 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
- * libpng 1.2.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -793,7 +793,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.4beta3
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.4rc1
*/
void PNGAPI
@@ -842,7 +842,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.4beta3
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.4rc1
*/
void PNGAPI
png_read_image(png_structp png_ptr, png_bytepp image)
diff --git a/pngrio.c b/pngrio.c
index 385fafa..86e515c 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,7 +1,7 @@
/* pngrio.c - functions for data input
*
- * libpng 1.2.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrtran.c b/pngrtran.c
index 52e5cee..5a0b7a1 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.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrutil.c b/pngrutil.c
index dadbf38..dfc658e 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
- * libpng 1.2.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngset.c b/pngset.c
index 03f0577..89d09a0 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
- * libpng 1.2.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngtest.c b/pngtest.c
index 014441e..f7d3f7b 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1,7 +1,7 @@
/* pngtest.c - a simple test program to test libpng
*
- * libpng 1.2.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -117,7 +117,13 @@
static int status_dots=1;
void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
void
read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
{
@@ -137,8 +143,14 @@
fprintf(stdout, "r");
}
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
void
write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
void
write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
{
@@ -153,8 +165,14 @@
5 in case illegal filter values are present.) */
static png_uint_32 filters_used[256];
void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data);
void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data)
{
if(png_ptr != NULL && row_info != NULL)
@@ -169,8 +187,14 @@
static png_uint_32 zero_samples;
void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data);
void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)
{
png_bytep dp = data;
@@ -1514,4 +1538,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_4beta3 your_png_h_is_not_version_1_2_4beta3;
+typedef version_1_2_4rc1 your_png_h_is_not_version_1_2_4rc1;
diff --git a/pngtrans.c b/pngtrans.c
index f9960f2..eb480dd 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.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngvcrd.c b/pngvcrd.c
index 25b5863..6431f65 100644
--- a/pngvcrd.c
+++ b/pngvcrd.c
@@ -2,7 +2,7 @@
*
* For Intel x86 CPU and Microsoft Visual C++ compiler
*
- * libpng version 1.2.4beta3 - June 28, 2002
+ * libpng version 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* Copyright (c) 1998, Intel Corporation
diff --git a/pngwio.c b/pngwio.c
index 9f85e7d..9feb865 100644
--- a/pngwio.c
+++ b/pngwio.c
@@ -1,7 +1,7 @@
/* pngwio.c - functions for data output
*
- * libpng 1.2.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwrite.c b/pngwrite.c
index 8dac809..a21b595 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file
*
- * libpng 1.2.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwtran.c b/pngwtran.c
index 2a7566a..e46a40c 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.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwutil.c b/pngwutil.c
index d48ccf2..642b37e 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@
/* pngwutil.c - utilities to write a PNG file
*
- * libpng 1.2.4beta3 - June 28, 2002
+ * libpng 1.2.4rc1 - July 2, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/projects/msvc/README.txt b/projects/msvc/README.txt
index 19a86eb..4a8ff69 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.4beta3 (June 28, 2002) and zlib
+libpng 1.2.4rc1 (July 2, 2002) and zlib
Copyright (C) 2000 Simon-Pierre Cadieux
For conditions of distribution and use, see copyright notice in png.h
diff --git a/projects/msvc/png32ms.def b/projects/msvc/png32ms.def
index 0447330..524a97a 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.4beta3
+;Version 1.2.4rc1
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
diff --git a/projects/netware.txt b/projects/netware.txt
index fd7ff66..27025d2 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.4beta3-project-netware.zip from a libpng distribution
+libpng-1.2.4rc1-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.4beta3-project-netware.zip"
+"unzip -a libpng-1.2.4rc1-project-netware.zip"
diff --git a/projects/wince.txt b/projects/wince.txt
index b378a37..e560009 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.4beta3-project-wince.zip from a libpng distribution
+libpng-1.2.4rc1-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.4beta3-project-wince.zip"
+"unzip -a libpng-1.2.4rc1-project-wince.zip"
diff --git a/scripts/libpng-config-body.in b/scripts/libpng-config-body.in
index ad3697f..8995df8 100755
--- a/scripts/libpng-config-body.in
+++ b/scripts/libpng-config-body.in
@@ -11,6 +11,7 @@
--cflags print compiler flags
--cppflags print pre-processor flags
--ldflags print loader flags
+ --rpath print path to shared library
--help display this help and exit
--version output version information
EOF
@@ -50,6 +51,10 @@
echo ${libs}
;;
+ --rpath)
+ echo ${rpath}
+ ;;
+
--ldflags)
echo ${ldflags}
;;
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index 3101ecf..14b9f00 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,10 +8,11 @@
# Modeled after libxml-config.
-version=1.2.4beta3
+version=1.2.4rc1
prefix=""
cppflags=""
cflags=""
ldflags=""
libs=""
+rpath=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 05a8d17..dee0b0f 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -6,6 +6,6 @@
Name: libpng12
Description: Loads and saves PNG files
-Version: 1.2.4beta3
+Version: 1.2.4rc1
Libs: -L${libdir} -lpng12 -lz -lm
Cflags: -I${includedir}/libpng12
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 727e577..d6c6c4b 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -1,4 +1,4 @@
-# makefile for libpng on Solaris 2.x with gcc
+# makefile for libpng on Solaris 2.x with cc
# Contributed by William L. Sebok, based on makefile.linux
# Copyright (C) 2002 Glenn Randers-Pehrson
# Copyright (C) 1998 Greg Roelofs
@@ -33,7 +33,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
@@ -182,7 +182,7 @@
`$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
-o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \
$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
- pngtesti pngtest.png
+ ./pngtesti pngtest.png
clean:
/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 8df2aee..e65bbfa 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -1,4 +1,4 @@
-# makefile for libpng on Solaris 2.x with gcc
+# makefile for libpng on Solaris 2.x with cc
# Contributed by William L. Sebok, based on makefile.linux
# Copyright (C) 2002 Glenn Randers-Pehrson
# Copyright (C) 1998 Greg Roelofs
@@ -33,7 +33,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
@@ -182,7 +182,7 @@
`$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
-o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \
$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
- pngtesti pngtest.png
+ ./pngtesti pngtest.png
clean:
/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 7c7d437..7e225a6 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -17,7 +17,7 @@
RM = rm -f
PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index accda9d..7e5e220 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -12,7 +12,7 @@
ZLIBINC=/usr/local/include
PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
ALIGN=
@@ -168,7 +168,7 @@
`$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
- pngtesti pngtest.png
+ ./pngtesti pngtest.png
clean:
/bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 6039746..d4c4a27 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -79,7 +79,7 @@
LIBNAME = libpng12
PNGMAJ = 0
PNGDLL = 13
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(PNGDLL).dll
@@ -150,7 +150,7 @@
echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo cflags=\"\"; \
echo ldflags=\"-L$(LIBPATH)\"; \
- echo libs=\"-lpng$(PNGDLL) -lz\"; \
+ echo libs=\"-lpng$(PNGMAJ) -lz\"; \
cat $(S)/scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config
@@ -258,13 +258,22 @@
gytiu=$$(( $$gytiu + 1 )); \
done
-
install: install-static install-shared install-man install-config
+# If you installed in $(DESTDIR), test-installed won't work until you
+# move the library to its final location.
+
+test-installed:
+ $(CC) $(CFLAGS) \
+ `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
+ -L$(ZLIBLIB) \
+ -o pngtesti$(EXE) `$(BINPATH)/libpng12-config --ldflags --libs`
+ ./pngtesti$(EXE) pngtest.png
+
clean:
/bin/rm -f *.pic.o *.o $(STATLIB) $(IMPLIB) $(SHAREDLIB) \
pngtest-stat$(EXE) pngtest$(EXE) pngout.png $(SHAREDDEF) \
- libpng-config libpng.pc
+ libpng-config libpng.pc pngtesti$(EXE)
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
writelock:
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 55e9222..af57de5 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -23,7 +23,7 @@
RANLIB=ranlib
PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -164,7 +164,7 @@
`$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
-L$(ZLIBLIB) \
-o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
- pngtesti pngtest.png
+ ./pngtesti pngtest.png
clean:
rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index d57877e..71cd35d 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -32,7 +32,7 @@
ZLIBINC=../zlib
PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -150,7 +150,7 @@
`$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
-L$(ZLIBLIB) -R$(ZLIBLIB) \
-o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
- pngtesti pngtest.png
+ ./pngtesti pngtest.png
clean:
/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 4d9d0c4..2b0da02 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -15,7 +15,7 @@
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=gcc
@@ -211,7 +211,7 @@
`$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
- pngtesti pngtest.png
+ ./pngtesti pngtest.png
clean:
/bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index 895f7cc..17f05a8 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -33,7 +33,7 @@
#RANLIB=echo
PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -173,7 +173,7 @@
`$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
- pngtesti pngtest.png
+ ./pngtesti pngtest.png
clean:
/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 8762163..25f7614 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -17,7 +17,7 @@
RANLIB=ranlib
PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -158,7 +158,7 @@
`$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
-L$(ZLIBLIB) \
-o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
- pngtesti pngtest.png
+ ./pngtesti pngtest.png
clean:
/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 2c73f5f..a4a4441 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -5,7 +5,7 @@
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=gcc
@@ -183,7 +183,7 @@
`$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
- pngtesti pngtest.png
+ ./pngtesti pngtest.png
clean:
/bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx
index cf28ccc..3a0041d 100644
--- a/scripts/makefile.macosx
+++ b/scripts/makefile.macosx
@@ -17,7 +17,7 @@
CC=cc
PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
@@ -158,7 +158,7 @@
`$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
-L$(ZLIBLIB) \
-o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
- pngtesti pngtest.png
+ ./pngtesti pngtest.png
clean:
rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 0a1a241..d77c4db 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.4beta3
+SHLIB_MINOR= 1.2.4rc1
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.netbsd b/scripts/makefile.netbsd
index db45711..1345a4a 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.2.4beta3
+SHLIB_MINOR= 1.2.4rc1
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.openbsd b/scripts/makefile.openbsd
index 569c8c7..85825f6 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -7,7 +7,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.4beta3
+SHLIB_MINOR= 1.2.4rc1
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 6976f87..40ea9f5 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -24,7 +24,7 @@
RANLIB=echo
PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -94,7 +94,6 @@
test: pngtest
./pngtest
-
install-headers: png.h pngconf.h
-@if [ ! -d $(DI) ]; then mkdir $(DI); fi
-@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi
@@ -155,6 +154,20 @@
install: install-static install-shared install-man install-config
+# If you installed in $(DESTDIR), test-installed won't work until you
+# move the library to its final location.
+
+test-installed:
+ $(CC) $(CFLAGS) \
+ `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
+ -L$(ZLIBLIB) \
+ -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
+ ./pngtesti pngtest.png
+
+clean:
+ /bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
+ $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti
+
clean:
/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest pngout.png
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index bb17c83..6f63341 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -18,7 +18,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=gcc
@@ -78,7 +78,8 @@
echo cppflags=\"-I$(INCPATH)/$(LIBNAME) -DPNG_USE_PNGGCCRD \
-DPNG_NO_ASSEMBLER_CODE\"; \
echo cflags=\"$(ABI)\"; \
- echo ldflags=\"-L$(LIBPATH) -rpath $(LIBPATH) \"; \
+ echo ldflags=\"-L$(LIBPATH)\"; \
+ echo rpath=\"$(LIBPATH)\"; \
echo libs=\"-lpng12 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config
@@ -165,11 +166,11 @@
test-installed:
$(CC) -I$(ZLIBINC) \
`$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
- -L$(ZLIBLIB) -rpath $(ZLIBLIB) \
+ -L$(ZLIBLIB) -rpath $(ZLIBLIB):`$(BINPATH)/libpng12-config --rpath` \
-o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
echo
echo Testing installed dynamic shared library.
- pngtesti pngtest.png
+ ./pngtesti pngtest.png
clean:
rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 94a4521..0fb1bae 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -5,7 +5,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Where make install puts libpng.a, libpng12.so, and libpng12/png.h
@@ -172,7 +172,7 @@
`$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
-L$(ZLIBLIB) -rpath $(ZLIBLIB) \
-o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
- pngtesti pngtest.png
+ ./pngtesti pngtest.png
clean:
rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index fcf16f0..0b3b336 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -34,7 +34,7 @@
RANLIB=echo
PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -184,7 +184,7 @@
`$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
-o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \
-L$(ZLIBLIB) -R$(ZLIBLIB)
- pngtesti pngtest.png
+ ./pngtesti pngtest.png
clean:
/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 5611130..5600409 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -30,7 +30,7 @@
RANLIB=echo
PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -181,7 +181,7 @@
`$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
-o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \
-L$(ZLIBLIB) -R$(ZLIBLIB)
- pngtesti pngtest.png
+ ./pngtesti pngtest.png
clean:
/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas
index d366a2d..6440aa1 100644
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -7,7 +7,7 @@
interface
const
- PNG_LIBPNG_VER_STRING = '1.2.4beta3';
+ PNG_LIBPNG_VER_STRING = '1.2.4rc1';
PNG_LIBPNG_VER = 10204;
type
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index a26c8af..c9aa400 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.2.4beta3
+; Version 1.2.4rc1
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
