mirror of
https://git.code.sf.net/p/libpng/code.git
synced 2025-07-10 18:04:09 +02:00
Imported from libpng-1.4.0beta17.tar
This commit is contained in:
parent
701dbaa81e
commit
7edd45814c
25
ANNOUNCE
25
ANNOUNCE
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
Libpng 1.4.0beta16 - November 17, 2006
|
Libpng 1.4.0beta17 - December 8, 2006
|
||||||
|
|
||||||
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.
|
||||||
@ -9,27 +9,27 @@ Files available for download:
|
|||||||
Source files with LF line endings (for Unix/Linux) and with a
|
Source files with LF line endings (for Unix/Linux) and with a
|
||||||
"configure" script
|
"configure" script
|
||||||
|
|
||||||
1.4.0beta16.tar.gz
|
1.4.0beta17.tar.gz
|
||||||
1.4.0beta16.tar.bz2
|
1.4.0beta17.tar.bz2
|
||||||
|
|
||||||
Source files with LF line endings (for Unix/Linux) without the
|
Source files with LF line endings (for Unix/Linux) without the
|
||||||
"configure" script
|
"configure" script
|
||||||
|
|
||||||
1.4.0beta16-no-config.tar.gz
|
1.4.0beta17-no-config.tar.gz
|
||||||
1.4.0beta16-no-config.tar.bz2
|
1.4.0beta17-no-config.tar.bz2
|
||||||
|
|
||||||
Source files with CRLF line endings (for Windows), without the
|
Source files with CRLF line endings (for Windows), without the
|
||||||
"configure" script
|
"configure" script
|
||||||
|
|
||||||
lp140b16.zip
|
lp140b17.zip
|
||||||
lp140b16.tar.bz2
|
lp140b17.tar.bz2
|
||||||
|
|
||||||
Other information:
|
Other information:
|
||||||
|
|
||||||
1.4.0beta16-README.txt
|
1.4.0beta17-README.txt
|
||||||
1.4.0beta16-KNOWNBUGS.txt
|
1.4.0beta17-KNOWNBUGS.txt
|
||||||
1.4.0beta16-LICENSE.txt
|
1.4.0beta17-LICENSE.txt
|
||||||
1.4.0beta16-Y2K-compliance.txt
|
1.4.0beta17-Y2K-compliance.txt
|
||||||
|
|
||||||
Changes since the last public release (1.2.10):
|
Changes since the last public release (1.2.10):
|
||||||
|
|
||||||
@ -229,6 +229,9 @@ version 1.4.0beta15 [November 17, 2006]
|
|||||||
version 1.4.0beta16 [November 17, 2006]
|
version 1.4.0beta16 [November 17, 2006]
|
||||||
Added a typecast in png_zalloc().
|
Added a typecast in png_zalloc().
|
||||||
|
|
||||||
|
version 1.4.0beta17 [December 8, 2006]
|
||||||
|
Changed "new_key[79] = '\0';" to "(*new_key)[79] = '\0';" in pngwutil.c
|
||||||
|
|
||||||
version 1.4.0betaN [future]
|
version 1.4.0betaN [future]
|
||||||
Build shared libraries with -lz and sometimes -lm.
|
Build shared libraries with -lz and sometimes -lm.
|
||||||
|
|
||||||
|
4
CHANGES
4
CHANGES
@ -1732,6 +1732,10 @@ version 1.4.0beta15 [November 17, 2006]
|
|||||||
version 1.4.0beta16 [November 17, 2006]
|
version 1.4.0beta16 [November 17, 2006]
|
||||||
Added a typecast in png_zalloc().
|
Added a typecast in png_zalloc().
|
||||||
|
|
||||||
|
version 1.4.0beta17 [December 8, 2006]
|
||||||
|
Changed "new_key[79] = '\0';" to "(*new_key)[79] = '\0';" in pngwutil.c
|
||||||
|
Add "png_bytep" typecast to profile while calculating length in pngwutil.c
|
||||||
|
|
||||||
version 1.4.0betaN [future]
|
version 1.4.0betaN [future]
|
||||||
Build shared libraries with -lz and sometimes -lm.
|
Build shared libraries with -lz and sometimes -lm.
|
||||||
|
|
||||||
|
26
INSTALL
26
INSTALL
@ -1,9 +1,9 @@
|
|||||||
|
|
||||||
Installing libpng version 1.4.0beta16 - November 17, 2006
|
Installing libpng version 1.4.0beta17 - December 8, 2006
|
||||||
|
|
||||||
On Unix/Linux and similar systems, you can simply type
|
On Unix/Linux and similar systems, you can simply type
|
||||||
|
|
||||||
./configure [--prefix=$HOME]
|
./configure [--prefix=/path]
|
||||||
make check
|
make check
|
||||||
make install
|
make install
|
||||||
|
|
||||||
@ -32,12 +32,19 @@ is not already on your system. zlib can usually be found
|
|||||||
wherever you got libpng. zlib can be placed in another directory,
|
wherever you got libpng. zlib can be placed in another directory,
|
||||||
at the same level as libpng.
|
at the same level as libpng.
|
||||||
|
|
||||||
|
If you want to use "cmake" (see www.cmake.org), copy CMakeLists.txt
|
||||||
|
from the "scripts" directory to this directory and type
|
||||||
|
|
||||||
|
cmake . -DCMAKE_INSTALL_PREFIX=/path
|
||||||
|
make
|
||||||
|
make install
|
||||||
|
|
||||||
If your system already has a preinstalled zlib you will still need
|
If your system already has a preinstalled zlib you will still need
|
||||||
to have access to the zlib.h and zconf.h include files that
|
to have access to the zlib.h and zconf.h include files that
|
||||||
correspond to the version of zlib that's installed.
|
correspond to the 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.4.0beta16" or "lpng109" and "zlib-1.2.1"
|
might be called "libpng-1.4.0beta17" or "lpng109" and "zlib-1.2.1"
|
||||||
or "zlib121") so that you have directories called "zlib" and "libpng".
|
or "zlib121") so that you have directories called "zlib" and "libpng".
|
||||||
|
|
||||||
Your directory structure should look like this:
|
Your directory structure should look like this:
|
||||||
@ -85,13 +92,14 @@ makefile.sys in the scripts directory.
|
|||||||
The files that are presently available in the scripts directory
|
The files that are presently available in the scripts directory
|
||||||
include
|
include
|
||||||
|
|
||||||
|
CMakeLists.txt => "cmake" script
|
||||||
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
|
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
|
||||||
makefile.elf => Linux/ELF makefile symbol versioning,
|
makefile.elf => Linux/ELF makefile symbol versioning,
|
||||||
gcc, creates libpng14.so.1.1.4.0beta16)
|
gcc, creates libpng14.so.1.1.4.0beta17)
|
||||||
makefile.linux => Linux/ELF makefile
|
makefile.linux => Linux/ELF makefile
|
||||||
(gcc, creates libpng14.so.1.1.4.0beta16)
|
(gcc, creates libpng14.so.1.1.4.0beta17)
|
||||||
makefile.gcmmx => Linux/ELF makefile
|
makefile.gcmmx => Linux/ELF makefile
|
||||||
(gcc, creates libpng14.so.1.1.4.0beta16,
|
(gcc, creates libpng14.so.1.1.4.0beta17,
|
||||||
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
|
||||||
@ -114,12 +122,12 @@ include
|
|||||||
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,
|
makefile.sggcc => Silicon Graphics (gcc,
|
||||||
creates libpng14.so.1.1.4.0beta16)
|
creates libpng14.so.1.1.4.0beta17)
|
||||||
makefile.sunos => Sun makefile
|
makefile.sunos => Sun makefile
|
||||||
makefile.solaris => Solaris 2.X makefile (gcc,
|
makefile.solaris => Solaris 2.X makefile (gcc,
|
||||||
creates libpng14.so.1.1.4.0beta16)
|
creates libpng14.so.1.1.4.0beta17)
|
||||||
makefile.so9 => Solaris 9 makefile (gcc,
|
makefile.so9 => Solaris 9 makefile (gcc,
|
||||||
creates libpng14.so.1.1.4.0beta16)
|
creates libpng14.so.1.1.4.0beta17)
|
||||||
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.4.0beta16
|
Known bugs in libpng version 1.4.0beta17
|
||||||
|
|
||||||
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 but running
|
reading interlaced PNG files, when assembler code is enabled but running
|
||||||
|
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.2.6, August 15, 2004, through 1.4.0beta16, November 17, 2006, are
|
libpng versions 1.2.6, August 15, 2004, through 1.4.0beta17, December 8, 2006, are
|
||||||
Copyright (c) 2004, 2006 Glenn Randers-Pehrson, and are
|
Copyright (c) 2004, 2006 Glenn Randers-Pehrson, and are
|
||||||
distributed according to the same disclaimer and license as libpng-1.2.5
|
distributed according to the same disclaimer and license as libpng-1.2.5
|
||||||
with the following individual added to the list of Contributing Authors
|
with the following individual added to the list of Contributing Authors
|
||||||
@ -106,4 +106,4 @@ certification mark of the Open Source Initiative.
|
|||||||
|
|
||||||
Glenn Randers-Pehrson
|
Glenn Randers-Pehrson
|
||||||
glennrp at users.sourceforge.net
|
glennrp at users.sourceforge.net
|
||||||
November 17, 2006
|
December 8, 2006
|
||||||
|
14
README
14
README
@ -1,4 +1,4 @@
|
|||||||
README for libpng version 1.4.0beta16 - November 17, 2006 (shared library 14.0)
|
README for libpng version 1.4.0beta17 - December 8, 2006 (shared library 14.0)
|
||||||
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.
|
||||||
@ -184,11 +184,11 @@ 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.elf => Linux/ELF makefile symbol versioning,
|
makefile.elf => Linux/ELF makefile symbol versioning,
|
||||||
gcc, creates libpng14.so.1.1.4.0beta16)
|
gcc, creates libpng14.so.1.1.4.0beta17)
|
||||||
makefile.linux => Linux/ELF makefile
|
makefile.linux => Linux/ELF makefile
|
||||||
(gcc, creates libpng14.so.1.1.4.0beta16)
|
(gcc, creates libpng14.so.1.1.4.0beta17)
|
||||||
makefile.gcmmx => Linux/ELF makefile
|
makefile.gcmmx => Linux/ELF makefile
|
||||||
(gcc, creates libpng14.so.1.1.4.0beta16,
|
(gcc, creates libpng14.so.1.1.4.0beta17,
|
||||||
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
|
||||||
@ -210,12 +210,12 @@ Files in this distribution:
|
|||||||
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
|
makefile.sggcc => Silicon Graphics
|
||||||
(gcc, creates libpng14.so.1.1.4.0beta16)
|
(gcc, creates libpng14.so.1.1.4.0beta17)
|
||||||
makefile.sunos => Sun makefile
|
makefile.sunos => Sun makefile
|
||||||
makefile.solaris => Solaris 2.X makefile
|
makefile.solaris => Solaris 2.X makefile
|
||||||
(gcc, creates libpng14.so.1.1.4.0beta16)
|
(gcc, creates libpng14.so.1.1.4.0beta17)
|
||||||
makefile.so9 => Solaris 9 makefile
|
makefile.so9 => Solaris 9 makefile
|
||||||
(gcc, creates libpng14.so.1.1.4.0beta16)
|
(gcc, creates libpng14.so.1.1.4.0beta17)
|
||||||
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
|
||||||
|
22
configure
vendored
22
configure
vendored
@ -1,6 +1,6 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.60 for libpng 1.4.0beta16
|
# Generated by GNU Autoconf 2.60 for libpng 1.4.0beta17
|
||||||
#
|
#
|
||||||
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
|
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
|
||||||
#
|
#
|
||||||
@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
|||||||
# Identity of this package.
|
# Identity of this package.
|
||||||
PACKAGE_NAME='libpng'
|
PACKAGE_NAME='libpng'
|
||||||
PACKAGE_TARNAME='libpng'
|
PACKAGE_TARNAME='libpng'
|
||||||
PACKAGE_VERSION='1.4.0beta16'
|
PACKAGE_VERSION='1.4.0beta17'
|
||||||
PACKAGE_STRING='libpng 1.4.0beta16'
|
PACKAGE_STRING='libpng 1.4.0beta17'
|
||||||
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
|
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
|
||||||
|
|
||||||
ac_unique_file="pngget.c"
|
ac_unique_file="pngget.c"
|
||||||
@ -1388,7 +1388,7 @@ if test "$ac_init_help" = "long"; then
|
|||||||
# Omit some internal or obsolete options to make the list less imposing.
|
# Omit some internal or obsolete options to make the list less imposing.
|
||||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||||
cat <<_ACEOF
|
cat <<_ACEOF
|
||||||
\`configure' configures libpng 1.4.0beta16 to adapt to many kinds of systems.
|
\`configure' configures libpng 1.4.0beta17 to adapt to many kinds of systems.
|
||||||
|
|
||||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||||
|
|
||||||
@ -1458,7 +1458,7 @@ fi
|
|||||||
|
|
||||||
if test -n "$ac_init_help"; then
|
if test -n "$ac_init_help"; then
|
||||||
case $ac_init_help in
|
case $ac_init_help in
|
||||||
short | recursive ) echo "Configuration of libpng 1.4.0beta16:";;
|
short | recursive ) echo "Configuration of libpng 1.4.0beta17:";;
|
||||||
esac
|
esac
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
|
|
||||||
@ -1567,7 +1567,7 @@ fi
|
|||||||
test -n "$ac_init_help" && exit $ac_status
|
test -n "$ac_init_help" && exit $ac_status
|
||||||
if $ac_init_version; then
|
if $ac_init_version; then
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
libpng configure 1.4.0beta16
|
libpng configure 1.4.0beta17
|
||||||
generated by GNU Autoconf 2.60
|
generated by GNU Autoconf 2.60
|
||||||
|
|
||||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||||
@ -1581,7 +1581,7 @@ cat >config.log <<_ACEOF
|
|||||||
This file contains any messages produced by compilers while
|
This file contains any messages produced by compilers while
|
||||||
running configure, to aid debugging if configure makes a mistake.
|
running configure, to aid debugging if configure makes a mistake.
|
||||||
|
|
||||||
It was created by libpng $as_me 1.4.0beta16, which was
|
It was created by libpng $as_me 1.4.0beta17, which was
|
||||||
generated by GNU Autoconf 2.60. Invocation command line was
|
generated by GNU Autoconf 2.60. Invocation command line was
|
||||||
|
|
||||||
$ $0 $@
|
$ $0 $@
|
||||||
@ -2251,7 +2251,7 @@ fi
|
|||||||
|
|
||||||
# Define the identity of the package.
|
# Define the identity of the package.
|
||||||
PACKAGE='libpng'
|
PACKAGE='libpng'
|
||||||
VERSION='1.4.0beta16'
|
VERSION='1.4.0beta17'
|
||||||
|
|
||||||
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
cat >>confdefs.h <<_ACEOF
|
||||||
@ -2422,7 +2422,7 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
PNGLIB_VERSION=1.4.0beta16
|
PNGLIB_VERSION=1.4.0beta17
|
||||||
PNGLIB_MAJOR=14
|
PNGLIB_MAJOR=14
|
||||||
PNGLIB_MINOR=0
|
PNGLIB_MINOR=0
|
||||||
|
|
||||||
@ -21845,7 +21845,7 @@ exec 6>&1
|
|||||||
# report actual input values of CONFIG_FILES etc. instead of their
|
# report actual input values of CONFIG_FILES etc. instead of their
|
||||||
# values after options handling.
|
# values after options handling.
|
||||||
ac_log="
|
ac_log="
|
||||||
This file was extended by libpng $as_me 1.4.0beta16, which was
|
This file was extended by libpng $as_me 1.4.0beta17, which was
|
||||||
generated by GNU Autoconf 2.60. Invocation command line was
|
generated by GNU Autoconf 2.60. Invocation command line was
|
||||||
|
|
||||||
CONFIG_FILES = $CONFIG_FILES
|
CONFIG_FILES = $CONFIG_FILES
|
||||||
@ -21898,7 +21898,7 @@ Report bugs to <bug-autoconf@gnu.org>."
|
|||||||
_ACEOF
|
_ACEOF
|
||||||
cat >>$CONFIG_STATUS <<_ACEOF
|
cat >>$CONFIG_STATUS <<_ACEOF
|
||||||
ac_cs_version="\\
|
ac_cs_version="\\
|
||||||
libpng config.status 1.4.0beta16
|
libpng config.status 1.4.0beta17
|
||||||
configured by $0, generated by GNU Autoconf 2.60,
|
configured by $0, generated by GNU Autoconf 2.60,
|
||||||
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||||||
|
|
||||||
|
@ -18,12 +18,12 @@ AC_PREREQ(2.59)
|
|||||||
|
|
||||||
dnl Version number stuff here:
|
dnl Version number stuff here:
|
||||||
|
|
||||||
AC_INIT([libpng], [1.4.0beta16], [png-mng-implement@lists.sourceforge.net])
|
AC_INIT([libpng], [1.4.0beta17], [png-mng-implement@lists.sourceforge.net])
|
||||||
AM_INIT_AUTOMAKE
|
AM_INIT_AUTOMAKE
|
||||||
dnl stop configure from automagically running automake
|
dnl stop configure from automagically running automake
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
|
|
||||||
PNGLIB_VERSION=1.4.0beta16
|
PNGLIB_VERSION=1.4.0beta17
|
||||||
PNGLIB_MAJOR=14
|
PNGLIB_MAJOR=14
|
||||||
PNGLIB_MINOR=0
|
PNGLIB_MINOR=0
|
||||||
|
|
||||||
|
16
libpng.3
16
libpng.3
@ -1,6 +1,6 @@
|
|||||||
.TH LIBPNG 3 "November 17, 2006"
|
.TH LIBPNG 3 "December 8, 2006"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta16
|
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta17
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
\fB
|
\fB
|
||||||
#include <png.h>\fP
|
#include <png.h>\fP
|
||||||
@ -398,7 +398,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.4.0beta16 - November 17, 2006
|
libpng version 1.4.0beta17 - December 8, 2006
|
||||||
Updated and distributed by Glenn Randers-Pehrson
|
Updated and distributed by Glenn Randers-Pehrson
|
||||||
<glennrp at users.sourceforge.net>
|
<glennrp at users.sourceforge.net>
|
||||||
Copyright (c) 1998-2005 Glenn Randers-Pehrson
|
Copyright (c) 1998-2005 Glenn Randers-Pehrson
|
||||||
@ -3315,13 +3315,13 @@ application:
|
|||||||
|
|
||||||
.SH IX. Y2K Compliance in libpng
|
.SH IX. Y2K Compliance in libpng
|
||||||
|
|
||||||
November 17, 2006
|
December 8, 2006
|
||||||
|
|
||||||
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.4.0beta16 are Y2K compliant. It is my belief that earlier
|
upward through 1.4.0beta17 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
|
||||||
@ -3544,7 +3544,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.4.0beta16 - November 17, 2006:
|
Libpng version 1.4.0beta17 - December 8, 2006:
|
||||||
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 (glennrp at users.sourceforge.net).
|
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
|
||||||
|
|
||||||
@ -3565,7 +3565,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.2.6, August 15, 2004, through 1.4.0beta16, November 17, 2006, are
|
libpng versions 1.2.6, August 15, 2004, through 1.4.0beta17, December 8, 2006, are
|
||||||
Copyright (c) 2004-2006 Glenn Randers-Pehrson, and are
|
Copyright (c) 2004-2006 Glenn Randers-Pehrson, and are
|
||||||
distributed according to the same disclaimer and license as libpng-1.2.5
|
distributed according to the same disclaimer and license as libpng-1.2.5
|
||||||
with the following individual added to the list of Contributing Authors
|
with the following individual added to the list of Contributing Authors
|
||||||
@ -3664,7 +3664,7 @@ certification mark of the Open Source Initiative.
|
|||||||
|
|
||||||
Glenn Randers-Pehrson
|
Glenn Randers-Pehrson
|
||||||
glennrp at users.sourceforge.net
|
glennrp at users.sourceforge.net
|
||||||
November 17, 2006
|
December 8, 2006
|
||||||
|
|
||||||
.\" 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.4.0beta16 - November 17, 2006
|
libpng version 1.4.0beta17 - December 8, 2006
|
||||||
Updated and distributed by Glenn Randers-Pehrson
|
Updated and distributed by Glenn Randers-Pehrson
|
||||||
<glennrp at users.sourceforge.net>
|
<glennrp at users.sourceforge.net>
|
||||||
Copyright (c) 1998-2005 Glenn Randers-Pehrson
|
Copyright (c) 1998-2005 Glenn Randers-Pehrson
|
||||||
@ -2917,13 +2917,13 @@ application:
|
|||||||
|
|
||||||
IX. Y2K Compliance in libpng
|
IX. Y2K Compliance in libpng
|
||||||
|
|
||||||
November 17, 2006
|
December 8, 2006
|
||||||
|
|
||||||
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.4.0beta16 are Y2K compliant. It is my belief that earlier
|
upward through 1.4.0beta17 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 "November 17, 2006"
|
.TH LIBPNGPF 3 "December 8, 2006"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta16
|
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta17
|
||||||
(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 "November 17, 2006"
|
.TH PNG 5 "December 8, 2006"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
png \- Portable Network Graphics (PNG) format
|
png \- Portable Network Graphics (PNG) format
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
|
4
png.c
4
png.c
@ -13,7 +13,7 @@
|
|||||||
#include "pngpriv.h"
|
#include "pngpriv.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_4_0beta16 Your_png_h_is_not_version_1_4_0beta16;
|
typedef version_1_4_0beta17 Your_png_h_is_not_version_1_4_0beta17;
|
||||||
|
|
||||||
/* 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. */
|
||||||
@ -643,7 +643,7 @@ png_charp PNGAPI
|
|||||||
png_get_copyright(png_structp png_ptr)
|
png_get_copyright(png_structp png_ptr)
|
||||||
{
|
{
|
||||||
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) "\n libpng version 1.4.0beta16 - November 17, 2006\n\
|
return ((png_charp) "\n libpng version 1.4.0beta17 - December 8, 2006\n\
|
||||||
Copyright (c) 1998-2006 Glenn Randers-Pehrson\n\
|
Copyright (c) 1998-2006 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");
|
||||||
|
22
png.h
22
png.h
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* png.h - header file for PNG reference library
|
/* png.h - header file for PNG reference library
|
||||||
*
|
*
|
||||||
* libpng version 1.4.0beta16 - November 17, 2006
|
* libpng version 1.4.0beta17 - December 8, 2006
|
||||||
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2006 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.)
|
||||||
@ -9,7 +9,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.4.0beta16 - November 17, 2006: Glenn
|
* libpng versions 0.97, January 1998, through 1.4.0beta17 - December 8, 2006: Glenn
|
||||||
* See also "Contributing Authors", below.
|
* See also "Contributing Authors", below.
|
||||||
*
|
*
|
||||||
* Note about libpng version numbers:
|
* Note about libpng version numbers:
|
||||||
@ -156,7 +156,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.2.6, August 15, 2004, through 1.4.0beta16, November 17, 2006, are
|
* libpng versions 1.2.6, August 15, 2004, through 1.4.0beta17, December 8, 2006, are
|
||||||
* Copyright (c) 2004, 2006 Glenn Randers-Pehrson, and are
|
* Copyright (c) 2004, 2006 Glenn Randers-Pehrson, and are
|
||||||
* distributed according to the same disclaimer and license as libpng-1.2.5
|
* distributed according to the same disclaimer and license as libpng-1.2.5
|
||||||
* with the following individual added to the list of Contributing Authors:
|
* with the following individual added to the list of Contributing Authors:
|
||||||
@ -268,13 +268,13 @@
|
|||||||
* Y2K compliance in libpng:
|
* Y2K compliance in libpng:
|
||||||
* =========================
|
* =========================
|
||||||
*
|
*
|
||||||
* November 17, 2006
|
* December 8, 2006
|
||||||
*
|
*
|
||||||
* 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.4.0beta16 are Y2K compliant. It is my belief that earlier
|
* upward through 1.4.0beta17 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
|
||||||
@ -330,9 +330,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/* 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.4.0beta16"
|
#define PNG_LIBPNG_VER_STRING "1.4.0beta17"
|
||||||
#define PNG_HEADER_VERSION_STRING \
|
#define PNG_HEADER_VERSION_STRING \
|
||||||
" libpng version 1.4.0beta16 - November 17, 2006 (header)\n"
|
" libpng version 1.4.0beta17 - December 8, 2006 (header)\n"
|
||||||
|
|
||||||
#define PNG_LIBPNG_VER_SONUM 1
|
#define PNG_LIBPNG_VER_SONUM 1
|
||||||
#define PNG_LIBPNG_VER_DLLNUM 14
|
#define PNG_LIBPNG_VER_DLLNUM 14
|
||||||
@ -344,7 +344,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 16
|
#define PNG_LIBPNG_VER_BUILD 17
|
||||||
|
|
||||||
/* Release Status */
|
/* Release Status */
|
||||||
#define PNG_LIBPNG_BUILD_ALPHA 1
|
#define PNG_LIBPNG_BUILD_ALPHA 1
|
||||||
@ -375,6 +375,10 @@
|
|||||||
#include "zlib.h"
|
#include "zlib.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef AIX
|
||||||
|
#define jmpbuf __jmpbuf
|
||||||
|
#endif
|
||||||
|
|
||||||
/* include all user configurable info, including optional assembler routines */
|
/* include all user configurable info, including optional assembler routines */
|
||||||
#include "pngconf.h"
|
#include "pngconf.h"
|
||||||
|
|
||||||
@ -1339,7 +1343,7 @@ struct png_struct_def
|
|||||||
/* This triggers a compiler error in png.c, if png.c and png.h
|
/* This triggers a compiler error in png.c, if png.c and png.h
|
||||||
* do not agree upon the version number.
|
* do not agree upon the version number.
|
||||||
*/
|
*/
|
||||||
typedef png_structp version_1_4_0beta16;
|
typedef png_structp version_1_4_0beta17;
|
||||||
|
|
||||||
typedef png_struct FAR * FAR * png_structpp;
|
typedef png_struct FAR * FAR * png_structpp;
|
||||||
|
|
||||||
|
11
pngconf.h
11
pngconf.h
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngconf.h - machine configurable file for libpng
|
/* pngconf.h - machine configurable file for libpng
|
||||||
*
|
*
|
||||||
* libpng version 1.4.0beta16 - November 17, 2006
|
* libpng version 1.4.0beta17 - December 8, 2006
|
||||||
* 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-2006 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
@ -632,7 +632,14 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0
|
/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0
|
||||||
even when PNG_USE_PNGVCRD or PNG_USE_PNGGCCRD is not defined */
|
* even when PNG_USE_PNGVCRD or PNG_USE_PNGGCCRD is not defined.
|
||||||
|
*
|
||||||
|
* PNG_NO_ASSEMBLER_CODE disables use of all assembler code and optimized C,
|
||||||
|
* and removes or includes several functions in the API.
|
||||||
|
*
|
||||||
|
* PNG_NO_MMX_CODE disables the use of MMX code without changing the API.
|
||||||
|
* When MMX code is off, then optimized C replacement functions are used.
|
||||||
|
*/
|
||||||
#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
|
#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
|
||||||
# ifndef PNG_ASSEMBLER_CODE_SUPPORTED
|
# ifndef PNG_ASSEMBLER_CODE_SUPPORTED
|
||||||
# define PNG_ASSEMBLER_CODE_SUPPORTED
|
# define PNG_ASSEMBLER_CODE_SUPPORTED
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngpriv.h - private declarations for use inside libpng
|
/* pngpriv.h - private declarations for use inside libpng
|
||||||
*
|
*
|
||||||
* libpng version 1.4.0beta16 - November 17, 2006
|
* libpng version 1.4.0beta17 - December 8, 2006
|
||||||
* 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-2006 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
@ -1598,4 +1598,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_4_0beta16 your_png_h_is_not_version_1_4_0beta16;
|
typedef version_1_4_0beta17 your_png_h_is_not_version_1_4_0beta17;
|
||||||
|
@ -784,8 +784,11 @@ png_write_iCCP(png_structp png_ptr, png_charp name, int compression_type,
|
|||||||
profile_len = 0;
|
profile_len = 0;
|
||||||
|
|
||||||
if (profile_len > 3)
|
if (profile_len > 3)
|
||||||
embedded_profile_len = ((*(profile ))<<24) | ((*(profile+1))<<16) |
|
embedded_profile_len =
|
||||||
((*(profile+2))<< 8) | ((*(profile+3)) );
|
((*( (png_bytep)profile ))<<24) |
|
||||||
|
((*( (png_bytep)profile+1))<<16) |
|
||||||
|
((*( (png_bytep)profile+2))<< 8) |
|
||||||
|
((*( (png_bytep)profile+3)) );
|
||||||
|
|
||||||
if (profile_len < embedded_profile_len)
|
if (profile_len < embedded_profile_len)
|
||||||
{
|
{
|
||||||
@ -1337,7 +1340,7 @@ png_check_keyword(png_structp png_ptr, png_charp key, png_charpp new_key)
|
|||||||
if (key_len > 79)
|
if (key_len > 79)
|
||||||
{
|
{
|
||||||
png_warning(png_ptr, "keyword length must be 1 - 79 characters");
|
png_warning(png_ptr, "keyword length must be 1 - 79 characters");
|
||||||
new_key[79] = '\0';
|
(*new_key)[79] = '\0';
|
||||||
key_len = 79;
|
key_len = 79;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
149
scripts/CMakeLists.txt
Normal file
149
scripts/CMakeLists.txt
Normal file
@ -0,0 +1,149 @@
|
|||||||
|
|
||||||
|
project(libpng)
|
||||||
|
|
||||||
|
SET(PNG_VER_MAJOR 1)
|
||||||
|
SET(PNG_VER_MINOR 4)
|
||||||
|
SET(PNG_VER_PATCH 0)
|
||||||
|
|
||||||
|
# needed packages
|
||||||
|
find_package(ZLIB REQUIRED)
|
||||||
|
|
||||||
|
|
||||||
|
# command line options
|
||||||
|
option(PNG_SHARED "Build shared lib" YES)
|
||||||
|
option(PNG_TESTS "Build pngtest" YES)
|
||||||
|
#TODO:
|
||||||
|
# PNG_NO_CONSOLE_IO
|
||||||
|
# PNG_NO_STDIO
|
||||||
|
# PNG_CONSOLE_IO_SUPPORTED
|
||||||
|
# PNGARG
|
||||||
|
# some others :)
|
||||||
|
|
||||||
|
set(png_asm_tmp "OFF")
|
||||||
|
if(NOT WIN32)
|
||||||
|
find_program(uname_executable NAMES uname PATHS /bin /usr/bin /usr/local/bin)
|
||||||
|
if(uname_executable)
|
||||||
|
EXEC_PROGRAM(${uname_executable} ARGS --machine OUTPUT_VARIABLE uname_output)
|
||||||
|
if("uname_output" MATCHES "^.*i[1-9]86.*$")
|
||||||
|
set(png_asm_tmp "ON")
|
||||||
|
else("uname_output" MATCHES "^.*i[1-9]86.*$")
|
||||||
|
set(png_asm_tmp "OFF")
|
||||||
|
endif("uname_output" MATCHES "^.*i[1-9]86.*$")
|
||||||
|
endif(uname_executable)
|
||||||
|
endif(NOT WIN32)
|
||||||
|
|
||||||
|
option(PNG_MMX "Use MMX assembler code (x86 only)" ${png_asm_tmp})
|
||||||
|
|
||||||
|
|
||||||
|
# msvc does not append 'lib' - do it here to have consistent name
|
||||||
|
if(MSVC)
|
||||||
|
set(PNG_LIB_NAME lib)
|
||||||
|
endif(MSVC)
|
||||||
|
#set(PNG_LIB_NAME ${PNG_LIB_NAME}png-${PNG_VER_MAJOR}.${PNG_VER_MINOR})
|
||||||
|
set(PNG_LIB_NAME ${PNG_LIB_NAME}png)
|
||||||
|
|
||||||
|
# to distinguish between debug and release lib
|
||||||
|
set(CMAKE_DEBUG_POSTFIX "d")
|
||||||
|
|
||||||
|
# append _static to static lib
|
||||||
|
if(NOT PNG_SHARED)
|
||||||
|
set(PNG_LIB_NAME ${PNG_LIB_NAME}_static)
|
||||||
|
endif(NOT PNG_SHARED)
|
||||||
|
|
||||||
|
|
||||||
|
# our sources
|
||||||
|
set(libpng_sources
|
||||||
|
png.h
|
||||||
|
pngconf.h
|
||||||
|
pngdefs.h
|
||||||
|
pngpriv.h
|
||||||
|
png.c
|
||||||
|
pngerror.c
|
||||||
|
pngget.c
|
||||||
|
pngmem.c
|
||||||
|
pngpread.c
|
||||||
|
pngread.c
|
||||||
|
pngrio.c
|
||||||
|
pngrtran.c
|
||||||
|
pngrutil.c
|
||||||
|
pngset.c
|
||||||
|
pngtrans.c
|
||||||
|
pngwio.c
|
||||||
|
pngwrite.c
|
||||||
|
pngwtran.c
|
||||||
|
pngwutil.c
|
||||||
|
)
|
||||||
|
set(pngtest_sources
|
||||||
|
pngtest.c
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
if(MSVC)
|
||||||
|
add_definitions(-DPNG_NO_MODULEDEF -D_CRT_SECURE_NO_DEPRECATE)
|
||||||
|
FILE(WRITE pngdefs.h "#define PNG_USE_PNGVCRD\n")
|
||||||
|
set(libpng_sources ${libpng_sources}
|
||||||
|
pngvcrd.c
|
||||||
|
)
|
||||||
|
else(MSVC)
|
||||||
|
FILE(WRITE pngdefs.h "#define PNG_USE_PNGGCCRD\n")
|
||||||
|
FILE(APPEND pngdefs.h "#define PNG_USE_GLOBAL_ARRAYS\n")
|
||||||
|
set(libpng_sources ${libpng_sources}
|
||||||
|
pnggccrd.c
|
||||||
|
)
|
||||||
|
endif(MSVC)
|
||||||
|
|
||||||
|
if(NOT PNG_MMX)
|
||||||
|
FILE(APPEND pngdefs.h "#define PNG_NO_MMX_CODE\n")
|
||||||
|
endif(NOT PNG_MMX)
|
||||||
|
|
||||||
|
if(NOT WIN32)
|
||||||
|
find_library(M_LIBRARY
|
||||||
|
NAMES m
|
||||||
|
PATHS /usr/lib /usr/local/lib
|
||||||
|
)
|
||||||
|
endif(NOT WIN32)
|
||||||
|
|
||||||
|
# now build our target
|
||||||
|
include_directories(${CMAKE_SOURCE_DIR} ${ZLIB_INCLUDE_DIR})
|
||||||
|
|
||||||
|
if(PNG_SHARED)
|
||||||
|
add_library(${PNG_LIB_NAME} SHARED ${libpng_sources})
|
||||||
|
else(PNG_SHARED)
|
||||||
|
add_library(STATIC ${libpng_sources})
|
||||||
|
endif(PNG_SHARED)
|
||||||
|
|
||||||
|
target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY})
|
||||||
|
if(PNG_SHARED AND WIN32)
|
||||||
|
set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL)
|
||||||
|
endif(PNG_SHARED AND WIN32)
|
||||||
|
|
||||||
|
if(PNG_TESTS)
|
||||||
|
# does not work with msvc due to png_lib_ver issue
|
||||||
|
add_executable(pngtest ${pngtest_sources})
|
||||||
|
target_link_libraries(pngtest ${PNG_LIB_NAME})
|
||||||
|
# add_test(pngtest ${CMAKE_SOURCE_DIR}/pngtest.png)
|
||||||
|
endif(PNG_TESTS)
|
||||||
|
|
||||||
|
|
||||||
|
# install
|
||||||
|
install_targets(/bin ${PNG_LIB_NAME})
|
||||||
|
install(FILES libpng.so DESTINATION lib)
|
||||||
|
install(FILES png.h pngconf.h pngpriv.h pngdefs.h DESTINATION include)
|
||||||
|
install(FILES libpng.3 libpngpf.3 DESTINATION man/man3)
|
||||||
|
# what's with libpng.txt and all the extra files?
|
||||||
|
|
||||||
|
|
||||||
|
# uninstall
|
||||||
|
# do we need this?
|
||||||
|
|
||||||
|
|
||||||
|
# dist
|
||||||
|
# do we need this?
|
||||||
|
|
||||||
|
# to create msvc import lib for mingw compiled shared lib
|
||||||
|
# pexports libpng.dll > libpng.def
|
||||||
|
# lib /def:libpng.def /machine:x86
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
# Modeled after libxml-config.
|
# Modeled after libxml-config.
|
||||||
|
|
||||||
version=1.4.0beta16
|
version=1.4.0beta17
|
||||||
prefix=""
|
prefix=""
|
||||||
libdir=""
|
libdir=""
|
||||||
libs=""
|
libs=""
|
||||||
|
@ -5,6 +5,6 @@ includedir=@includedir@/libpng14
|
|||||||
|
|
||||||
Name: libpng
|
Name: libpng
|
||||||
Description: Loads and saves PNG files
|
Description: Loads and saves PNG files
|
||||||
Version: 1.4.0beta16
|
Version: 1.4.0beta17
|
||||||
Libs: -L${libdir} -lpng14
|
Libs: -L${libdir} -lpng14
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME=libpng14
|
LIBNAME=libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME=libpng14
|
LIBNAME=libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -20,7 +20,7 @@ LN_SF = ln -f -s
|
|||||||
|
|
||||||
LIBNAME=libpng14
|
LIBNAME=libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
prefix=/usr/local
|
prefix=/usr/local
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME=libpng14
|
LIBNAME=libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -65,7 +65,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
|
|||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
CYGDLL = 14
|
CYGDLL = 14
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
SHAREDLIB=cygpng$(CYGDLL).dll
|
SHAREDLIB=cygpng$(CYGDLL).dll
|
||||||
|
@ -19,7 +19,7 @@ ZLIBINC=../zlib
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
# Library name:
|
# Library name:
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -62,7 +62,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
|
|||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
MINGDLL = 14
|
MINGDLL = 14
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
SHAREDLIB=libpng$(MINGDLL).dll
|
SHAREDLIB=libpng$(MINGDLL).dll
|
||||||
|
@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng14
|
|||||||
|
|
||||||
LIB= png14
|
LIB= png14
|
||||||
SHLIB_MAJOR= 0
|
SHLIB_MAJOR= 0
|
||||||
SHLIB_MINOR= 1.4.0beta16
|
SHLIB_MINOR= 1.4.0beta17
|
||||||
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.4.0beta16
|
SHLIB_MINOR= 1.4.0beta17
|
||||||
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
|
||||||
|
@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib
|
|||||||
MANDIR= ${PREFIX}/man/cat
|
MANDIR= ${PREFIX}/man/cat
|
||||||
|
|
||||||
SHLIB_MAJOR= 0
|
SHLIB_MAJOR= 0
|
||||||
SHLIB_MINOR= 1.4.0beta16
|
SHLIB_MINOR= 1.4.0beta17
|
||||||
|
|
||||||
LIB= png
|
LIB= png
|
||||||
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
|
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME=libpng14
|
LIBNAME=libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME=libpng14
|
LIBNAME=libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
# Library name:
|
# Library name:
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
PNGMAJ = 1
|
PNGMAJ = 1
|
||||||
PNGMIN = 1.4.0beta16
|
PNGMIN = 1.4.0beta17
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
; PNG.LIB module definition file for OS/2
|
; PNG.LIB module definition file for OS/2
|
||||||
;----------------------------------------
|
;----------------------------------------
|
||||||
|
|
||||||
; Version 1.4.0beta16
|
; Version 1.4.0beta17
|
||||||
|
|
||||||
LIBRARY PNG
|
LIBRARY PNG
|
||||||
DESCRIPTION "PNG image compression library for OS/2"
|
DESCRIPTION "PNG image compression library for OS/2"
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
LIBRARY
|
LIBRARY
|
||||||
|
|
||||||
EXPORTS
|
EXPORTS
|
||||||
;Version 1.4.0beta16
|
;Version 1.4.0beta17
|
||||||
png_build_grayscale_palette
|
png_build_grayscale_palette
|
||||||
png_chunk_error
|
png_chunk_error
|
||||||
png_chunk_warning
|
png_chunk_warning
|
||||||
|
Loading…
x
Reference in New Issue
Block a user