Imported from libpng-1.2.3rc6.tar
This commit is contained in:
parent
837a3d1745
commit
22f28966c4
7
ANNOUNCE
7
ANNOUNCE
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
Libpng 1.2.3rc5 - May 11, 2002
|
Libpng 1.2.3rc6 - May 13, 2002
|
||||||
|
|
||||||
This is not intended to be a public release. It will be replaced
|
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.
|
within a few weeks by a public version or by another test version.
|
||||||
@ -48,6 +48,11 @@ version 1.2.3rc5 [May 11, 2002]
|
|||||||
Once more restored png_zalloc and png_zfree to nonexported form.
|
Once more restored png_zalloc and png_zfree to nonexported form.
|
||||||
Restored png_default_read|write_data, png_default_flush, png_read_fill_buffer
|
Restored png_default_read|write_data, png_default_flush, png_read_fill_buffer
|
||||||
to nonexported form, but with PNGAPI, and removed them from module def files.
|
to nonexported form, but with PNGAPI, and removed them from module def files.
|
||||||
|
version 1.2.3rc6 [May 13, 2002]
|
||||||
|
Removed "PNGAPI" from png_zalloc() and png_zfree() in png.c
|
||||||
|
Changed "Gz" to "Gd" in projects/msvc/libpng.dsp and zlib.dsp.
|
||||||
|
Removed leftover libpng-config "sed" script from four makefiles.
|
||||||
|
Revised libpng-config creating script in 16 makefiles.
|
||||||
|
|
||||||
Send comments/corrections/commendations to
|
Send comments/corrections/commendations to
|
||||||
png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
|
png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
|
||||||
|
5
CHANGES
5
CHANGES
@ -1113,6 +1113,11 @@ version 1.2.3rc5 [May 11, 2002]
|
|||||||
Once more restored png_zalloc and png_zfree to regular nonexported form.
|
Once more restored png_zalloc and png_zfree to regular nonexported form.
|
||||||
Restored png_default_read|write_data, png_default_flush, png_read_fill_buffer
|
Restored png_default_read|write_data, png_default_flush, png_read_fill_buffer
|
||||||
to nonexported form, but with PNGAPI, and removed them from module def files.
|
to nonexported form, but with PNGAPI, and removed them from module def files.
|
||||||
|
version 1.2.3rc6 [May 13, 2002]
|
||||||
|
Removed "PNGAPI" from png_zalloc() and png_zfree() in png.c
|
||||||
|
Changed "Gz" to "Gd" in projects/msvc/libpng.dsp and zlib.dsp.
|
||||||
|
Removed leftover libpng-config "sed" script from four makefiles.
|
||||||
|
Revised libpng-config creating script in 16 makefiles.
|
||||||
|
|
||||||
Send comments/corrections/commendations to
|
Send comments/corrections/commendations to
|
||||||
png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
|
png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
|
||||||
|
14
INSTALL
14
INSTALL
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
Installing libpng version 1.2.3rc5 - May 11, 2002
|
Installing libpng version 1.2.3rc6 - May 13, 2002
|
||||||
|
|
||||||
Before installing libpng, you must first install zlib. zlib
|
Before installing libpng, you must first install zlib. zlib
|
||||||
can usually be found wherever you got libpng. zlib can be
|
can usually be found wherever you got libpng. zlib can be
|
||||||
@ -10,7 +10,7 @@ zlib.h and zconf.h include files that correspond to the
|
|||||||
version of zlib that's installed.
|
version of zlib that's installed.
|
||||||
|
|
||||||
You can rename the directories that you downloaded (they
|
You can rename the directories that you downloaded (they
|
||||||
might be called "libpng-1.2.3rc5" or "lpng109" and "zlib-1.1.3"
|
might be called "libpng-1.2.3rc6" or "lpng109" and "zlib-1.1.3"
|
||||||
or "zlib113") so that you have directories called "zlib" and "libpng".
|
or "zlib113") so that you have directories called "zlib" and "libpng".
|
||||||
|
|
||||||
Your directory structure should look like this:
|
Your directory structure should look like this:
|
||||||
@ -64,8 +64,8 @@ The files that are presently available in the scripts directory
|
|||||||
include
|
include
|
||||||
|
|
||||||
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
|
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
|
||||||
makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.3rc5)
|
makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.3rc6)
|
||||||
makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.3rc5,
|
makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.3rc6,
|
||||||
uses assembler code tuned for Intel MMX platform)
|
uses assembler code tuned for Intel MMX platform)
|
||||||
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
|
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
|
||||||
makefile.knr => Archaic UNIX Makefile that converts files with
|
makefile.knr => Archaic UNIX Makefile that converts files with
|
||||||
@ -86,10 +86,10 @@ include
|
|||||||
makefile.ne0bsd => NetBSD/cc makefile, uses PNGGCCRD, makes libpng0.so
|
makefile.ne0bsd => NetBSD/cc makefile, uses PNGGCCRD, makes libpng0.so
|
||||||
makefile.openbsd => OpenBSD makefile
|
makefile.openbsd => OpenBSD makefile
|
||||||
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
|
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
|
||||||
makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.3rc5)
|
makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.3rc6)
|
||||||
makefile.sunos => Sun makefile
|
makefile.sunos => Sun makefile
|
||||||
makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.3rc5)
|
makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.3rc6)
|
||||||
makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.3rc5)
|
makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.3rc6)
|
||||||
makefile.32sunu => Sun Ultra 32-bit makefile
|
makefile.32sunu => Sun Ultra 32-bit makefile
|
||||||
makefile.64sunu => Sun Ultra 64-bit makefile
|
makefile.64sunu => Sun Ultra 64-bit makefile
|
||||||
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
|
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
|
||||||
|
2
KNOWNBUG
2
KNOWNBUG
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
Known bugs in libpng version 1.2.3rc5
|
Known bugs in libpng version 1.2.3rc6
|
||||||
|
|
||||||
1. 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.
|
reading interlaced PNG files, when assembler code is enabled.
|
||||||
|
4
LICENSE
4
LICENSE
@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
|
|||||||
If you modify libpng you may insert additional notices immediately following
|
If you modify libpng you may insert additional notices immediately following
|
||||||
this sentence.
|
this sentence.
|
||||||
|
|
||||||
libpng versions 1.0.7, July 1, 2000, through 1.2.3rc5, May 11, 2002, are
|
libpng versions 1.0.7, July 1, 2000, through 1.2.3rc6, May 13, 2002, are
|
||||||
Copyright (c) 2000-2002 Glenn Randers-Pehrson
|
Copyright (c) 2000-2002 Glenn Randers-Pehrson
|
||||||
and are distributed according to the same disclaimer and license as libpng-1.0.6
|
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
|
with the following individuals added to the list of Contributing Authors
|
||||||
@ -99,4 +99,4 @@ certification mark of the Open Source Initiative.
|
|||||||
|
|
||||||
Glenn Randers-Pehrson
|
Glenn Randers-Pehrson
|
||||||
randeg@alum.rpi.edu
|
randeg@alum.rpi.edu
|
||||||
May 11, 2002
|
May 13, 2002
|
||||||
|
12
README
12
README
@ -1,4 +1,4 @@
|
|||||||
README for libpng 1.2.3rc5 - May 11, 2002 (shared library 2.1)
|
README for libpng 1.2.3rc6 - May 13, 2002 (shared library 2.1)
|
||||||
See the note about version numbers near the top of png.h
|
See the note about version numbers near the top of png.h
|
||||||
|
|
||||||
See INSTALL for instructions on how to install libpng.
|
See INSTALL for instructions on how to install libpng.
|
||||||
@ -187,9 +187,9 @@ Files in this distribution:
|
|||||||
descrip.mms => VMS makefile for MMS or MMK
|
descrip.mms => VMS makefile for MMS or MMK
|
||||||
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
|
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
|
||||||
makefile.linux => Linux/ELF makefile
|
makefile.linux => Linux/ELF makefile
|
||||||
(gcc, creates libpng12.so.0.1.2.3rc5)
|
(gcc, creates libpng12.so.0.1.2.3rc6)
|
||||||
makefile.gcmmx => Linux/ELF makefile (gcc, creates
|
makefile.gcmmx => Linux/ELF makefile (gcc, creates
|
||||||
libpng12.so.0.1.2.3rc5, uses assembler code
|
libpng12.so.0.1.2.3rc6, uses assembler code
|
||||||
tuned for Intel MMX platform)
|
tuned for Intel MMX platform)
|
||||||
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
|
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
|
||||||
makefile.knr => Archaic UNIX Makefile that converts files with
|
makefile.knr => Archaic UNIX Makefile that converts files with
|
||||||
@ -210,12 +210,12 @@ Files in this distribution:
|
|||||||
makefile.ne0bsd => NetBSD/cc makefile, PNGGCCRD, makes libpng0.so
|
makefile.ne0bsd => NetBSD/cc makefile, PNGGCCRD, makes libpng0.so
|
||||||
makefile.openbsd => OpenBSD makefile
|
makefile.openbsd => OpenBSD makefile
|
||||||
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
|
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
|
||||||
makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.3rc5)
|
makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.3rc6)
|
||||||
makefile.sunos => Sun makefile
|
makefile.sunos => Sun makefile
|
||||||
makefile.solaris => Solaris 2.X makefile
|
makefile.solaris => Solaris 2.X makefile
|
||||||
(gcc, creates libpng12.so.0.1.2.3rc5)
|
(gcc, creates libpng12.so.0.1.2.3rc6)
|
||||||
makefile.so9 => Solaris 9 makefile
|
makefile.so9 => Solaris 9 makefile
|
||||||
(gcc, creates libpng12.so.0.1.2.3rc5)
|
(gcc, creates libpng12.so.0.1.2.3rc6)
|
||||||
makefile.32sunu => Sun Ultra 32-bit makefile
|
makefile.32sunu => Sun Ultra 32-bit makefile
|
||||||
makefile.64sunu => Sun Ultra 64-bit makefile
|
makefile.64sunu => Sun Ultra 64-bit makefile
|
||||||
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
|
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
|
||||||
|
4
Y2KINFO
4
Y2KINFO
@ -1,13 +1,13 @@
|
|||||||
Y2K compliance in libpng:
|
Y2K compliance in libpng:
|
||||||
=========================
|
=========================
|
||||||
|
|
||||||
May 11, 2002
|
May 13, 2002
|
||||||
|
|
||||||
Since the PNG Development group is an ad-hoc body, we can't make
|
Since the PNG Development group is an ad-hoc body, we can't make
|
||||||
an official declaration.
|
an official declaration.
|
||||||
|
|
||||||
This is your unofficial assurance that libpng from version 0.71 and
|
This is your unofficial assurance that libpng from version 0.71 and
|
||||||
upward through 1.2.3rc5 are Y2K compliant. It is my belief that earlier
|
upward through 1.2.3rc6 are Y2K compliant. It is my belief that earlier
|
||||||
versions were also Y2K compliant.
|
versions were also Y2K compliant.
|
||||||
|
|
||||||
Libpng only has three year fields. One is a 2-byte unsigned integer
|
Libpng only has three year fields. One is a 2-byte unsigned integer
|
||||||
|
2
configure
vendored
2
configure
vendored
@ -1,5 +1,5 @@
|
|||||||
echo "
|
echo "
|
||||||
There is no \"configure\" script for Libpng-1.2.3rc5. Instead, please
|
There is no \"configure\" script for Libpng-1.2.3rc6. Instead, please
|
||||||
copy the appropriate makefile for your system from the \"scripts\"
|
copy the appropriate makefile for your system from the \"scripts\"
|
||||||
directory. Read the INSTALL file for more details.
|
directory. Read the INSTALL file for more details.
|
||||||
"
|
"
|
||||||
|
19
libpng.3
19
libpng.3
@ -1,6 +1,6 @@
|
|||||||
.TH LIBPNG 3 "May 11, 2002"
|
.TH LIBPNG 3 "May 13, 2002"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.3rc5
|
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.3rc6
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
\fI\fB
|
\fI\fB
|
||||||
|
|
||||||
@ -787,7 +787,7 @@ Following is a copy of the libpng.txt file that accompanies libpng.
|
|||||||
.SH LIBPNG.TXT
|
.SH LIBPNG.TXT
|
||||||
libpng.txt - A description on how to use and modify libpng
|
libpng.txt - A description on how to use and modify libpng
|
||||||
|
|
||||||
libpng version 1.2.3rc5 - May 11, 2002
|
libpng version 1.2.3rc6 - May 13, 2002
|
||||||
Updated and distributed by Glenn Randers-Pehrson
|
Updated and distributed by Glenn Randers-Pehrson
|
||||||
<randeg@alum.rpi.edu>
|
<randeg@alum.rpi.edu>
|
||||||
Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
@ -3638,13 +3638,13 @@ application:
|
|||||||
|
|
||||||
.SH IX. Y2K Compliance in libpng
|
.SH IX. Y2K Compliance in libpng
|
||||||
|
|
||||||
May 11, 2002
|
May 13, 2002
|
||||||
|
|
||||||
Since the PNG Development group is an ad-hoc body, we can't make
|
Since the PNG Development group is an ad-hoc body, we can't make
|
||||||
an official declaration.
|
an official declaration.
|
||||||
|
|
||||||
This is your unofficial assurance that libpng from version 0.71 and
|
This is your unofficial assurance that libpng from version 0.71 and
|
||||||
upward through 1.2.3rc5 are Y2K compliant. It is my belief that earlier
|
upward through 1.2.3rc6 are Y2K compliant. It is my belief that earlier
|
||||||
versions were also Y2K compliant.
|
versions were also Y2K compliant.
|
||||||
|
|
||||||
Libpng only has three year fields. One is a 2-byte unsigned integer that
|
Libpng only has three year fields. One is a 2-byte unsigned integer that
|
||||||
@ -3773,7 +3773,8 @@ the first widely used release:
|
|||||||
1.2.2rc1 12 10202 12.so.0.1.2.2rc1
|
1.2.2rc1 12 10202 12.so.0.1.2.2rc1
|
||||||
1.0.13 10 10013 10.so.0.1.0.13
|
1.0.13 10 10013 10.so.0.1.0.13
|
||||||
1.2.2 12 10202 12.so.0.1.2.2
|
1.2.2 12 10202 12.so.0.1.2.2
|
||||||
1.2.3rc1-5 12 10203 12.so.0.1.2.3rc1-5
|
1.2.3rc1-6 12 10203 12.so.0.1.2.3rc1-6
|
||||||
|
1.2.3 12 10203 12.so.0.1.2.3
|
||||||
|
|
||||||
Henceforth the source version will match the shared-library minor
|
Henceforth the source version will match the shared-library minor
|
||||||
and patch numbers; the shared-library major version number will be
|
and patch numbers; the shared-library major version number will be
|
||||||
@ -3831,7 +3832,7 @@ possible without all of you.
|
|||||||
|
|
||||||
Thanks to Frank J. T. Wojcik for helping with the documentation.
|
Thanks to Frank J. T. Wojcik for helping with the documentation.
|
||||||
|
|
||||||
Libpng version 1.2.3rc5 - May 11, 2002:
|
Libpng version 1.2.3rc6 - May 13, 2002:
|
||||||
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
|
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
|
||||||
Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu).
|
Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu).
|
||||||
|
|
||||||
@ -3848,7 +3849,7 @@ included in the libpng distribution, the latter shall prevail.)
|
|||||||
If you modify libpng you may insert additional notices immediately following
|
If you modify libpng you may insert additional notices immediately following
|
||||||
this sentence.
|
this sentence.
|
||||||
|
|
||||||
libpng versions 1.0.7, July 1, 2000, through 1.2.3rc5, May 11, 2002, are
|
libpng versions 1.0.7, July 1, 2000, through 1.2.3rc6, May 13, 2002, are
|
||||||
Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
|
Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
|
||||||
distributed according to the same disclaimer and license as libpng-1.0.6
|
distributed according to the same disclaimer and license as libpng-1.0.6
|
||||||
with the following individuals added to the list of Contributing Authors
|
with the following individuals added to the list of Contributing Authors
|
||||||
@ -3940,7 +3941,7 @@ certification mark of the Open Source Initiative.
|
|||||||
|
|
||||||
Glenn Randers-Pehrson
|
Glenn Randers-Pehrson
|
||||||
randeg@alum.rpi.edu
|
randeg@alum.rpi.edu
|
||||||
May 11, 2002
|
May 13, 2002
|
||||||
|
|
||||||
.\" end of man page
|
.\" end of man page
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
libpng.txt - A description on how to use and modify libpng
|
libpng.txt - A description on how to use and modify libpng
|
||||||
|
|
||||||
libpng version 1.2.3rc5 - May 11, 2002
|
libpng version 1.2.3rc6 - May 13, 2002
|
||||||
Updated and distributed by Glenn Randers-Pehrson
|
Updated and distributed by Glenn Randers-Pehrson
|
||||||
<randeg@alum.rpi.edu>
|
<randeg@alum.rpi.edu>
|
||||||
Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
@ -2851,13 +2851,13 @@ application:
|
|||||||
|
|
||||||
IX. Y2K Compliance in libpng
|
IX. Y2K Compliance in libpng
|
||||||
|
|
||||||
May 11, 2002
|
May 13, 2002
|
||||||
|
|
||||||
Since the PNG Development group is an ad-hoc body, we can't make
|
Since the PNG Development group is an ad-hoc body, we can't make
|
||||||
an official declaration.
|
an official declaration.
|
||||||
|
|
||||||
This is your unofficial assurance that libpng from version 0.71 and
|
This is your unofficial assurance that libpng from version 0.71 and
|
||||||
upward through 1.2.3rc5 are Y2K compliant. It is my belief that earlier
|
upward through 1.2.3rc6 are Y2K compliant. It is my belief that earlier
|
||||||
versions were also Y2K compliant.
|
versions were also Y2K compliant.
|
||||||
|
|
||||||
Libpng only has three year fields. One is a 2-byte unsigned integer that
|
Libpng only has three year fields. One is a 2-byte unsigned integer that
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
.TH LIBPNGPF 3 "May 11, 2002"
|
.TH LIBPNGPF 3 "May 13, 2002"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.3rc5
|
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.3rc6
|
||||||
(private functions)
|
(private functions)
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
\fB#include <png.h>\fP
|
\fB#include <png.h>\fP
|
||||||
|
2
png.5
2
png.5
@ -1,4 +1,4 @@
|
|||||||
.TH PNG 5 "May 11, 2002"
|
.TH PNG 5 "May 13, 2002"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
png \- Portable Network Graphics (PNG) format
|
png \- Portable Network Graphics (PNG) format
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
|
16
png.c
16
png.c
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* png.c - location for general purpose libpng functions
|
/* png.c - location for general purpose libpng functions
|
||||||
*
|
*
|
||||||
* libpng version 1.2.3rc5 - May 11, 2002
|
* libpng version 1.2.3rc6 - May 13, 2002
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||||
@ -13,14 +13,14 @@
|
|||||||
#include "png.h"
|
#include "png.h"
|
||||||
|
|
||||||
/* Generate a compiler error if there is an old png.h in the search path. */
|
/* Generate a compiler error if there is an old png.h in the search path. */
|
||||||
typedef version_1_2_3rc5 Your_png_h_is_not_version_1_2_3rc5;
|
typedef version_1_2_3rc6 Your_png_h_is_not_version_1_2_3rc6;
|
||||||
|
|
||||||
/* Version information for C files. This had better match the version
|
/* Version information for C files. This had better match the version
|
||||||
* string defined in png.h. */
|
* string defined in png.h. */
|
||||||
|
|
||||||
#ifdef PNG_USE_GLOBAL_ARRAYS
|
#ifdef PNG_USE_GLOBAL_ARRAYS
|
||||||
/* png_libpng_ver was changed to a function in version 1.0.5c */
|
/* png_libpng_ver was changed to a function in version 1.0.5c */
|
||||||
const char png_libpng_ver[18] = "1.2.3rc5";
|
const char png_libpng_ver[18] = "1.2.3rc6";
|
||||||
|
|
||||||
/* png_sig was changed to a function in version 1.0.5c */
|
/* png_sig was changed to a function in version 1.0.5c */
|
||||||
/* Place to hold the signature string for a PNG file. */
|
/* Place to hold the signature string for a PNG file. */
|
||||||
@ -135,7 +135,7 @@ png_check_sig(png_bytep sig, int num)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Function to allocate memory for zlib and clear it to 0. */
|
/* Function to allocate memory for zlib and clear it to 0. */
|
||||||
voidpf PNGAPI
|
voidpf /* private */
|
||||||
png_zalloc(voidpf png_ptr, uInt items, uInt size)
|
png_zalloc(voidpf png_ptr, uInt items, uInt size)
|
||||||
{
|
{
|
||||||
png_uint_32 num_bytes = (png_uint_32)items * size;
|
png_uint_32 num_bytes = (png_uint_32)items * size;
|
||||||
@ -166,7 +166,7 @@ png_zalloc(voidpf png_ptr, uInt items, uInt size)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* function to free memory for zlib */
|
/* function to free memory for zlib */
|
||||||
void PNGAPI
|
void /* private */
|
||||||
png_zfree(voidpf png_ptr, voidpf ptr)
|
png_zfree(voidpf png_ptr, voidpf ptr)
|
||||||
{
|
{
|
||||||
png_free((png_structp)png_ptr, (png_voidp)ptr);
|
png_free((png_structp)png_ptr, (png_voidp)ptr);
|
||||||
@ -663,7 +663,7 @@ png_charp PNGAPI
|
|||||||
png_get_copyright(png_structp png_ptr)
|
png_get_copyright(png_structp png_ptr)
|
||||||
{
|
{
|
||||||
if (png_ptr != NULL || png_ptr == NULL) /* silence compiler warning */
|
if (png_ptr != NULL || png_ptr == NULL) /* silence compiler warning */
|
||||||
return ((png_charp) "\n libpng version 1.2.3rc5 - May 11, 2002\n\
|
return ((png_charp) "\n libpng version 1.2.3rc6 - May 13, 2002\n\
|
||||||
Copyright (c) 1998-2002 Glenn Randers-Pehrson\n\
|
Copyright (c) 1998-2002 Glenn Randers-Pehrson\n\
|
||||||
Copyright (c) 1996-1997 Andreas Dilger\n\
|
Copyright (c) 1996-1997 Andreas Dilger\n\
|
||||||
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
|
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
|
||||||
@ -681,8 +681,8 @@ png_get_libpng_ver(png_structp png_ptr)
|
|||||||
{
|
{
|
||||||
/* Version of *.c files used when building libpng */
|
/* Version of *.c files used when building libpng */
|
||||||
if(png_ptr != NULL) /* silence compiler warning about unused png_ptr */
|
if(png_ptr != NULL) /* silence compiler warning about unused png_ptr */
|
||||||
return((png_charp) "1.2.3rc5");
|
return((png_charp) "1.2.3rc6");
|
||||||
return((png_charp) "1.2.3rc5");
|
return((png_charp) "1.2.3rc6");
|
||||||
}
|
}
|
||||||
|
|
||||||
png_charp PNGAPI
|
png_charp PNGAPI
|
||||||
|
23
png.h
23
png.h
@ -1,6 +1,6 @@
|
|||||||
/* png.h - header file for PNG reference library
|
/* png.h - header file for PNG reference library
|
||||||
*
|
*
|
||||||
* libpng version 1.2.3rc5 - May 11, 2002
|
* libpng version 1.2.3rc6 - May 13, 2002
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||||
@ -8,7 +8,7 @@
|
|||||||
* Authors and maintainers:
|
* Authors and maintainers:
|
||||||
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
|
* 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.89c, June 1996, through 0.96, May 1997: Andreas Dilger
|
||||||
* libpng versions 0.97, January 1998, through 1.2.3rc5 - May 11, 2002: Glenn
|
* libpng versions 0.97, January 1998, through 1.2.3rc6 - May 13, 2002: Glenn
|
||||||
* See also "Contributing Authors", below.
|
* See also "Contributing Authors", below.
|
||||||
*
|
*
|
||||||
* Note about libpng version numbers:
|
* Note about libpng version numbers:
|
||||||
@ -86,7 +86,8 @@
|
|||||||
* 1.2.2rc1 12 10202 12.so.0.1.2.2rc1
|
* 1.2.2rc1 12 10202 12.so.0.1.2.2rc1
|
||||||
* 1.0.13 10 10013 10.so.0.1.0.13
|
* 1.0.13 10 10013 10.so.0.1.0.13
|
||||||
* 1.2.2 12 10202 12.so.0.1.2.2
|
* 1.2.2 12 10202 12.so.0.1.2.2
|
||||||
* 1.2.3rc1-5 12 10203 12.so.0.1.2.3rc1-5
|
* 1.2.3rc1-6 12 10203 12.so.0.1.2.3rc1-6
|
||||||
|
* 1.2.3 12 10203 12.so.0.1.2.3
|
||||||
*
|
*
|
||||||
* Henceforth the source version will match the shared-library major
|
* Henceforth the source version will match the shared-library major
|
||||||
* and minor numbers; the shared-library major version number will be
|
* and minor numbers; the shared-library major version number will be
|
||||||
@ -116,7 +117,7 @@
|
|||||||
* If you modify libpng you may insert additional notices immediately following
|
* If you modify libpng you may insert additional notices immediately following
|
||||||
* this sentence.
|
* this sentence.
|
||||||
*
|
*
|
||||||
* libpng versions 1.0.7, July 1, 2000, through 1.2.3rc5, May 11, 2002, are
|
* libpng versions 1.0.7, July 1, 2000, through 1.2.3rc6, May 13, 2002, are
|
||||||
* Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
|
* Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
|
||||||
* distributed according to the same disclaimer and license as libpng-1.0.6
|
* distributed according to the same disclaimer and license as libpng-1.0.6
|
||||||
* with the following individuals added to the list of Contributing Authors
|
* with the following individuals added to the list of Contributing Authors
|
||||||
@ -221,13 +222,13 @@
|
|||||||
* Y2K compliance in libpng:
|
* Y2K compliance in libpng:
|
||||||
* =========================
|
* =========================
|
||||||
*
|
*
|
||||||
* May 11, 2002
|
* May 13, 2002
|
||||||
*
|
*
|
||||||
* Since the PNG Development group is an ad-hoc body, we can't make
|
* Since the PNG Development group is an ad-hoc body, we can't make
|
||||||
* an official declaration.
|
* an official declaration.
|
||||||
*
|
*
|
||||||
* This is your unofficial assurance that libpng from version 0.71 and
|
* This is your unofficial assurance that libpng from version 0.71 and
|
||||||
* upward through 1.2.3rc5 are Y2K compliant. It is my belief that earlier
|
* upward through 1.2.3rc6 are Y2K compliant. It is my belief that earlier
|
||||||
* versions were also Y2K compliant.
|
* versions were also Y2K compliant.
|
||||||
*
|
*
|
||||||
* Libpng only has three year fields. One is a 2-byte unsigned integer
|
* Libpng only has three year fields. One is a 2-byte unsigned integer
|
||||||
@ -283,7 +284,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/* Version information for png.h - this should match the version in png.c */
|
/* Version information for png.h - this should match the version in png.c */
|
||||||
#define PNG_LIBPNG_VER_STRING "1.2.3rc5"
|
#define PNG_LIBPNG_VER_STRING "1.2.3rc6"
|
||||||
|
|
||||||
#define PNG_LIBPNG_VER_SONUM 0
|
#define PNG_LIBPNG_VER_SONUM 0
|
||||||
#define PNG_LIBPNG_VER_DLLNUM %DLLNUM%
|
#define PNG_LIBPNG_VER_DLLNUM %DLLNUM%
|
||||||
@ -295,7 +296,7 @@
|
|||||||
/* This should match the numeric part of the final component of
|
/* This should match the numeric part of the final component of
|
||||||
* PNG_LIBPNG_VER_STRING, omitting any leading zero: */
|
* PNG_LIBPNG_VER_STRING, omitting any leading zero: */
|
||||||
|
|
||||||
#define PNG_LIBPNG_VER_BUILD 5
|
#define PNG_LIBPNG_VER_BUILD 6
|
||||||
|
|
||||||
#define PNG_LIBPNG_BUILD_ALPHA 1
|
#define PNG_LIBPNG_BUILD_ALPHA 1
|
||||||
#define PNG_LIBPNG_BUILD_BETA 2
|
#define PNG_LIBPNG_BUILD_BETA 2
|
||||||
@ -1263,9 +1264,9 @@ struct png_struct_def
|
|||||||
|
|
||||||
|
|
||||||
/* This prevents a compiler error in png.c if png.c and png.h are both at
|
/* This prevents a compiler error in png.c if png.c and png.h are both at
|
||||||
version 1.2.3rc5
|
version 1.2.3rc6
|
||||||
*/
|
*/
|
||||||
typedef png_structp version_1_2_3rc5;
|
typedef png_structp version_1_2_3rc6;
|
||||||
|
|
||||||
typedef png_struct FAR * FAR * png_structpp;
|
typedef png_struct FAR * FAR * png_structpp;
|
||||||
|
|
||||||
@ -2387,7 +2388,7 @@ extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp
|
|||||||
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */
|
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */
|
||||||
|
|
||||||
#define PNG_HEADER_VERSION_STRING \
|
#define PNG_HEADER_VERSION_STRING \
|
||||||
" libpng version 1.2.3rc5 - May 11, 2002 (header)\n"
|
" libpng version 1.2.3rc6 - May 13, 2002 (header)\n"
|
||||||
|
|
||||||
#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
|
#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
|
||||||
/* With these routines we avoid an integer divide, which will be slower on
|
/* With these routines we avoid an integer divide, which will be slower on
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* pngasmrd.h - assembler version of utilities to read a PNG file
|
/* pngasmrd.h - assembler version of utilities to read a PNG file
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 2002 Glenn Randers-Pehrson
|
* Copyright (c) 2002 Glenn Randers-Pehrson
|
||||||
*
|
*
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* pngconf.h - machine configurable file for libpng
|
/* pngconf.h - machine configurable file for libpng
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngerror.c - stub functions for i/o and memory allocation
|
/* pngerror.c - stub functions for i/o and memory allocation
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
* and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm
|
* and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm
|
||||||
* for Intel's performance analysis of the MMX vs. non-MMX code.
|
* for Intel's performance analysis of the MMX vs. non-MMX code.
|
||||||
*
|
*
|
||||||
* libpng version 1.2.3rc5 - May 11, 2002
|
* libpng version 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* Copyright (c) 1998, Intel Corporation
|
* Copyright (c) 1998, Intel Corporation
|
||||||
|
2
pngget.c
2
pngget.c
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngget.c - retrieval of values from info struct
|
/* pngget.c - retrieval of values from info struct
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
2
pngmem.c
2
pngmem.c
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngmem.c - stub functions for memory allocation
|
/* pngmem.c - stub functions for memory allocation
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngpread.c - read a png file in push mode
|
/* pngpread.c - read a png file in push mode
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngread.c - read a PNG file
|
/* pngread.c - read a PNG file
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
@ -795,7 +795,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
|
|||||||
* not called png_set_interlace_handling(), the display_row buffer will
|
* not called png_set_interlace_handling(), the display_row buffer will
|
||||||
* be ignored, so pass NULL to it.
|
* be ignored, so pass NULL to it.
|
||||||
*
|
*
|
||||||
* [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.3rc5
|
* [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.3rc6
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void PNGAPI
|
void PNGAPI
|
||||||
@ -844,7 +844,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row,
|
|||||||
* only call this function once. If you desire to have an image for
|
* only call this function once. If you desire to have an image for
|
||||||
* each pass of a interlaced image, use png_read_rows() instead.
|
* each pass of a interlaced image, use png_read_rows() instead.
|
||||||
*
|
*
|
||||||
* [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.3rc5
|
* [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.3rc6
|
||||||
*/
|
*/
|
||||||
void PNGAPI
|
void PNGAPI
|
||||||
png_read_image(png_structp png_ptr, png_bytepp image)
|
png_read_image(png_structp png_ptr, png_bytepp image)
|
||||||
|
2
pngrio.c
2
pngrio.c
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngrio.c - functions for data input
|
/* pngrio.c - functions for data input
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngrtran.c - transforms the data in a row for PNG readers
|
/* pngrtran.c - transforms the data in a row for PNG readers
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngrutil.c - utilities to read a PNG file
|
/* pngrutil.c - utilities to read a PNG file
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
2
pngset.c
2
pngset.c
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngset.c - storage of image information into info struct
|
/* pngset.c - storage of image information into info struct
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngtest.c - a simple test program to test libpng
|
/* pngtest.c - a simple test program to test libpng
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
@ -1512,4 +1512,4 @@ main(int argc, char *argv[])
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Generate a compiler error if there is an old png.h in the search path. */
|
/* Generate a compiler error if there is an old png.h in the search path. */
|
||||||
typedef version_1_2_3rc5 your_png_h_is_not_version_1_2_3rc5;
|
typedef version_1_2_3rc6 your_png_h_is_not_version_1_2_3rc6;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
|
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
*
|
*
|
||||||
* For Intel x86 CPU and Microsoft Visual C++ compiler
|
* For Intel x86 CPU and Microsoft Visual C++ compiler
|
||||||
*
|
*
|
||||||
* libpng version 1.2.3rc5 - May 11, 2002
|
* libpng version 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* Copyright (c) 1998, Intel Corporation
|
* Copyright (c) 1998, Intel Corporation
|
||||||
|
2
pngwio.c
2
pngwio.c
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngwio.c - functions for data output
|
/* pngwio.c - functions for data output
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngwrite.c - general routines to write a PNG file
|
/* pngwrite.c - general routines to write a PNG file
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngwtran.c - transforms the data in a row for PNG writers
|
/* pngwtran.c - transforms the data in a row for PNG writers
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngwutil.c - utilities to write a PNG file
|
/* pngwutil.c - utilities to write a PNG file
|
||||||
*
|
*
|
||||||
* libpng 1.2.3rc5 - May 11, 2002
|
* libpng 1.2.3rc6 - May 13, 2002
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
Microsoft Developer Studio Build File, Format Version 6.00 for
|
Microsoft Developer Studio Build File, Format Version 6.00 for
|
||||||
libpng 1.2.3rc5 (May 11, 2002) and zlib
|
libpng 1.2.3rc6 (May 13, 2002) and zlib
|
||||||
|
|
||||||
Copyright (C) 2000 Simon-Pierre Cadieux
|
Copyright (C) 2000 Simon-Pierre Cadieux
|
||||||
For conditions of distribution and use, see copyright notice in png.h
|
For conditions of distribution and use, see copyright notice in png.h
|
||||||
|
@ -210,7 +210,7 @@ LIB32=link.exe -lib
|
|||||||
# PROP Target_Dir ""
|
# PROP Target_Dir ""
|
||||||
CPP=cl.exe
|
CPP=cl.exe
|
||||||
# ADD BASE CPP /nologo /MD /W3 /O1 /I "..\.." /I "..\..\..\zlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /Yu"png.h" /FD /c
|
# ADD BASE CPP /nologo /MD /W3 /O1 /I "..\.." /I "..\..\..\zlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /Yu"png.h" /FD /c
|
||||||
# ADD CPP /nologo /Gz /MD /W3 /O1 /I "..\.." /I "..\..\..\zlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D PNGAPI=__stdcall /Yu"png.h" /FD /c
|
# ADD CPP /nologo /Gd /MD /W3 /O1 /I "..\.." /I "..\..\..\zlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D PNGAPI=__stdcall /Yu"png.h" /FD /c
|
||||||
MTL=midl.exe
|
MTL=midl.exe
|
||||||
RSC=rc.exe
|
RSC=rc.exe
|
||||||
# ADD BASE RSC /l 0x409 /i "..\.." /d "NDEBUG"
|
# ADD BASE RSC /l 0x409 /i "..\.." /d "NDEBUG"
|
||||||
|
@ -6,7 +6,7 @@ LIBRARY
|
|||||||
DESCRIPTION "PNG image compression library for Windows"
|
DESCRIPTION "PNG image compression library for Windows"
|
||||||
|
|
||||||
EXPORTS
|
EXPORTS
|
||||||
;Version 1.2.3rc5
|
;Version 1.2.3rc6
|
||||||
png_build_grayscale_palette @1
|
png_build_grayscale_palette @1
|
||||||
png_check_sig @2
|
png_check_sig @2
|
||||||
png_chunk_error @3
|
png_chunk_error @3
|
||||||
|
@ -210,7 +210,7 @@ LIB32=link.exe -lib
|
|||||||
# PROP Target_Dir ""
|
# PROP Target_Dir ""
|
||||||
CPP=cl.exe
|
CPP=cl.exe
|
||||||
# ADD BASE CPP /nologo /MD /W3 /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ZLIB_DLL" /FD /c
|
# ADD BASE CPP /nologo /MD /W3 /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ZLIB_DLL" /FD /c
|
||||||
# ADD CPP /nologo /Gz /MD /W3 /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ZLIB_DLL" /FD /c
|
# ADD CPP /nologo /Gd /MD /W3 /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ZLIB_DLL" /FD /c
|
||||||
MTL=midl.exe
|
MTL=midl.exe
|
||||||
RSC=rc.exe
|
RSC=rc.exe
|
||||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
A set of project files is available for Netware. Get
|
A set of project files is available for Netware. Get
|
||||||
libpng-1.2.3rc5-project-netware.zip from a libpng distribution
|
libpng-1.2.3rc6-project-netware.zip from a libpng distribution
|
||||||
site such as http://libpng.sourceforge.net
|
site such as http://libpng.sourceforge.net
|
||||||
|
|
||||||
Put the zip file in this directory (projects) and then run
|
Put the zip file in this directory (projects) and then run
|
||||||
"unzip -a libpng-1.2.3rc5-project-netware.zip"
|
"unzip -a libpng-1.2.3rc6-project-netware.zip"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
A set of project files is available for WinCE. Get
|
A set of project files is available for WinCE. Get
|
||||||
libpng-1.2.3rc5-project-wince.zip from a libpng distribution
|
libpng-1.2.3rc6-project-wince.zip from a libpng distribution
|
||||||
site such as http://libpng.sourceforge.net
|
site such as http://libpng.sourceforge.net
|
||||||
|
|
||||||
Put the zip file in this directory (projects) and then run
|
Put the zip file in this directory (projects) and then run
|
||||||
"unzip -a libpng-1.2.3rc5-project-wince.zip"
|
"unzip -a libpng-1.2.3rc6-project-wince.zip"
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
# Modeled after libxml-config.
|
# Modeled after libxml-config.
|
||||||
|
|
||||||
version=1.2.3rc5
|
version=1.2.3rc6
|
||||||
prefix=""
|
prefix=""
|
||||||
cppflags=""
|
cppflags=""
|
||||||
cflags=""
|
cflags=""
|
||||||
|
@ -1,88 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
|
|
||||||
# libpng-config
|
|
||||||
# provides configuration info for libpng.
|
|
||||||
|
|
||||||
# Copyright (C) 2002 Glenn Randers-Pehrson
|
|
||||||
# For conditions of distribution and use, see copyright notice in png.h
|
|
||||||
|
|
||||||
# Modeled after libxml-config, fixed to handle --prefix properly.
|
|
||||||
|
|
||||||
prefix=@PREFIX@
|
|
||||||
exec_prefix=${prefix}
|
|
||||||
includedir=${prefix}/include
|
|
||||||
|
|
||||||
usage()
|
|
||||||
{
|
|
||||||
cat <<EOF
|
|
||||||
Usage: libpng-config [OPTION] ...
|
|
||||||
|
|
||||||
Known values for OPTION are:
|
|
||||||
|
|
||||||
--prefix=DIR change libpng prefix [default $prefix]
|
|
||||||
--libs print library linking information
|
|
||||||
--cflags print compiler flags
|
|
||||||
--cppflags print pre-processor flags
|
|
||||||
--ldflags print loader flags
|
|
||||||
--help display this help and exit
|
|
||||||
--version output version information
|
|
||||||
EOF
|
|
||||||
|
|
||||||
exit $1
|
|
||||||
}
|
|
||||||
|
|
||||||
if test $# -eq 0; then
|
|
||||||
usage 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
while test $# -gt 0; do
|
|
||||||
case "$1" in
|
|
||||||
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
|
|
||||||
*) optarg= ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
--prefix=*)
|
|
||||||
prefix=$optarg
|
|
||||||
exec_prefix=${prefix}
|
|
||||||
includedir=${prefix}/include
|
|
||||||
;;
|
|
||||||
|
|
||||||
--prefix)
|
|
||||||
echo $prefix
|
|
||||||
;;
|
|
||||||
|
|
||||||
--version)
|
|
||||||
echo 1.2.3rc5
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
|
|
||||||
--help)
|
|
||||||
usage 0
|
|
||||||
;;
|
|
||||||
|
|
||||||
--cflags)
|
|
||||||
echo #CFLAGS
|
|
||||||
;;
|
|
||||||
|
|
||||||
--cppflags)
|
|
||||||
echo -I${includedir}/libpng12 #CPPFLAGS
|
|
||||||
;;
|
|
||||||
|
|
||||||
--libs)
|
|
||||||
echo -lpng12 -lz #LIBS
|
|
||||||
;;
|
|
||||||
|
|
||||||
--ldflags)
|
|
||||||
echo -L${exec_prefix}/lib #LDFLAGS
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
usage
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
|
|
||||||
exit 0
|
|
@ -6,6 +6,6 @@ includedir=${exec_prefix}/include
|
|||||||
|
|
||||||
Name: libpng12
|
Name: libpng12
|
||||||
Description: Loads and saves PNG files
|
Description: Loads and saves PNG files
|
||||||
Version: 1.2.3rc5
|
Version: 1.2.3rc6
|
||||||
Libs: -L${libdir} -lpng12 -lz -lm
|
Libs: -L${libdir} -lpng12 -lz -lm
|
||||||
Cflags: -I${includedir}/libpng12
|
Cflags: -I${includedir}/libpng12
|
||||||
|
@ -33,7 +33,7 @@ RANLIB=echo
|
|||||||
|
|
||||||
LIBNAME=libpng12
|
LIBNAME=libpng12
|
||||||
PNGMAJ = 0
|
PNGMAJ = 0
|
||||||
PNGMIN = 1.2.3rc5
|
PNGMIN = 1.2.3rc6
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
INCPATH=$(prefix)/include
|
INCPATH=$(prefix)/include
|
||||||
@ -74,7 +74,7 @@ libpng.pc:
|
|||||||
libpng-config:
|
libpng-config:
|
||||||
( cat scripts/libpng-config-head.in; \
|
( cat scripts/libpng-config-head.in; \
|
||||||
echo prefix=\"$(prefix)\"; \
|
echo prefix=\"$(prefix)\"; \
|
||||||
echo cppflags=\"-I$(INCPATH)/libpng12"; \
|
echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
|
||||||
echo cflags=\"-xtarget=ultra\"; \
|
echo cflags=\"-xtarget=ultra\"; \
|
||||||
echo ldflags=\"-xtarget=ultra -L$(LIBPATH) -R$(LIBPATH)\"; \
|
echo ldflags=\"-xtarget=ultra -L$(LIBPATH) -R$(LIBPATH)\"; \
|
||||||
echo libs=\"-lpng12 -lz -lm\"; \
|
echo libs=\"-lpng12 -lz -lm\"; \
|
||||||
|
@ -33,7 +33,7 @@ RANLIB=echo
|
|||||||
|
|
||||||
LIBNAME=libpng12
|
LIBNAME=libpng12
|
||||||
PNGMAJ = 0
|
PNGMAJ = 0
|
||||||
PNGMIN = 1.2.3rc5
|
PNGMIN = 1.2.3rc6
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
INCPATH=$(prefix)/include
|
INCPATH=$(prefix)/include
|
||||||
@ -74,7 +74,7 @@ libpng.pc:
|
|||||||
libpng-config:
|
libpng-config:
|
||||||
( cat scripts/libpng-config-head.in; \
|
( cat scripts/libpng-config-head.in; \
|
||||||
echo prefix=\"$(prefix)\"; \
|
echo prefix=\"$(prefix)\"; \
|
||||||
echo cppflags=\"-I$(INCPATH)/libpng12"; \
|
echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
|
||||||
echo cflags=\"-xtarget=ultra -xarch=v9\"; \
|
echo cflags=\"-xtarget=ultra -xarch=v9\"; \
|
||||||
echo ldflags=\"-xtarget=ultra -xarch=v9 -L$(LIBPATH) -R$(LIBPATH)\"; \
|
echo ldflags=\"-xtarget=ultra -xarch=v9 -L$(LIBPATH) -R$(LIBPATH)\"; \
|
||||||
echo libs=\"-lpng12 -lz -lm\"; \
|
echo libs=\"-lpng12 -lz -lm\"; \
|
||||||
|
@ -14,7 +14,7 @@ ZLIBINC=/usr/local/include
|
|||||||
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
|
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
|
||||||
# have to change it.
|
# have to change it.
|
||||||
PNGMAJ = 0
|
PNGMAJ = 0
|
||||||
PNGMIN = 1.2.3rc5
|
PNGMIN = 1.2.3rc6
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
ALIGN=
|
ALIGN=
|
||||||
@ -74,9 +74,9 @@ libpng.pc:
|
|||||||
libpng-config:
|
libpng-config:
|
||||||
( cat scripts/libpng-config-head.in; \
|
( cat scripts/libpng-config-head.in; \
|
||||||
echo prefix=\"$(prefix)\"; \
|
echo prefix=\"$(prefix)\"; \
|
||||||
echo cppflags=\"-I$(INCPATH)/libpng12"; \
|
echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
|
||||||
echo cflags=\"\"; \
|
echo cflags=\"\"; \
|
||||||
echo ldflags=\"-Wl,-soname=$(LIBNAME).so.$(PNGMAJ)"; \
|
echo ldflags=\"-Wl,-soname=$(LIBNAME).so.$(PNGMAJ)\"; \
|
||||||
echo libs=\"-lpng12 -lz -lm\"; \
|
echo libs=\"-lpng12 -lz -lm\"; \
|
||||||
cat scripts/libpng-config-body.in ) > libpng-config
|
cat scripts/libpng-config-body.in ) > libpng-config
|
||||||
chmod +x libpng-config
|
chmod +x libpng-config
|
||||||
|
@ -9,14 +9,14 @@
|
|||||||
# For conditions of distribution and use, see copyright notice in png.h
|
# For conditions of distribution and use, see copyright notice in png.h
|
||||||
|
|
||||||
# this makefile intends to support building outside the src directory
|
# this makefile intends to support building outside the src directory
|
||||||
# if desired. when invoking it, specify an argument to SRC on the
|
# if desired. when invoking it, specify an argument to SRCDIR on the
|
||||||
# command line that points to the top of the directory where your source
|
# command line that points to the top of the directory where your source
|
||||||
# is located.
|
# is located.
|
||||||
|
|
||||||
ifdef SRC
|
ifdef SRCDIR
|
||||||
VPATH = $(SRC)
|
VPATH = $(SRCDIR)
|
||||||
else
|
else
|
||||||
SRC = .
|
SRCDIR = .
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# override DESTDIR= on the make install command line to easily support
|
# override DESTDIR= on the make install command line to easily support
|
||||||
@ -30,9 +30,12 @@ endif
|
|||||||
|
|
||||||
DESTDIR=
|
DESTDIR=
|
||||||
|
|
||||||
|
# cosmetic: shortened strings:
|
||||||
|
S =$(SRCDIR)
|
||||||
|
D =$(DESTDIR)
|
||||||
|
|
||||||
# To enable assembler optimizations, add '-DPNG_USE_PNGGCCRD' to
|
# To enable assembler optimizations, add '-DPNG_USE_PNGGCCRD' to
|
||||||
# $CFLAGS, and include pnggccrd.o in $OBJS, below, and in the dependency
|
# $CFLAGS, and include pnggccrd.o in $OBJS, below.
|
||||||
# list at the bottom of this file.
|
|
||||||
|
|
||||||
CC=gcc
|
CC=gcc
|
||||||
ifdef MINGW
|
ifdef MINGW
|
||||||
@ -47,8 +50,8 @@ $(warning You haven't specified a 'prefix=' location. Defaulting to "/usr")
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# Where the zlib library and include files are located
|
# Where the zlib library and include files are located
|
||||||
ZLIBLIB=/lib#$(DESTDIR)$(LIBPATH)
|
ZLIBLIB= /usr/lib
|
||||||
ZLIBINC=#$(DESTDIR)$(INCPATH)
|
ZLIBINC=
|
||||||
#ZLIBLIB=../zlib
|
#ZLIBLIB=../zlib
|
||||||
#ZLIBINC=../zlib
|
#ZLIBINC=../zlib
|
||||||
|
|
||||||
@ -78,7 +81,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
|
|||||||
LIBNAME = libpng12
|
LIBNAME = libpng12
|
||||||
PNGMAJ = 0
|
PNGMAJ = 0
|
||||||
PNGDLL = 12
|
PNGDLL = 12
|
||||||
PNGMIN = 1.2.3rc5
|
PNGMIN = 1.2.3rc6
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
SHAREDLIB=cygpng$(PNGDLL).dll
|
SHAREDLIB=cygpng$(PNGDLL).dll
|
||||||
@ -88,9 +91,9 @@ SHAREDDEF=libpng.def
|
|||||||
LIBS=$(SHAREDLIB) $(STATLIB)
|
LIBS=$(SHAREDLIB) $(STATLIB)
|
||||||
EXE=.exe
|
EXE=.exe
|
||||||
|
|
||||||
LDFLAGS=$(strip -L. $(MINGW_LDFLAGS) $(addprefix -L,$(ZLIBLIB)) -lpng -lz)
|
LDFLAGS=$(strip -L. $(MINGW_LDFLAGS) -lpng $(addprefix -L,$(ZLIBLIB)) -lz)
|
||||||
LDSFLAGS=$(strip -shared -L. $(MINGW_LDFLAGS) -Wl,--export-all)
|
LDSFLAGS=$(strip -shared -L. $(MINGW_LDFLAGS) -Wl,--export-all)
|
||||||
LDEXTRA=-Wl,--out-implib=$(IMPLIB)
|
LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz
|
||||||
|
|
||||||
MKDIR=/bin/mkdir -pv
|
MKDIR=/bin/mkdir -pv
|
||||||
RANLIB=ranlib
|
RANLIB=ranlib
|
||||||
@ -125,25 +128,24 @@ buildsetup-tell:
|
|||||||
@echo VPATH is set to: \"$(VPATH)\"
|
@echo VPATH is set to: \"$(VPATH)\"
|
||||||
@echo prefix is set to: \"$(prefix)\"
|
@echo prefix is set to: \"$(prefix)\"
|
||||||
@echo -e INCPATH,LIBPATH, etc. are set to:'\n' \
|
@echo -e INCPATH,LIBPATH, etc. are set to:'\n' \
|
||||||
$(addprefix $(DESTDIR),$(INCPATH)'\n' $(LIBPATH)'\n' $(BINPATH)'\n' \
|
$(addprefix $(D),$(INCPATH)'\n' $(LIBPATH)'\n' $(BINPATH)'\n' \
|
||||||
$(MANPATH)'\n' $(MAN3PATH)'\n' $(MAN5PATH)'\n')'\n'
|
$(MANPATH)'\n' $(MAN3PATH)'\n' $(MAN5PATH)'\n')'\n'
|
||||||
|
|
||||||
libpng.pc: scripts/libpng.pc.in
|
libpng.pc: scripts/libpng.pc.in
|
||||||
@echo -e Making pkg-config file for this libpng installation..'\n' \
|
@echo -e Making pkg-config file for this libpng installation..'\n' \
|
||||||
using PREFIX=\"$(prefix)\"'\n'
|
using PREFIX=\"$(prefix)\"'\n'
|
||||||
cat $(SRC)/scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! | \
|
cat $(S)/scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
|
||||||
sed -e s/-lm// > libpng.pc
|
|
||||||
|
|
||||||
libpng-config: scripts/libpng-config.in
|
libpng-config: scripts/libpng-config.in
|
||||||
@echo -e Making libpng-config file for this libpng installation..'\n' \
|
@echo -e Making $(LIBNAME) libpng-config file for this libpng \
|
||||||
using PREFIX=\"$(prefix)\"'\n'
|
installation..'\n' using PREFIX=\"$(prefix)\"'\n'
|
||||||
( cat $(SRC)/scripts/libpng-config-head.in; \
|
( cat $(S)/scripts/libpng-config-head.in; \
|
||||||
echo prefix=\"$(prefix)\"; \
|
echo prefix=\"$(prefix)\"; \
|
||||||
echo cppflags=\"-I$(INCPATH)/libpng12"; \
|
echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
|
||||||
echo cflags=\"\"; \
|
echo cflags=\"\"; \
|
||||||
echo ldflags=\"-L$(LIBPATH)"; \
|
echo ldflags=\"-L$(LIBPATH)\"; \
|
||||||
echo libs=\"-lpng12 -lz\"; \
|
echo libs=\"-lpng$(PNGDLL) -lz\"; \
|
||||||
cat $(SRC)/scripts/libpng-config-body.in ) > libpng-config
|
cat $(S)/scripts/libpng-config-body.in ) > libpng-config
|
||||||
chmod +x libpng-config
|
chmod +x libpng-config
|
||||||
|
|
||||||
static: all-static
|
static: all-static
|
||||||
@ -153,19 +155,15 @@ all-shared: $(SHAREDLIB) pngtest$(EXE)
|
|||||||
|
|
||||||
pnggccrd.o: pnggccrd.c png.h pngconf.h
|
pnggccrd.o: pnggccrd.c png.h pngconf.h
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo \
|
@echo ' You can ignore the single "control reaches end of non-void function"'
|
||||||
' You can ignore the single "control reaches end of non-void function"'
|
@echo ' warning and multiple "<variable> defined but not used" warnings:'
|
||||||
@echo \
|
|
||||||
' warning and multiple "<variable> defined but not used" warnings:'
|
|
||||||
@echo ""
|
@echo ""
|
||||||
$(CC) -c $(CFLAGS) -o $@ $<
|
$(CC) -c $(CFLAGS) -o $@ $<
|
||||||
|
|
||||||
pnggccrd.pic.o: pnggccrd.c png.h pngconf.h
|
pnggccrd.pic.o: pnggccrd.c png.h pngconf.h
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo \
|
@echo ' You can ignore the single "control reaches end of non-void function"'
|
||||||
' You can ignore the single "control reaches end of non-void function"'
|
@echo ' warning and multiple "<variable> defined but not used" warnings:'
|
||||||
@echo \
|
|
||||||
' warning and multiple "<variable> defined but not used" warnings:'
|
|
||||||
@echo ""
|
@echo ""
|
||||||
$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
|
$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
|
||||||
|
|
||||||
@ -178,7 +176,7 @@ $(SHAREDDEF): projects/msvc/png32ms.def
|
|||||||
sed -e 's/\([^;]*\);/;/' > $@
|
sed -e 's/\([^;]*\);/;/' > $@
|
||||||
|
|
||||||
$(SHAREDLIB): $(OBJSDLL) $(SHAREDDEF)
|
$(SHAREDLIB): $(OBJSDLL) $(SHAREDDEF)
|
||||||
$(CC) $(LDSFLAGS) -o $@ $(LDEXTRA) $(OBJSDLL) -L. -L$(ZLIBLIB) -lz
|
$(CC) $(LDSFLAGS) -o $@ $(OBJSDLL) -L. $(LDEXTRA)
|
||||||
|
|
||||||
pngtest$(EXE): pngtest.pic.o $(SHAREDLIB)
|
pngtest$(EXE): pngtest.pic.o $(SHAREDLIB)
|
||||||
$(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
|
$(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
|
||||||
@ -195,67 +193,68 @@ pngtest.o: pngtest.c
|
|||||||
test: test-static test-shared
|
test: test-static test-shared
|
||||||
|
|
||||||
test-static: pngtest-stat$(EXE)
|
test-static: pngtest-stat$(EXE)
|
||||||
./pngtest-stat $(SRC)/pngtest.png
|
./pngtest-stat $(S)/pngtest.png
|
||||||
|
|
||||||
test-shared: pngtest$(EXE)
|
test-shared: pngtest$(EXE)
|
||||||
./pngtest $(SRC)/pngtest.png
|
./pngtest $(S)/pngtest.png
|
||||||
|
|
||||||
install-static: $(STATLIB) install-headers install-man
|
install-static: $(STATLIB) install-headers install-man
|
||||||
-@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then $(MKDIR) $(DESTDIR)$(LIBPATH); fi
|
-@if [ ! -d $(D)$(LIBPATH) ]; then $(MKDIR) $(D)$(LIBPATH); fi
|
||||||
install -m 644 $(STATLIB) $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
|
install -m 644 $(STATLIB) $(D)$(LIBPATH)/$(LIBNAME).a
|
||||||
-@rm -f $(DESTDIR)$(LIBPATH)/$(STATLIB)
|
-@rm -f $(D)$(LIBPATH)/$(STATLIB)
|
||||||
(cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).a $(STATLIB))
|
(cd $(D)$(LIBPATH); ln -sf $(LIBNAME).a $(STATLIB))
|
||||||
|
|
||||||
install-shared: $(SHAREDLIB) libpng.pc libpng-config install-headers install-man
|
install-shared: $(SHAREDLIB) libpng.pc libpng-config install-headers install-man
|
||||||
-@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then $(MKDIR) $(DESTDIR)$(LIBPATH); fi
|
-@if [ ! -d $(D)$(LIBPATH) ]; then $(MKDIR) $(D)$(LIBPATH); fi
|
||||||
-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then $(MKDIR) $(DESTDIR)$(BINPATH); fi
|
-@if [ ! -d $(D)$(BINPATH) ]; then $(MKDIR) $(D)$(BINPATH); fi
|
||||||
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
|
-@if [ ! -d $(D)$(LIBPATH)/pkgconfig ]; then \
|
||||||
$(MKDIR) $(DESTDIR)$(LIBPATH)/pkgconfig; fi
|
$(MKDIR) $(D)$(LIBPATH)/pkgconfig; fi
|
||||||
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
|
-@/bin/rm -f $(D)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
|
||||||
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
|
-@/bin/rm -f $(D)$(LIBPATH)/pkgconfig/libpng.pc
|
||||||
install -m 644 $(IMPLIB) $(DESTDIR)$(LIBPATH)/$(LIBNAME).dll.a
|
install -m 644 $(IMPLIB) $(D)$(LIBPATH)/$(LIBNAME).dll.a
|
||||||
-@rm -f $(DESTDIR)$(LIBPATH)/$(IMPLIB)
|
-@rm -f $(D)$(LIBPATH)/$(IMPLIB)
|
||||||
(cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).dll.a $(IMPLIB))
|
(cd $(D)$(LIBPATH); ln -sf $(LIBNAME).dll.a $(IMPLIB))
|
||||||
install -s -m 755 $(SHAREDLIB) $(DESTDIR)$(BINPATH)
|
install -s -m 755 $(SHAREDLIB) $(D)$(BINPATH)
|
||||||
install -m 644 libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
|
install -m 644 libpng.pc $(D)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
|
||||||
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)
|
(cd $(D)$(LIBPATH)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)
|
||||||
|
|
||||||
install-headers:
|
install-headers:
|
||||||
-@if [ ! -d $(DESTDIR)$(INCPATH) ]; then \
|
-@if [ ! -d $(D)$(INCPATH) ]; then \
|
||||||
$(MKDIR) $(DESTDIR)$(INCPATH); fi
|
$(MKDIR) $(D)$(INCPATH); fi
|
||||||
-@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
|
-@if [ ! -d $(D)$(INCPATH)/$(LIBNAME) ]; then \
|
||||||
$(MKDIR) $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
|
$(MKDIR) $(D)$(INCPATH)/$(LIBNAME); fi
|
||||||
-@rm -f $(DESTDIR)$(INCPATH)/png.h
|
-@rm -f $(D)$(INCPATH)/png.h
|
||||||
-@rm -f $(DESTDIR)$(INCPATH)/pngconf.h
|
-@rm -f $(D)$(INCPATH)/pngconf.h
|
||||||
install -m 644 $(SRC)/png.h $(SRC)/pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
|
install -m 644 $(S)/png.h $(S)/pngconf.h $(D)$(INCPATH)/$(LIBNAME)
|
||||||
-@rm -f $(DESTDIR)$(INCPATH)/libpng
|
-@rm -f $(D)$(INCPATH)/libpng
|
||||||
(cd $(DESTDIR)$(INCPATH); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
|
(cd $(D)$(INCPATH); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
|
||||||
|
|
||||||
install-man:
|
install-man:
|
||||||
-@if [ ! -d $(DESTDIR)$(MAN3PATH) ]; then \
|
-@if [ ! -d $(D)$(MAN3PATH) ]; then \
|
||||||
$(MKDIR) $(DESTDIR)$(MAN3PATH); fi
|
$(MKDIR) $(D)$(MAN3PATH); fi
|
||||||
-@if [ ! -d $(DESTDIR)$(MAN5PATH) ]; then \
|
-@if [ ! -d $(D)$(MAN5PATH) ]; then \
|
||||||
$(MKDIR) $(DESTDIR)$(MAN5PATH); fi
|
$(MKDIR) $(D)$(MAN5PATH); fi
|
||||||
install -m 644 $(SRC)/libpngpf.3 $(SRC)/libpng.3 $(DESTDIR)$(MAN3PATH)
|
install -m 644 $(S)/libpngpf.3 $(S)/libpng.3 $(D)$(MAN3PATH)
|
||||||
install -m 644 $(SRC)/png.5 $(DESTDIR)$(MAN5PATH)
|
install -m 644 $(S)/png.5 $(D)$(MAN5PATH)
|
||||||
|
|
||||||
install-config: libpng-config
|
install-config: libpng-config
|
||||||
-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
|
-@if [ ! -d $(D)$(BINPATH) ]; then \
|
||||||
mkdir $(DESTDIR)$(BINPATH); fi
|
mkdir $(D)$(BINPATH); fi
|
||||||
-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
|
-@/bin/rm -f $(D)$(BINPATH)/libpng-config
|
||||||
-@/bin/rm -f $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
|
-@/bin/rm -f $(D)$(BINPATH)/$(LIBNAME)-config
|
||||||
cp libpng-config $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
|
cp libpng-config $(D)$(BINPATH)/$(LIBNAME)-config
|
||||||
chmod 755 $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
|
chmod 755 $(D)$(BINPATH)/$(LIBNAME)-config
|
||||||
(cd $(DESTDIR)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)
|
(cd $(D)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)
|
||||||
|
|
||||||
# run this to verify that a future `configure' run will pick up the settings you want.
|
# run this to verify that a future `configure' run will pick up the settings
|
||||||
|
# you want.
|
||||||
test-config-install: SHELL=/bin/bash
|
test-config-install: SHELL=/bin/bash
|
||||||
test-config-install: $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
|
test-config-install: $(D)$(BINPATH)/libpng-config
|
||||||
@echo -e Testing libpng-config functions...'\n'
|
@echo -e Testing libpng-config functions...'\n'
|
||||||
@ for TYRA in LDFLAGS CPPFLAGS CFLAGS LIBS VERSION; \
|
@ for TYRA in LDFLAGS CPPFLAGS CFLAGS LIBS VERSION; \
|
||||||
do \
|
do \
|
||||||
printf "(%d)\t %s = %s\n" $$(($$gytiu + 1)) $$TYRA \
|
printf "(%d)\t %s = %s\n" $$(($$gytiu + 1)) $$TYRA \
|
||||||
$$(libpng-config `echo "--$$TYRA" |tr '[:upper:]' '[:lower:]'`); \
|
"$$($(D)$(BINPATH)/libpng-config `echo --$$TYRA |tr '[:upper:]' '[:lower:]'`)"; \
|
||||||
gytiu=$$(( $$gytiu + 1 )); \
|
gytiu=$$(( $$gytiu + 1 )); \
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -264,7 +263,8 @@ install: install-static install-shared install-man install-config
|
|||||||
|
|
||||||
clean:
|
clean:
|
||||||
/bin/rm -f *.pic.o *.o $(STATLIB) $(IMPLIB) $(SHAREDLIB) \
|
/bin/rm -f *.pic.o *.o $(STATLIB) $(IMPLIB) $(SHAREDLIB) \
|
||||||
pngtest-stat$(EXE) pngtest$(EXE) pngout.png $(SHAREDDEF)
|
pngtest-stat$(EXE) pngtest$(EXE) pngout.png $(SHAREDDEF) \
|
||||||
|
libpng-config libpng.pc
|
||||||
|
|
||||||
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
|
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
|
||||||
writelock:
|
writelock:
|
||||||
@ -295,3 +295,5 @@ pngtest-stat.o: png.h pngconf.h pngtest.c
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ RANLIB=ranlib
|
|||||||
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
|
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
|
||||||
# have to change it.
|
# have to change it.
|
||||||
PNGMAJ = 0
|
PNGMAJ = 0
|
||||||
PNGMIN = 1.2.3rc5
|
PNGMIN = 1.2.3rc6
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
LIBNAME = libpng12
|
LIBNAME = libpng12
|
||||||
|
|
||||||
@ -68,7 +68,7 @@ libpng.pc:
|
|||||||
libpng-config:
|
libpng-config:
|
||||||
( cat scripts/libpng-config-head.in; \
|
( cat scripts/libpng-config-head.in; \
|
||||||
echo prefix=\"$(prefix)\"; \
|
echo prefix=\"$(prefix)\"; \
|
||||||
echo cppflags=\"-I$(INCPATH)/libpng12"; \
|
echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
|
||||||
echo cflags=\"\"; \
|
echo cflags=\"\"; \
|
||||||
echo ldflags=\"-L$(LIBPATH)\"; \
|
echo ldflags=\"-L$(LIBPATH)\"; \
|
||||||
echo libs=\"-lpng12 -lz\"; \
|
echo libs=\"-lpng12 -lz\"; \
|
||||||
|
@ -29,7 +29,7 @@ ZLIBINC=../zlib
|
|||||||
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
|
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
|
||||||
# have to change it.
|
# have to change it.
|
||||||
PNGMAJ = 0
|
PNGMAJ = 0
|
||||||
PNGMIN = 1.2.3rc5
|
PNGMIN = 1.2.3rc6
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
LIBNAME = libpng12
|
LIBNAME = libpng12
|
||||||
|
|
||||||
@ -56,17 +56,13 @@ libpng.pc:
|
|||||||
libpng-config:
|
libpng-config:
|
||||||
( cat scripts/libpng-config-head.in; \
|
( cat scripts/libpng-config-head.in; \
|
||||||
echo prefix=\"$(prefix)\"; \
|
echo prefix=\"$(prefix)\"; \
|
||||||
echo cppflags=\"-I$(INCPATH)/libpng12"; \
|
echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
|
||||||
echo cflags=\"-std\"; \
|
echo cflags=\"-std\"; \
|
||||||
echo ldflags=\"-L$(LIBPATH)\"; \
|
echo ldflags=\"-L$(LIBPATH)\"; \
|
||||||
echo libs=\"-lpng12 -lz -lm\"; \
|
echo libs=\"-lpng12 -lz -lm\"; \
|
||||||
cat scripts/libpng-config-body.in ) > libpng-config
|
cat scripts/libpng-config-body.in ) > libpng-config
|
||||||
chmod +x libpng-config
|
chmod +x libpng-config
|
||||||
|
|
||||||
cat scripts/libpng-config.in | sed -e s\!@PREFIX@!$(prefix)! > \
|
|
||||||
-e s!\#LIBS!-lm! > libpng-config
|
|
||||||
chmod +x libpng-config
|
|
||||||
|
|
||||||
$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
|
$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
|
||||||
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
|
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
LIBNAME = libpng12
|
LIBNAME = libpng12
|
||||||
PNGMAJ = 0
|
PNGMAJ = 0
|
||||||
PNGMIN = 1.2.3rc5
|
PNGMIN = 1.2.3rc6
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
CC=gcc
|
CC=gcc
|
||||||
@ -94,7 +94,7 @@ libpng.pc:
|
|||||||
libpng-config:
|
libpng-config:
|
||||||
( cat scripts/libpng-config-head.in; \
|
( cat scripts/libpng-config-head.in; \
|
||||||
echo prefix=\"$(prefix)\"; \
|
echo prefix=\"$(prefix)\"; \
|
||||||
echo cppflags=\"-I$(INCPATH)/libpng12 -DPNG_THREAD_UNSAFE_OK \
|
echo cppflags=\"-I$(INCPATH)/$(LIBNAME) -DPNG_THREAD_UNSAFE_OK \
|
||||||
-DPNG_USE_PNGGCCRD"; \
|
-DPNG_USE_PNGGCCRD"; \
|
||||||
echo cflags=\"\"; \
|
echo cflags=\"\"; \
|
||||||
echo ldflags=\"\"; \
|
echo ldflags=\"\"; \
|
||||||
@ -102,11 +102,6 @@ libpng-config:
|
|||||||
cat scripts/libpng-config-body.in ) > libpng-config
|
cat scripts/libpng-config-body.in ) > libpng-config
|
||||||
chmod +x libpng-config
|
chmod +x libpng-config
|
||||||
|
|
||||||
cat scripts/libpng-config.in | sed -e s\!@PREFIX@!$(prefix)! > \
|
|
||||||
-e s!\#CFLAGS!-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD! \
|
|
||||||
-e s!\#LIBS!-lm! > libpng-config
|
|
||||||
chmod +x libpng-config
|
|
||||||
|
|
||||||
pnggccrd.o: pnggccrd.c png.h pngconf.h
|
pnggccrd.o: pnggccrd.c png.h pngconf.h
|
||||||
$(CC) -c $(CFLAGS) -o $@ $*.c
|
$(CC) -c $(CFLAGS) -o $@ $*.c
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ RANLIB=ranlib
|
|||||||
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
|
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
|
||||||
# have to change it.
|
# have to change it.
|
||||||
PNGMAJ = 0
|
PNGMAJ = 0
|
||||||
PNGMIN = 1.2.3rc5
|
PNGMIN = 1.2.3rc6
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
LIBNAME = libpng12
|
LIBNAME = libpng12
|
||||||
|
|
||||||
@ -77,7 +77,7 @@ libpng.pc:
|
|||||||
libpng-config:
|
libpng-config:
|
||||||
( cat scripts/libpng-config-head.in; \
|
( cat scripts/libpng-config-head.in; \
|
||||||
echo prefix=\"$(prefix)\"; \
|
echo prefix=\"$(prefix)\"; \
|
||||||
echo cppflags=\"-I$(INCPATH)/libpng12"; \
|
echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
|
||||||
echo cflags=\"\"; \
|
echo cflags=\"\"; \
|
||||||
echo ldflags=\"\"; \
|
echo ldflags=\"\"; \
|
||||||
echo libs=\"-lpng12 -lz -lm\"; \
|
echo libs=\"-lpng12 -lz -lm\"; \
|
||||||
|
@ -19,7 +19,7 @@ RANLIB=ranlib
|
|||||||
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
|
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
|
||||||
# have to change it.
|
# have to change it.
|
||||||
PNGMAJ = 0
|
PNGMAJ = 0
|
||||||
PNGMIN = 1.2.3rc5
|
PNGMIN = 1.2.3rc6
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
LIBNAME = libpng12
|
LIBNAME = libpng12
|
||||||
|
|
||||||
@ -63,7 +63,7 @@ libpng.pc:
|
|||||||
libpng-config:
|
libpng-config:
|
||||||
( cat scripts/libpng-config-head.in; \
|
( cat scripts/libpng-config-head.in; \
|
||||||
echo prefix=\"$(prefix)\"; \
|
echo prefix=\"$(prefix)\"; \
|
||||||
echo cppflags=\"-I$(INCPATH)/libpng12"; \
|
echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
|
||||||
echo cflags=\"-Ae +DA1.1 +DS2.0"; \
|
echo cflags=\"-Ae +DA1.1 +DS2.0"; \
|
||||||
echo ldflags=\"-L$(LIBPATH)\"; \
|
echo ldflags=\"-L$(LIBPATH)\"; \
|
||||||
echo libs=\"-lpng12 -lz -lm\"; \
|
echo libs=\"-lpng12 -lz -lm\"; \
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
LIBNAME = libpng12
|
LIBNAME = libpng12
|
||||||
PNGMAJ = 0
|
PNGMAJ = 0
|
||||||
PNGMIN = 1.2.3rc5
|
PNGMIN = 1.2.3rc6
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
CC=gcc
|
CC=gcc
|
||||||
@ -77,17 +77,13 @@ libpng.pc:
|
|||||||
libpng-config:
|
libpng-config:
|
||||||
( cat scripts/libpng-config-head.in; \
|
( cat scripts/libpng-config-head.in; \
|
||||||
echo prefix=\"$(prefix)\"; \
|
echo prefix=\"$(prefix)\"; \
|
||||||
echo cppflags=\"-I$(INCPATH)/libpng12"; \
|
echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
|
||||||
echo cflags=\"\"; \
|
echo cflags=\"\"; \
|
||||||
echo ldflags=\"-L$(LIBPATH) -Wl,-rpath,$(LIBPATH)"; \
|
echo ldflags=\"-L$(LIBPATH) -Wl,-rpath,$(LIBPATH)\"; \
|
||||||
echo libs=\"-lpng12 -lz -lm\"; \
|
echo libs=\"-lpng12 -lz -lm\"; \
|
||||||
cat scripts/libpng-config-body.in ) > libpng-config
|
cat scripts/libpng-config-body.in ) > libpng-config
|
||||||
chmod +x libpng-config
|
chmod +x libpng-config
|
||||||
|
|
||||||
cat scripts/libpng-config.in | sed -e s\!@PREFIX@!$(prefix)! > \
|
|
||||||
-e s!\#LIBS!-lm! > libpng-config
|
|
||||||
chmod +x libpng-config
|
|
||||||
|
|
||||||
$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
|
$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
|
||||||
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
|
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ ZLIBINC=../zlib
|
|||||||
CC=cc
|
CC=cc
|
||||||
|
|
||||||
PNGMAJ = 0
|
PNGMAJ = 0
|
||||||
PNGMIN = 1.2.3rc5
|
PNGMIN = 1.2.3rc6
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
|
CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
|
||||||
@ -60,17 +60,13 @@ libpng.pc:
|
|||||||
libpng-config:
|
libpng-config:
|
||||||
( cat scripts/libpng-config-head.in; \
|
( cat scripts/libpng-config-head.in; \
|
||||||
echo prefix=\"$(prefix)\"; \
|
echo prefix=\"$(prefix)\"; \
|
||||||
echo cppflags=\"-I$(INCPATH)/libpng12"; \
|
echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
|
||||||
echo cflags=\"\"; \
|
echo cflags=\"\"; \
|
||||||
echo ldflags=\"-L$(LIBPATH)\"; \
|
echo ldflags=\"-L$(LIBPATH)\"; \
|
||||||
echo libs=\"-lpng12 -lz\"; \
|
echo libs=\"-lpng12 -lz\"; \
|
||||||
cat scripts/libpng-config-body.in ) > libpng-config
|
cat scripts/libpng-config-body.in ) > libpng-config
|
||||||
chmod +x libpng-config
|
chmod +x libpng-config
|
||||||
|
|
||||||
cat scripts/libpng-config.in | sed -e s\!@PREFIX@!$(prefix)! > \
|
|
||||||
libpng-config
|
|
||||||
chmod +x libpng-config
|
|
||||||
|
|
||||||
libpng.a: $(OBJS)
|
libpng.a: $(OBJS)
|
||||||
ar rc $@ $(OBJS)
|
ar rc $@ $(OBJS)
|
||||||
$(RANLIB) $@
|
$(RANLIB) $@
|
||||||
|
@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
|
|||||||
|
|
||||||
LIB= png12
|
LIB= png12
|
||||||
SHLIB_MAJOR= 0
|
SHLIB_MAJOR= 0
|
||||||
SHLIB_MINOR= 1.2.3rc5
|
SHLIB_MINOR= 1.2.3rc6
|
||||||
SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
|
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 \
|
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
|
||||||
pngwtran.c pngmem.c pngerror.c pngpread.c
|
pngwtran.c pngmem.c pngerror.c pngpread.c
|
||||||
|
@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng
|
|||||||
|
|
||||||
LIB= png
|
LIB= png
|
||||||
SHLIB_MAJOR= 3
|
SHLIB_MAJOR= 3
|
||||||
SHLIB_MINOR= 1.2.3rc5
|
SHLIB_MINOR= 1.2.3rc6
|
||||||
SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
|
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 \
|
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
|
||||||
pngwtran.c pngmem.c pngerror.c pngpread.c
|
pngwtran.c pngmem.c pngerror.c pngpread.c
|
||||||
|
@ -26,7 +26,7 @@ RANLIB=echo
|
|||||||
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
|
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
|
||||||
# have to change it.
|
# have to change it.
|
||||||
PNGMAJ = 0
|
PNGMAJ = 0
|
||||||
PNGMIN = 1.2.3rc5
|
PNGMIN = 1.2.3rc6
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
LIBNAME = libpng12
|
LIBNAME = libpng12
|
||||||
|
|
||||||
@ -68,7 +68,7 @@ libpng.pc:
|
|||||||
libpng-config:
|
libpng-config:
|
||||||
( cat scripts/libpng-config-head.in; \
|
( cat scripts/libpng-config-head.in; \
|
||||||
echo prefix=\"$(prefix)\"; \
|
echo prefix=\"$(prefix)\"; \
|
||||||
echo cppflags=\"-I$(INCPATH)/libpng12"; \
|
echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
|
||||||
echo cflags=\"-belf\"; \
|
echo cflags=\"-belf\"; \
|
||||||
echo ldflags=\"-L$(LIBPATH)\"; \
|
echo ldflags=\"-L$(LIBPATH)\"; \
|
||||||
echo libs=\"-lpng12 -lz -lm\"; \
|
echo libs=\"-lpng12 -lz -lm\"; \
|
||||||
|
@ -38,7 +38,7 @@ LDSHARED=CC $(ABI) -shared
|
|||||||
|
|
||||||
LIBNAME=libpng12
|
LIBNAME=libpng12
|
||||||
PNGMAJ = 0
|
PNGMAJ = 0
|
||||||
PNGMIN = 1.2.3rc5
|
PNGMIN = 1.2.3rc6
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
LIBS=$(LIBNAME).so.$(PNGVER)
|
LIBS=$(LIBNAME).so.$(PNGVER)
|
||||||
INCPATH=$(prefix)/include
|
INCPATH=$(prefix)/include
|
||||||
@ -75,7 +75,7 @@ libpng.pc:
|
|||||||
libpng-config:
|
libpng-config:
|
||||||
( cat scripts/libpng-config-head.in; \
|
( cat scripts/libpng-config-head.in; \
|
||||||
echo prefix=\"$(prefix)\"; \
|
echo prefix=\"$(prefix)\"; \
|
||||||
echo cppflags=\"-I$(INCPATH)/libpng12 -DPNG_USE_PNGGCCRD \
|
echo cppflags=\"-I$(INCPATH)/$(LIBNAME) -DPNG_USE_PNGGCCRD \
|
||||||
-DPNG_NO_ASSEMBLER_CODE\"; \
|
-DPNG_NO_ASSEMBLER_CODE\"; \
|
||||||
echo cflags=\"$(ABI)\"; \
|
echo cflags=\"$(ABI)\"; \
|
||||||
echo ldflags=\"-L$(LIBPATH)\"; \
|
echo ldflags=\"-L$(LIBPATH)\"; \
|
||||||
|
@ -31,7 +31,7 @@ LDSHARED=cc $(ABI) -shared
|
|||||||
|
|
||||||
LIBNAME=libpng12
|
LIBNAME=libpng12
|
||||||
PNGMAJ = 0
|
PNGMAJ = 0
|
||||||
PNGMIN = 1.2.3rc5
|
PNGMIN = 1.2.3rc6
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
RANLIB=echo
|
RANLIB=echo
|
||||||
@ -68,7 +68,7 @@ libpng.pc:
|
|||||||
libpng-config:
|
libpng-config:
|
||||||
( cat scripts/libpng-config-head.in; \
|
( cat scripts/libpng-config-head.in; \
|
||||||
echo prefix=\"$(prefix)\"; \
|
echo prefix=\"$(prefix)\"; \
|
||||||
echo cppflags=\"-I$(INCPATH)/libpng12 -DPNG_USE_PNGGCCRD \
|
echo cppflags=\"-I$(INCPATH)/$(LIBNAME) -DPNG_USE_PNGGCCRD \
|
||||||
-DPNG_NO_ASSEMBLER_CODE\"; \
|
-DPNG_NO_ASSEMBLER_CODE\"; \
|
||||||
echo cflags=\"$(ABI)\"; \
|
echo cflags=\"$(ABI)\"; \
|
||||||
echo ldflags=\"-L$(LIBPATH)\"; \
|
echo ldflags=\"-L$(LIBPATH)\"; \
|
||||||
|
@ -36,7 +36,7 @@ RANLIB=echo
|
|||||||
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
|
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
|
||||||
# have to change it.
|
# have to change it.
|
||||||
PNGMAJ = 0
|
PNGMAJ = 0
|
||||||
PNGMIN = 1.2.3rc5
|
PNGMIN = 1.2.3rc6
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
LIBNAME = libpng12
|
LIBNAME = libpng12
|
||||||
|
|
||||||
@ -78,7 +78,7 @@ libpng.pc:
|
|||||||
libpng-config:
|
libpng-config:
|
||||||
( cat scripts/libpng-config-head.in; \
|
( cat scripts/libpng-config-head.in; \
|
||||||
echo prefix=\"$(prefix)\"; \
|
echo prefix=\"$(prefix)\"; \
|
||||||
echo cppflags=\"-I$(INCPATH)/libpng12\"; \
|
echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
|
||||||
echo cflags=\"\"; \
|
echo cflags=\"\"; \
|
||||||
echo ldflags=\"-L$(LIBPATH) -R$(LIBPATH)\"; \
|
echo ldflags=\"-L$(LIBPATH) -R$(LIBPATH)\"; \
|
||||||
echo libs=\"-lpng12 -lz -lm\"; \
|
echo libs=\"-lpng12 -lz -lm\"; \
|
||||||
|
@ -32,7 +32,7 @@ RANLIB=echo
|
|||||||
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
|
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
|
||||||
# have to change it.
|
# have to change it.
|
||||||
PNGMAJ = 0
|
PNGMAJ = 0
|
||||||
PNGMIN = 1.2.3rc5
|
PNGMIN = 1.2.3rc6
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
LIBNAME = libpng12
|
LIBNAME = libpng12
|
||||||
|
|
||||||
@ -74,7 +74,7 @@ libpng.pc:
|
|||||||
libpng-config:
|
libpng-config:
|
||||||
( cat scripts/libpng-config-head.in; \
|
( cat scripts/libpng-config-head.in; \
|
||||||
echo prefix=\"$(prefix)\"; \
|
echo prefix=\"$(prefix)\"; \
|
||||||
echo cppflags=\"-I$(INCPATH)/libpng12 -DPNG_USE_PNGGCCRD \
|
echo cppflags=\"-I$(INCPATH)/$(LIBNAME) -DPNG_USE_PNGGCCRD \
|
||||||
-DPNG_NO_ASSEMBLER_CODE\"; \
|
-DPNG_NO_ASSEMBLER_CODE\"; \
|
||||||
echo cflags=\"$(ABI)\"; \
|
echo cflags=\"$(ABI)\"; \
|
||||||
echo ldflags=\"-L$(LIBPATH) -R$(LIBPATH)\"; \
|
echo ldflags=\"-L$(LIBPATH) -R$(LIBPATH)\"; \
|
||||||
|
@ -7,7 +7,7 @@ unit pngdef;
|
|||||||
interface
|
interface
|
||||||
|
|
||||||
const
|
const
|
||||||
PNG_LIBPNG_VER_STRING = '1.2.3rc5';
|
PNG_LIBPNG_VER_STRING = '1.2.3rc6';
|
||||||
PNG_LIBPNG_VER = 10203;
|
PNG_LIBPNG_VER = 10203;
|
||||||
|
|
||||||
type
|
type
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
; PNG.LIB module definition file for OS/2
|
; PNG.LIB module definition file for OS/2
|
||||||
;----------------------------------------
|
;----------------------------------------
|
||||||
|
|
||||||
; Version 1.2.3rc5
|
; Version 1.2.3rc6
|
||||||
|
|
||||||
LIBRARY PNG
|
LIBRARY PNG
|
||||||
DESCRIPTION "PNG image compression library for OS/2"
|
DESCRIPTION "PNG image compression library for OS/2"
|
||||||
|
Reference in New Issue
Block a user