Imported from libpng-1.2.6beta2.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index a2ec644..a21de74 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.2.6beta1 - October 22, 2002
+Libpng 1.2.6beta2 - November 1, 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.
@@ -42,6 +42,10 @@
Revised makefile.dec, makefile.macosx, makefile.aix, makefile sg*,
makefile.hp*, makefile.beos, makefile.*sunu (only affecting LDFLAGS
used in running pngtest).
+version 1.2.6beta2 [November 1, 2002]
+ Added libpng-config "--ldopts" output.
+ Added "AR=ar" and "ARFLAGS=rc" and changed "ar rc" to "$(AR) $(ARFLAGS)"
+ in makefiles.
Send comments/corrections/commendations to
png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
diff --git a/CHANGES b/CHANGES
index 42026a8..694002b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1185,6 +1185,10 @@
Revised makefile.dec, makefile.macosx, makefile.aix, makefile sg*,
makefile.hp*, makefile.beos, makefile.*sunu (only affecting LDFLAGS
used in running pngtest).
+version 1.2.6beta2 [November 1, 2002]
+ Added libpng-config "--ldopts" output.
+ Added "AR=ar" and "ARFLAGS=rc" and changed "ar rc" to "$(AR) $(ARFLAGS)"
+ in makefiles.
Send comments/corrections/commendations to
png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
diff --git a/INSTALL b/INSTALL
index d285bfd..d4669c2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.6beta1 - October 22, 2002
+Installing libpng version 1.2.6beta2 - November 1, 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.6beta1" or "lpng109" and "zlib-1.1.4"
+might be called "libpng-1.2.6beta2" 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:
@@ -65,8 +65,8 @@
include
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
- makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.6beta1)
- makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.6beta1,
+ makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.6beta2)
+ makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.6beta2,
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
@@ -87,10 +87,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.6beta1)
+ makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.6beta2)
makefile.sunos => Sun makefile
- makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.6beta1)
- makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.6beta1)
+ makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.6beta2)
+ makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.6beta2)
makefile.32sunu => Sun Ultra 32-bit makefile
makefile.64sunu => Sun Ultra 64-bit makefile
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
diff --git a/KNOWNBUG b/KNOWNBUG
index 2a2d476..ea67090 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.2.6beta1
+Known bugs in libpng version 1.2.6beta2
1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when
reading interlaced PNG files, when assembler code is enabled but running
diff --git a/LICENSE b/LICENSE
index 34db227..59f2cb9 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.6beta1, October 22, 2002, are
+libpng versions 1.0.7, July 1, 2000, through 1.2.6beta2, November 1, 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
-October 22, 2002
+November 1, 2002
diff --git a/README b/README
index cad3f4c..1a593c6 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng 1.2.6beta1 - October 22, 2002 (shared library 12.0)
+README for libpng 1.2.6beta2 - November 1, 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.6beta1)
+ (gcc, creates libpng12.so.0.1.2.6beta2)
makefile.gcmmx => Linux/ELF makefile (gcc, creates
- libpng12.so.0.1.2.6beta1, uses assembler code
+ libpng12.so.0.1.2.6beta2, 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.6beta1)
+ makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.6beta2)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng12.so.0.1.2.6beta1)
+ (gcc, creates libpng12.so.0.1.2.6beta2)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng12.so.0.1.2.6beta1)
+ (gcc, creates libpng12.so.0.1.2.6beta2)
makefile.32sunu => Sun Ultra 32-bit makefile
makefile.64sunu => Sun Ultra 64-bit makefile
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
diff --git a/Y2KINFO b/Y2KINFO
index 145b199..20171bb 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- October 22, 2002
+ November 1, 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.6beta1 are Y2K compliant. It is my belief that earlier
+ upward through 1.2.6beta2 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 a4b5c25..e1da59a 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
echo "
- There is no \"configure\" script for Libpng-1.2.6beta1. Instead, please
+ There is no \"configure\" script for Libpng-1.2.6beta2. 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 90665f5..8008e2e 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "October 22, 2002"
+.TH LIBPNG 3 "November 1, 2002"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6beta1
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6beta2
.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.6beta1 - October 22, 2002
+ libpng version 1.2.6beta2 - November 1, 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
-October 22, 2002
+November 1, 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.6beta1 are Y2K compliant. It is my belief that earlier
+upward through 1.2.6beta2 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
@@ -3786,7 +3786,7 @@
1.2.5rc1-3 13 10205 12.so.0.1.2.5rc1-3
1.0.15 10 10015 10.so.0.1.0.15
1.2.5 13 10205 12.so.0.1.2.5
- 1.2.6beta1 13 10206 12.so.0.1.2.6beta1
+ 1.2.6beta1-2 13 10206 12.so.0.1.2.6beta1-2
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3844,7 +3844,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.6beta1 - October 22, 2002:
+Libpng version 1.2.6beta2 - November 1, 2002:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu).
@@ -3861,7 +3861,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.6beta1, October 22, 2002, are
+libpng versions 1.0.7, July 1, 2000, through 1.2.6beta2, November 1, 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
@@ -3953,7 +3953,7 @@
Glenn Randers-Pehrson
randeg@alum.rpi.edu
-October 22, 2002
+November 1, 2002
.\" end of man page
diff --git a/libpng.txt b/libpng.txt
index 3886478..07a77cf 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.6beta1 - October 22, 2002
+ libpng version 1.2.6beta2 - November 1, 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
-October 22, 2002
+November 1, 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.6beta1 are Y2K compliant. It is my belief that earlier
+upward through 1.2.6beta2 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 b8f3073..65df6c1 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "October 22, 2002"
+.TH LIBPNGPF 3 "November 1, 2002"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6beta1
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6beta2
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index a283d3f..b9379ac 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "October 22, 2002"
+.TH PNG 5 "November 1, 2002"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 6200dea..46dd116 100644
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
- * libpng version 1.2.6beta1 - October 22, 2002
+ * libpng version 1.2.6beta2 - November 1, 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_6beta1 Your_png_h_is_not_version_1_2_6beta1;
+typedef version_1_2_6beta2 Your_png_h_is_not_version_1_2_6beta2;
/* 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.6beta1";
+const char png_libpng_ver[18] = "1.2.6beta2";
/* png_sig was changed to a function in version 1.0.5c */
/* Place to hold the signature string for a PNG file. */
@@ -671,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.6beta1 - October 22, 2002\n\
+ return ((png_charp) "\n libpng version 1.2.6beta2 - November 1, 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");
@@ -689,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.6beta1");
- return((png_charp) "1.2.6beta1");
+ return((png_charp) "1.2.6beta2");
+ return((png_charp) "1.2.6beta2");
}
png_charp PNGAPI
diff --git a/png.h b/png.h
index 7c5ad7a..73fe8ca 100644
--- a/png.h
+++ b/png.h
@@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.6beta1 - October 22, 2002
+ * libpng version 1.2.6beta2 - November 1, 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.6beta1 - October 22, 2002: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.6beta2 - November 1, 2002: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -98,7 +98,7 @@
* 1.2.5rc1-3 13 10205 12.so.0.1.2.5rc1-3
* 1.0.15 10 10015 10.so.0.1.0.15
* 1.2.5 13 10205 12.so.0.1.2.5
- * 1.2.6beta1 13 10206 12.so.0.1.2.6beta1
+ * 1.2.6beta1-2 13 10206 12.so.0.1.2.6beta1-2
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -128,7 +128,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.6beta1, October 22, 2002, are
+ * libpng versions 1.0.7, July 1, 2000, through 1.2.6beta2, November 1, 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
@@ -233,13 +233,13 @@
* Y2K compliance in libpng:
* =========================
*
- * October 22, 2002
+ * November 1, 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.6beta1 are Y2K compliant. It is my belief that earlier
+ * upward through 1.2.6beta2 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
@@ -295,7 +295,7 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.6beta1"
+#define PNG_LIBPNG_VER_STRING "1.2.6beta2"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM %DLLNUM%
@@ -307,7 +307,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 2
#define PNG_LIBPNG_BUILD_ALPHA 1
#define PNG_LIBPNG_BUILD_BETA 2
@@ -1285,9 +1285,9 @@
/* This prevents a compiler error in png.c if png.c and png.h are both at
- version 1.2.6beta1
+ version 1.2.6beta2
*/
-typedef png_structp version_1_2_6beta1;
+typedef png_structp version_1_2_6beta2;
typedef png_struct FAR * FAR * png_structpp;
@@ -2427,7 +2427,7 @@
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.6beta1 - October 22, 2002 (header)\n"
+ " libpng version 1.2.6beta2 - November 1, 2002 (header)\n"
#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
/* With these routines we avoid an integer divide, which will be slower on
diff --git a/pngasmrd.h b/pngasmrd.h
index 8b37126..b980f48 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.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 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 9000d57..8f3f26f 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,6 +1,6 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng 1.2.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 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 98ed864..a76b2dd 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,7 +1,7 @@
/* pngerror.c - stub functions for i/o and memory allocation
*
- * libpng 1.2.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 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 75529d8..8c193c5 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.6beta1 - October 22, 2002
+ * libpng version 1.2.6beta2 - November 1, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* Copyright (c) 1998, Intel Corporation
diff --git a/pngget.c b/pngget.c
index 2726bbf..f6398da 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
/* pngget.c - retrieval of values from info struct
*
- * libpng 1.2.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 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 66aca38..28661c0 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@
/* pngmem.c - stub functions for memory allocation
*
- * libpng 1.2.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 2002
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngpread.c b/pngpread.c
index 76dbb28..72459cb 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode
*
- * libpng 1.2.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 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 1339c0a..9f90978 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
- * libpng 1.2.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 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)
@@ -789,7 +789,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.6beta1
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.6beta2
*/
void PNGAPI
@@ -837,7 +837,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.6beta1
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.6beta2
*/
void PNGAPI
png_read_image(png_structp png_ptr, png_bytepp image)
diff --git a/pngrio.c b/pngrio.c
index c66bcf5..81504d3 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,7 +1,7 @@
/* pngrio.c - functions for data input
*
- * libpng 1.2.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 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 6b68979..240b168 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.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 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 92d2761..535f924 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
- * libpng 1.2.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 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 f9f2c2a..38377b8 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
- * libpng 1.2.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 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 05a714a..f9ff7d8 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1,7 +1,7 @@
/* pngtest.c - a simple test program to test libpng
*
- * libpng 1.2.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 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)
@@ -1538,4 +1538,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_6beta1 your_png_h_is_not_version_1_2_6beta1;
+typedef version_1_2_6beta2 your_png_h_is_not_version_1_2_6beta2;
diff --git a/pngtrans.c b/pngtrans.c
index fbe31f0..1c213a8 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.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 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 dfc3d37..6bdca00 100644
--- a/pngvcrd.c
+++ b/pngvcrd.c
@@ -2,7 +2,7 @@
*
* For Intel x86 CPU and Microsoft Visual C++ compiler
*
- * libpng version 1.2.6beta1 - October 22, 2002
+ * libpng version 1.2.6beta2 - November 1, 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 b777b7d..b52970d 100644
--- a/pngwio.c
+++ b/pngwio.c
@@ -1,7 +1,7 @@
/* pngwio.c - functions for data output
*
- * libpng 1.2.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 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 8534eba..55a9585 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file
*
- * libpng 1.2.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 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 faecf3e..f118181 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.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 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 9fccf71..81acc2b 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@
/* pngwutil.c - utilities to write a PNG file
*
- * libpng 1.2.6beta1 - October 22, 2002
+ * libpng 1.2.6beta2 - November 1, 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 e886332..b09214d 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.6beta1 (October 22, 2002) and zlib
+libpng 1.2.6beta2 (November 1, 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 fca8819..3d171b7 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.6beta1
+;Version 1.2.6beta2
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
diff --git a/projects/netware.txt b/projects/netware.txt
index 2e53999..50ea619 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.6beta1-project-netware.zip from a libpng distribution
+libpng-1.2.6beta2-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.6beta1-project-netware.zip"
+"unzip -a libpng-1.2.6beta2-project-netware.zip"
diff --git a/projects/wince.txt b/projects/wince.txt
index e09b308..fcba967 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.6beta1-project-wince.zip from a libpng distribution
+libpng-1.2.6beta2-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.6beta1-project-wince.zip"
+"unzip -a libpng-1.2.6beta2-project-wince.zip"
diff --git a/scripts/libpng-config-body.in b/scripts/libpng-config-body.in
index b466432..5267c1a 100755
--- a/scripts/libpng-config-body.in
+++ b/scripts/libpng-config-body.in
@@ -77,6 +77,10 @@
echo ${R_opts}
;;
+ --ldopts)
+ echo ${ldopts}
+ ;;
+
--ldflags)
echo ${ldflags} ${L_opts} ${R_opts} ${libs}
;;
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index 50749e7..f7a5810 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.2.6beta1
+version=1.2.6beta2
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 864d019..f508233 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.6beta1
+Version: 1.2.6beta2
Libs: -L${libdir} -lpng12 -lz -lm
Cflags: -I${includedir}/libpng12
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index bfc2405..804209c 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,6 +8,10 @@
CC=cc
SUN_CC_FLAGS=-fast -xtarget=ultra
SUN_LD_FLAGS=-fast -xtarget=ultra
+AR=ar
+ARFLAGS=rc
+#RANLIB=ranlib
+RANLIB=echo
# where make install puts libpng.a, libpng12.so and libpng12/png.h
prefix=/a
@@ -28,12 +32,9 @@
# $(WARNMORE) -g -DPNG_DEBUG=5
LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm
-#RANLIB=ranlib
-RANLIB=echo
-
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
@@ -70,7 +71,7 @@
all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
libpng.pc:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 9605cad..283b228 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,6 +8,10 @@
CC=cc
SUN_CC_FLAGS=-fast -xtarget=ultra -xarch=v9
SUN_LD_FLAGS=-fast -xtarget=ultra -xarch=v9
+AR=ar
+ARFLAGS=rc
+#RANLIB=ranlib
+RANLIB=echo
# where make install puts libpng.a, libpng12.so and libpng12/png.h
prefix=/a
@@ -28,12 +32,9 @@
# $(WARNMORE) -g -DPNG_DEBUG=5
LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm
-#RANLIB=ranlib
-RANLIB=echo
-
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
@@ -70,7 +71,7 @@
all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
libpng.pc:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 5f7330a..15c1477 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -12,13 +12,14 @@
# Compiler, linker, lib and other tools
CC = gcc
LD = $(CC)
-AR = ar rcs
+AR=ar
+ARFLAGS=rcs
RANLIB = ranlib
RM = rm -f
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
@@ -60,7 +61,7 @@
all: $(LIBNAME)$(A) pngtest$(E)
$(LIBNAME)$(A): $(OBJS)
- $(AR) $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
test: pngtest$(E)
diff --git a/scripts/makefile.amiga b/scripts/makefile.amiga
index 79cb424..c210973 100644
--- a/scripts/makefile.amiga
+++ b/scripts/makefile.amiga
@@ -9,6 +9,16 @@
ZLIB=/zlib
#compiler
CC=sc
+# linker
+LN= slink
+# file deletion command
+RM= delete quiet
+# library (.lib) file creation command
+AR= oml
+ARFLAGS=
+# make directory command
+MKDIR= makedir
+
#compiler flags
# WARNING: a bug in V6.51 causes bad code with OPTGO
# So use V6.55 or set NOOPTGO!!!!!!!!!
@@ -19,14 +29,6 @@
LDFLAGS= SD ND BATCH
#link libs
LDLIBS= libpng.lib libgz.lib LIB:scm.lib LIB:sc.lib Lib:amiga.lib
-# linker
-LN= slink
-# file deletion command
-RM= delete quiet
-# library (.lib) file creation command
-AR= oml
-# make directory command
-MKDIR= makedir
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
@@ -36,7 +38,7 @@
libpng.lib: $(OBJS)
-$(RM) libpng.lib
-$(AR) libpng.lib r $(OBJS)
+$(AR) $(ARFLAGS) libpng.lib r $(OBJS)
pngtest: pngtest.o libpng.lib
$(LN) <WITH <
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 6a6d705..a59c371 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -6,13 +6,17 @@
# For conditions of distribution and use, see copyright notice in png.h
CC=gcc
+AR=ar
+ARFLAGS=rc
+RANLIB=ranlib
+#RANLIB=echo
# Where the zlib library and include files are located
ZLIBLIB=/usr/local/lib
ZLIBINC=/usr/local/include
PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
ALIGN=
@@ -28,9 +32,6 @@
CFLAGS=-I$(ZLIBINC) -Wall -O1 -funroll-loops \
$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
-RANLIB=ranlib
-#RANLIB=echo
-
# where make install puts libpng.a, libpng12.so*, and png.h
prefix=/usr/local
INCPATH=$(prefix)/include
@@ -66,7 +67,7 @@
all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
libpng.pc:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index c3c6f0c..4bf80c0 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -36,6 +36,12 @@
# list at the bottom of this makefile.
CC=gcc
+AR=ar
+ARFLAGS=rc
+RANLIB=ranlib
+#RANLIB=echo
+MKDIR=/bin/mkdir -pv
+
ifdef MINGW
MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw
MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw
@@ -79,7 +85,7 @@
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
@@ -93,10 +99,6 @@
LDSFLAGS=$(strip -shared -L. $(MINGW_LDFLAGS) -Wl,--export-all)
LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz
-MKDIR=/bin/mkdir -pv
-RANLIB=ranlib
-#RANLIB=echo
-
INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib
@@ -173,7 +175,7 @@
$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
$(STATLIB): $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
$(SHAREDDEF): projects/msvc/png32ms.def
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index d067082..26a9986 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -16,14 +16,16 @@
ZLIBINC=../zlib
CC=cc
-CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
-
+AR=ar
+ARFLAGS=rc
#RANLIB=echo
RANLIB=ranlib
+CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
+
PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -61,7 +63,7 @@
all: libpng.a $(LIBNAME).dylib pngtest libpng.pc libpng-config
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
libpng.pc:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 52f7b93..aa1a67e 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -32,17 +32,19 @@
ZLIBINC=../zlib
PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
CC=cc
-CFLAGS=-std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
-LDFLAGS=-L$(ZLIBLIB) -rpath $(ZLIBLIB) libpng.a -lz -lm
-
+AR=ar
+ARFLAGS=rc
#RANLIB=echo
RANLIB=ranlib
+CFLAGS=-std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
+LDFLAGS=-L$(ZLIBLIB) -rpath $(ZLIBLIB) libpng.a -lz -lm
+
OBJS = 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
@@ -50,7 +52,7 @@
all: $(LIBNAME).so libpng.a pngtest libpng.pc libpng-config
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
libpng.pc:
diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2
index 09045c2..5ccb4ae 100644
--- a/scripts/makefile.dj2
+++ b/scripts/makefile.dj2
@@ -10,6 +10,8 @@
LIBPATH=$(prefix)/lib
CC=gcc
+AR=ar
+ARFLAGS=rc
CFLAGS=-I../zlib -O
LDFLAGS=-L. -L../zlib/ -lpng -lz -lm
@@ -22,7 +24,7 @@
all: libpng.a pngtest
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
pngtest: pngtest.o libpng.a
diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc
index f7fc368..52a77f3 100644
--- a/scripts/makefile.gcc
+++ b/scripts/makefile.gcc
@@ -10,7 +10,8 @@
# Compiler, linker, lib and other tools
CC = gcc
LD = $(CC)
-AR = ar rcs
+AR=ar
+ARFLAGS=rcs
RANLIB = ranlib
RM = rm -f
@@ -35,7 +36,7 @@
all: libpng$(A) pngtest$(E)
libpng$(A): $(OBJS)
- $(AR) $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
test: pngtest$(E)
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 09d13ff..899d104 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -15,10 +15,14 @@
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=gcc
+AR=ar
+ARFLAGS=rc
+RANLIB=ranlib
+#RANLIB=echo
# where "make install" puts libpng12.a, libpng12.so*,
# libpng12/png.h and libpng12/pngconf.h
@@ -58,9 +62,6 @@
LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-RANLIB=ranlib
-#RANLIB=echo
-
INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib
MANPATH=$(prefix)/man
@@ -95,7 +96,7 @@
all: libpng.a $(LIBNAME).so pngtest pngtest-static libpng.pc libpng-config
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
libpng.pc:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index ac7b517..4d0e60f 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -6,7 +6,11 @@
# For conditions of distribution and use, see copyright notice in png.h
CC=gcc
+AR=ar
+ARFLAGS=rc
LD=ld
+RANLIB=ranlib
+#RANLIB=echo
# where "make install" puts libpng.a, libpng.sl*, png.h and pngconf.h
prefix=/usr/local
@@ -37,11 +41,8 @@
#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
LDFLAGS=-L$(ZLIBLIB) libpng.a -lz -lm
-RANLIB=ranlib
-#RANLIB=echo
-
PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -79,7 +80,7 @@
all: libpng.a $(LIBNAME).sl pngtest libpng.pc libpng-config
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
libpng.pc:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index e9235ba..b9a5ec7 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -16,15 +16,17 @@
# SHAREDLIB=libz.sl
CC=cc
+AR=ar
+ARFLAGS=rc
+RANLIB=ranlib
+
CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0
# Caution: be sure you have built zlib with the same CFLAGS.
CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0
LDFLAGS=-L$(ZLIBLIB) libpng.a -lz -lm
-RANLIB=ranlib
-
PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -64,7 +66,7 @@
all: libpng.a $(LIBNAME).sl pngtest libpng.pc libpng-config
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
libpng.pc:
diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc
index f09a62c..1a6030f 100644
--- a/scripts/makefile.ibmc
+++ b/scripts/makefile.ibmc
@@ -16,6 +16,7 @@
CC = icc
LD = ilink
AR = ilib
+ARFLAGS=
RM = del
CFLAGS = -I$(ZLIBINC) -Mc -O2 -W3
@@ -37,7 +38,7 @@
all: libpng$(A) pngtest$(E)
libpng$(A): $(OBJS)
- $(AR) -out:$@ $(OBJS)
+ $(AR) $(ARFLAGS) -out:$@ $(OBJS)
test: pngtest$(E)
pngtest$(E)
diff --git a/scripts/makefile.knr b/scripts/makefile.knr
index 44ee538..463efca 100644
--- a/scripts/makefile.knr
+++ b/scripts/makefile.knr
@@ -24,6 +24,8 @@
DESTDIR=
CC=cc
+AR=ar
+ARFLAGS=rc
CFLAGS=-I../zlib -O
LDFLAGS=-L. -L../zlib/ -lpng -lz -lm
# flags for ansi2knr
@@ -49,7 +51,7 @@
$(CC) $(CFLAGS) $(ANSI2KNRFLAGS) -o ansi2knr ansi2knr.c
libpng.a: ansi2knr $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
pngtest: pngtest.o libpng.a
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index b15a5bf..4ef7898 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -5,10 +5,14 @@
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=gcc
+AR=ar
+ARFLAGS=rc
+RANLIB=ranlib
+#RANLIB=echo
# where "make install" puts libpng12.a, libpng12.so*,
# libpng12/png.h and libpng12/pngconf.h
@@ -37,9 +41,6 @@
LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-RANLIB=ranlib
-#RANLIB=echo
-
INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib
MANPATH=$(prefix)/man
@@ -74,7 +75,7 @@
all: libpng.a $(LIBNAME).so pngtest pngtest-static libpng.pc libpng-config
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
libpng.pc:
diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx
index 6f98e29..87c3541 100644
--- a/scripts/makefile.macosx
+++ b/scripts/makefile.macosx
@@ -15,9 +15,13 @@
ZLIBINC=../zlib
CC=cc
+AR=ar
+ARFLAGS=rc
+#RANLIB=echo
+RANLIB=ranlib
PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
@@ -45,9 +49,6 @@
DL=$(DESTDIR)$(LIBPATH)
DM=$(DESTDIR)$(MANPATH)
-#RANLIB=echo
-RANLIB=ranlib
-
OBJS = 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
@@ -70,7 +71,7 @@
chmod +x libpng-config
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
$(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX): $(OBJS)
diff --git a/scripts/makefile.mips b/scripts/makefile.mips
index f1a557d..4501d1e 100644
--- a/scripts/makefile.mips
+++ b/scripts/makefile.mips
@@ -19,6 +19,8 @@
DESTDIR=
CC=cc
+AR=ar
+ARFLAGS=rc
CFLAGS=-I../zlib -O -systype sysv -DSYSV -w -Dmips
#CFLAGS=-O
LDFLAGS=-L. -L../zlib/ -lpng -lz -lm
@@ -33,7 +35,7 @@
all: libpng.a pngtest
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
pngtest: pngtest.o libpng.a
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index f3d1f1f..5b9fbce 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.6beta1
+SHLIB_MINOR= 1.2.6beta2
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 dd5a31f..36c73f0 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.2.6beta1
+SHLIB_MINOR= 1.2.6beta2
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 2cf476f..e81fe13 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -7,7 +7,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.6beta1
+SHLIB_MINOR= 1.2.6beta2
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.os2 b/scripts/makefile.os2
index 588067d..800428e 100644
--- a/scripts/makefile.os2
+++ b/scripts/makefile.os2
@@ -16,6 +16,7 @@
-malign-functions=2 #$(WARNMORE) -g -DPNG_DEBUG=5
LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lzdll -Zcrtdll
AR=emxomfar
+ARFLAGS=rc
PNGLIB=png.lib
IMPLIB=emximp
@@ -31,7 +32,7 @@
all: $(PNGLIB) $(SHAREDLIB) $(SHAREDLIBIMP)
$(PNGLIB): $(OBJS)
- $(AR) rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(SHAREDLIB): $(OBJS) pngos2.def
$(CC) $(LDFLAGS) -Zdll -o $@ $^
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index b2c9f0d..0ff6839 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -7,6 +7,10 @@
# For conditions of distribution and use, see copyright notice in png.h
CC=cc
+AR=ar
+ARFLAGS=rc
+#RANLIB=ranlib
+RANLIB=echo
# where make install puts libpng.a, libpng.so*, and png.h
prefix=/usr/local
@@ -20,11 +24,8 @@
CFLAGS= -dy -belf -I$(ZLIBINC) -O3
LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
-#RANLIB=ranlib
-RANLIB=echo
-
PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -62,7 +63,7 @@
all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
libpng.pc:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 85e4dc8..b48147a 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -18,9 +18,14 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
+
CC=gcc
+AR=ar
+ARFLAGS=rc
+RANLIB=echo
+#RANLIB=ranlib
# ABI can be blank to use default for your system, -32, -o32, -n32, or -64
# See "man abi". zlib must be built with the same ABI.
@@ -35,9 +40,6 @@
-set_version sgi$3.0
# See "man dso" for info about shared objects
-RANLIB=echo
-#RANLIB=ranlib
-
INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib
#LIBPATH=$(prefix)/lib32
@@ -66,7 +68,7 @@
all: libpng.a pngtest shared libpng.pc libpng-config
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
shared: $(LIBNAME).so.$(PNGVER)
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 385d166..f556d14 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -5,7 +5,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Where make install puts libpng.a, libpng12.so, and libpng12/png.h
@@ -22,6 +22,10 @@
ZLIBINC=../zlib
CC=cc
+AR=ar
+ARFLAGS=rc
+RANLIB=echo
+#RANLIB=ranlib
# ABI can be blank to use default for your system, -32, -o32, -n32, or -64
# See "man abi". zlib must be built with the same ABI.
@@ -40,9 +44,6 @@
-set_version sgi$3.0
# See "man dso" for info about shared objects
-RANLIB=echo
-#RANLIB=ranlib
-
INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib
#LIBPATH=$(prefix)/lib32
@@ -71,7 +72,7 @@
all: libpng.a pngtest shared libpng.pc libpng-config
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
shared: $(LIBNAME).so.$(PNGVER)
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 731ad51..999ace4 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,6 +8,10 @@
# gcc 2.95 doesn't work.
CC=cc
+AR=ar
+ARFLAGS=rc
+#RANLIB=ranlib
+RANLIB=echo
# Where make install puts libpng.a, libpng.so*, and png.h
prefix=/usr/local
@@ -30,11 +34,8 @@
CFLAGS=-I$(ZLIBINC) -O3
LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
-#RANLIB=ranlib
-RANLIB=echo
-
PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -72,7 +73,7 @@
all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
libpng.pc:
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 4a7e585..63d9433 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -6,6 +6,10 @@
# For conditions of distribution and use, see copyright notice in png.h
CC=gcc
+AR=ar
+ARFLAGS=rc
+#RANLIB=ranlib
+RANLIB=echo
# Where make install puts libpng.a, libpng12.so*, and png.h
prefix=/usr/local
@@ -26,11 +30,8 @@
# $(WARNMORE) -g -DPNG_DEBUG=5
LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
-#RANLIB=ranlib
-RANLIB=echo
-
PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -68,7 +69,7 @@
all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
libpng.pc:
diff --git a/scripts/makefile.std b/scripts/makefile.std
index 5d1f529..e9fb76e 100644
--- a/scripts/makefile.std
+++ b/scripts/makefile.std
@@ -25,12 +25,14 @@
ZLIBINC=../zlib
CC=cc
-CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
-
+AR=ar
+ARFLAGS=rc
#RANLIB=echo
RANLIB=ranlib
+CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
+
OBJS = 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
@@ -38,7 +40,7 @@
all: libpng.a pngtest
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
pngtest: pngtest.o libpng.a
diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos
index 70a6e88..77c8ad7 100644
--- a/scripts/makefile.sunos
+++ b/scripts/makefile.sunos
@@ -29,12 +29,14 @@
-Wmissing-declarations -Wtraditional -Wcast-align \
-Wstrict-prototypes -Wmissing-prototypes
CC=gcc
-CFLAGS=-I$(ZLIBINC) -O # $(WARNMORE) -DPNG_DEBUG=5
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
-
+AR=ar
+ARFLAGS=rc
RANLIB=ranlib
#RANLIB=echo
+CFLAGS=-I$(ZLIBINC) -O # $(WARNMORE) -DPNG_DEBUG=5
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
+
OBJS = 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
@@ -42,7 +44,7 @@
all: libpng.a pngtest
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
pngtest: pngtest.o libpng.a
diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas
index d491741..14d68ca 100644
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -7,7 +7,7 @@
interface
const
- PNG_LIBPNG_VER_STRING = '1.2.6beta1';
+ PNG_LIBPNG_VER_STRING = '1.2.6beta2';
PNG_LIBPNG_VER = 10206;
type
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index ead9518..6c64797 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.2.6beta1
+; Version 1.2.6beta2
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
