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.0beta40.tar
This commit is contained in:
parent
398b5a31a7
commit
02a5e33061
29
ANNOUNCE
29
ANNOUNCE
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
Libpng 1.4.0beta39 - November 23, 2008
|
Libpng 1.4.0beta40 - November 25, 2008
|
||||||
|
|
||||||
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.0beta39.tar.gz
|
1.4.0beta40.tar.gz
|
||||||
1.4.0beta39.tar.bz2
|
1.4.0beta40.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.0beta39-no-config.tar.gz
|
1.4.0beta40-no-config.tar.gz
|
||||||
1.4.0beta39-no-config.tar.bz2
|
1.4.0beta40-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
|
||||||
|
|
||||||
lp140b39.zip
|
lp140b40.zip
|
||||||
lp140b39.tar.bz2
|
lp140b40.tar.bz2
|
||||||
|
|
||||||
Other information:
|
Other information:
|
||||||
|
|
||||||
1.4.0beta39-README.txt
|
1.4.0beta40-README.txt
|
||||||
1.4.0beta39-KNOWNBUGS.txt
|
1.4.0beta40-KNOWNBUGS.txt
|
||||||
1.4.0beta39-LICENSE.txt
|
1.4.0beta40-LICENSE.txt
|
||||||
1.4.0beta39-Y2K-compliance.txt
|
1.4.0beta40-Y2K-compliance.txt
|
||||||
|
|
||||||
Changes since the last public release (1.2.10):
|
Changes since the last public release (1.2.10):
|
||||||
|
|
||||||
@ -343,10 +343,15 @@ version 1.4.0beta38 [November 22, 2008]
|
|||||||
Added check for zero-area RGB cHRM triange in png_check_cHRM() and
|
Added check for zero-area RGB cHRM triange in png_check_cHRM() and
|
||||||
png_check_cHRM_fixed().
|
png_check_cHRM_fixed().
|
||||||
|
|
||||||
version 1.4.0beta39 [November 23, 2008]
|
version 1.4.0beta39 [November 25, 2008]
|
||||||
Revised png_warning() to write its message on standard output by default
|
Revised png_warning() to write its message on standard output by default
|
||||||
when warning_fn is NULL.
|
when warning_fn is NULL.
|
||||||
|
|
||||||
|
version 1.4.0beta40 [November 25, 2008]
|
||||||
|
Eliminated png_check_cHRM(). Instead, always use png_check_cHRM_fixed().
|
||||||
|
In png_check_cHRM_fixed(), ensure white_y is > 0, and removed redundant
|
||||||
|
check for all-zero coordinates that is detected by the triangle check.
|
||||||
|
|
||||||
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.
|
||||||
|
|
||||||
|
6
CHANGES
6
CHANGES
@ -2022,6 +2022,12 @@ version 1.4.0beta39 [November 23, 2008]
|
|||||||
Revised png_warning() to write its message on standard output by default
|
Revised png_warning() to write its message on standard output by default
|
||||||
when warning_fn is NULL.
|
when warning_fn is NULL.
|
||||||
|
|
||||||
|
version 1.4.0beta40 [November 25, 2008]
|
||||||
|
Eliminated png_check_cHRM(). Instead, always use png_check_cHRM_fixed().
|
||||||
|
In png_check_cHRM_fixed(), ensure white_y is > 0, and removed redundant
|
||||||
|
check for all-zero coordinates that is detected by the triangle check.
|
||||||
|
|
||||||
|
|
||||||
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.
|
||||||
|
|
||||||
|
18
INSTALL
18
INSTALL
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
Installing libpng version 1.4.0beta39 - November 23, 2008
|
Installing libpng version 1.4.0beta40 - November 25, 2008
|
||||||
|
|
||||||
On Unix/Linux and similar systems, you can simply type
|
On Unix/Linux and similar systems, you can simply type
|
||||||
|
|
||||||
@ -44,7 +44,7 @@ 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.0beta39" or "lpng109" and "zlib-1.2.1"
|
might be called "libpng-1.4.0beta40" 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:
|
||||||
@ -95,14 +95,14 @@ include
|
|||||||
CMakeLists.txt => "cmake" script
|
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.14.1.4.0beta39)
|
gcc, creates libpng14.so.14.1.4.0beta40)
|
||||||
makefile.linux => Linux/ELF makefile
|
makefile.linux => Linux/ELF makefile
|
||||||
(gcc, creates libpng14.so.14.1.4.0beta39)
|
(gcc, creates libpng14.so.14.1.4.0beta40)
|
||||||
makefile.gcmmx => Linux/ELF makefile
|
makefile.gcmmx => Linux/ELF makefile
|
||||||
(gcc, creates libpng14.so.14.1.4.0beta39,
|
(gcc, creates libpng14.so.14.1.4.0beta40,
|
||||||
uses assembler code tuned for Intel MMX platform)
|
uses assembler code tuned for Intel MMX platform)
|
||||||
makefile.nommx => Linux/ELF makefile
|
makefile.nommx => Linux/ELF makefile
|
||||||
(gcc, creates libpng14.so.14.1.4.0beta39
|
(gcc, creates libpng14.so.14.1.4.0beta40
|
||||||
does not use Intel MMX assembler code)
|
does not use Intel MMX assembler code)
|
||||||
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
|
||||||
@ -125,12 +125,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.14.1.4.0beta39)
|
creates libpng14.so.14.1.4.0beta40)
|
||||||
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.14.1.4.0beta39)
|
creates libpng14.so.14.1.4.0beta40)
|
||||||
makefile.so9 => Solaris 9 makefile (gcc,
|
makefile.so9 => Solaris 9 makefile (gcc,
|
||||||
creates libpng14.so.14.1.4.0beta39)
|
creates libpng14.so.14.1.4.0beta40)
|
||||||
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.0beta39
|
Known bugs in libpng version 1.4.0beta40
|
||||||
|
|
||||||
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.0beta39, November 23, 2008, are
|
libpng versions 1.2.6, August 15, 2004, through 1.4.0beta40, November 25, 2008, are
|
||||||
Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
|
Copyright (c) 2004, 2006-2007 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 23, 2008
|
November 25, 2008
|
||||||
|
@ -86,7 +86,7 @@ EXTRA_DIST= \
|
|||||||
${srcdir}/contrib/pngsuite/* \
|
${srcdir}/contrib/pngsuite/* \
|
||||||
${srcdir}/contrib/visupng/* \
|
${srcdir}/contrib/visupng/* \
|
||||||
$(TESTS) \
|
$(TESTS) \
|
||||||
example.c libpng-1.4.0beta39.txt pngvcrd.c
|
example.c libpng-1.4.0beta40.txt pngvcrd.c
|
||||||
|
|
||||||
CLEANFILES= pngout.png libpng14.pc libpng14-config libpng.vers \
|
CLEANFILES= pngout.png libpng14.pc libpng14-config libpng.vers \
|
||||||
libpng.sym
|
libpng.sym
|
||||||
|
@ -331,7 +331,7 @@ EXTRA_DIST = \
|
|||||||
${srcdir}/contrib/pngsuite/* \
|
${srcdir}/contrib/pngsuite/* \
|
||||||
${srcdir}/contrib/visupng/* \
|
${srcdir}/contrib/visupng/* \
|
||||||
$(TESTS) \
|
$(TESTS) \
|
||||||
example.c libpng-1.4.0beta39.txt pngvcrd.c
|
example.c libpng-1.4.0beta40.txt pngvcrd.c
|
||||||
|
|
||||||
CLEANFILES = pngout.png libpng14.pc libpng14-config libpng.vers \
|
CLEANFILES = pngout.png libpng14.pc libpng14-config libpng.vers \
|
||||||
libpng.sym
|
libpng.sym
|
||||||
|
14
README
14
README
@ -1,4 +1,4 @@
|
|||||||
README for libpng version 1.4.0beta39 - November 23, 2008 (shared library 14.0)
|
README for libpng version 1.4.0beta40 - November 25, 2008 (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.14.1.4.0beta39)
|
gcc, creates libpng14.so.14.1.4.0beta40)
|
||||||
makefile.linux => Linux/ELF makefile
|
makefile.linux => Linux/ELF makefile
|
||||||
(gcc, creates libpng14.so.14.1.4.0beta39)
|
(gcc, creates libpng14.so.14.1.4.0beta40)
|
||||||
makefile.gcmmx => Linux/ELF makefile
|
makefile.gcmmx => Linux/ELF makefile
|
||||||
(gcc, creates libpng14.so.14.1.4.0beta39,
|
(gcc, creates libpng14.so.14.1.4.0beta40,
|
||||||
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.14.1.4.0beta39)
|
(gcc, creates libpng14.so.14.1.4.0beta40)
|
||||||
makefile.sunos => Sun makefile
|
makefile.sunos => Sun makefile
|
||||||
makefile.solaris => Solaris 2.X makefile
|
makefile.solaris => Solaris 2.X makefile
|
||||||
(gcc, creates libpng14.so.14.1.4.0beta39)
|
(gcc, creates libpng14.so.14.1.4.0beta40)
|
||||||
makefile.so9 => Solaris 9 makefile
|
makefile.so9 => Solaris 9 makefile
|
||||||
(gcc, creates libpng14.so.14.1.4.0beta39)
|
(gcc, creates libpng14.so.14.1.4.0beta40)
|
||||||
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.62 for libpng 1.4.0beta39.
|
# Generated by GNU Autoconf 2.62 for libpng 1.4.0beta40.
|
||||||
#
|
#
|
||||||
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
|
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
|
||||||
#
|
#
|
||||||
@ -745,8 +745,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.0beta39'
|
PACKAGE_VERSION='1.4.0beta40'
|
||||||
PACKAGE_STRING='libpng 1.4.0beta39'
|
PACKAGE_STRING='libpng 1.4.0beta40'
|
||||||
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"
|
||||||
@ -1484,7 +1484,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.0beta39 to adapt to many kinds of systems.
|
\`configure' configures libpng 1.4.0beta40 to adapt to many kinds of systems.
|
||||||
|
|
||||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||||
|
|
||||||
@ -1554,7 +1554,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.0beta39:";;
|
short | recursive ) echo "Configuration of libpng 1.4.0beta40:";;
|
||||||
esac
|
esac
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
|
|
||||||
@ -1661,7 +1661,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.0beta39
|
libpng configure 1.4.0beta40
|
||||||
generated by GNU Autoconf 2.62
|
generated by GNU Autoconf 2.62
|
||||||
|
|
||||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||||
@ -1675,7 +1675,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.0beta39, which was
|
It was created by libpng $as_me 1.4.0beta40, which was
|
||||||
generated by GNU Autoconf 2.62. Invocation command line was
|
generated by GNU Autoconf 2.62. Invocation command line was
|
||||||
|
|
||||||
$ $0 $@
|
$ $0 $@
|
||||||
@ -2389,7 +2389,7 @@ fi
|
|||||||
|
|
||||||
# Define the identity of the package.
|
# Define the identity of the package.
|
||||||
PACKAGE='libpng'
|
PACKAGE='libpng'
|
||||||
VERSION='1.4.0beta39'
|
VERSION='1.4.0beta40'
|
||||||
|
|
||||||
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
cat >>confdefs.h <<_ACEOF
|
||||||
@ -2558,7 +2558,7 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
PNGLIB_VERSION=1.4.0beta39
|
PNGLIB_VERSION=1.4.0beta40
|
||||||
PNGLIB_MAJOR=1
|
PNGLIB_MAJOR=1
|
||||||
PNGLIB_MINOR=4
|
PNGLIB_MINOR=4
|
||||||
PNGLIB_RELEASE=0
|
PNGLIB_RELEASE=0
|
||||||
@ -13125,7 +13125,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.0beta39, which was
|
This file was extended by libpng $as_me 1.4.0beta40, which was
|
||||||
generated by GNU Autoconf 2.62. Invocation command line was
|
generated by GNU Autoconf 2.62. Invocation command line was
|
||||||
|
|
||||||
CONFIG_FILES = $CONFIG_FILES
|
CONFIG_FILES = $CONFIG_FILES
|
||||||
@ -13178,7 +13178,7 @@ Report bugs to <bug-autoconf@gnu.org>."
|
|||||||
_ACEOF
|
_ACEOF
|
||||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||||
ac_cs_version="\\
|
ac_cs_version="\\
|
||||||
libpng config.status 1.4.0beta39
|
libpng config.status 1.4.0beta40
|
||||||
configured by $0, generated by GNU Autoconf 2.62,
|
configured by $0, generated by GNU Autoconf 2.62,
|
||||||
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
with options \\"`$as_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.0beta39], [png-mng-implement@lists.sourceforge.net])
|
AC_INIT([libpng], [1.4.0beta40], [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.0beta39
|
PNGLIB_VERSION=1.4.0beta40
|
||||||
PNGLIB_MAJOR=1
|
PNGLIB_MAJOR=1
|
||||||
PNGLIB_MINOR=4
|
PNGLIB_MINOR=4
|
||||||
PNGLIB_RELEASE=0
|
PNGLIB_RELEASE=0
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
#if 0 /* in case someone actually tries to compile this */
|
#if 0 /* in case someone actually tries to compile this */
|
||||||
|
|
||||||
/* example.c - an example of using libpng
|
/* example.c - an example of using libpng
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* This file has been placed in the public domain by the authors.
|
* This file has been placed in the public domain by the authors.
|
||||||
* Maintained 1998-2008 Glenn Randers-Pehrson
|
* Maintained 1998-2008 Glenn Randers-Pehrson
|
||||||
* Maintained 1996, 1997 Andreas Dilger)
|
* Maintained 1996, 1997 Andreas Dilger)
|
||||||
|
@ -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.0beta39 - November 23, 2008
|
libpng version 1.4.0beta40 - November 25, 2008
|
||||||
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
|
||||||
@ -2816,13 +2816,13 @@ application:
|
|||||||
|
|
||||||
IX. Y2K Compliance in libpng
|
IX. Y2K Compliance in libpng
|
||||||
|
|
||||||
November 23, 2008
|
November 25, 2008
|
||||||
|
|
||||||
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.0beta39 are Y2K compliant. It is my belief that earlier
|
upward through 1.4.0beta40 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
|
18
libpng.3
18
libpng.3
@ -1,6 +1,6 @@
|
|||||||
.TH LIBPNG 3 "November 23, 2008"
|
.TH LIBPNG 3 "November 25, 2008"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta39
|
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta40
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
\fI\fB
|
\fI\fB
|
||||||
|
|
||||||
@ -809,7 +809,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.0beta39 - November 23, 2008
|
libpng version 1.4.0beta40 - November 25, 2008
|
||||||
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
|
||||||
@ -3625,13 +3625,13 @@ application:
|
|||||||
|
|
||||||
.SH IX. Y2K Compliance in libpng
|
.SH IX. Y2K Compliance in libpng
|
||||||
|
|
||||||
November 23, 2008
|
November 25, 2008
|
||||||
|
|
||||||
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.0beta39 are Y2K compliant. It is my belief that earlier
|
upward through 1.4.0beta40 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
|
||||||
@ -3799,7 +3799,7 @@ the first widely used release:
|
|||||||
1.4.0beta9-14 14 10400 14.so.0.0[.0]
|
1.4.0beta9-14 14 10400 14.so.0.0[.0]
|
||||||
1.2.13 13 10213 12.so.0.13[.0]
|
1.2.13 13 10213 12.so.0.13[.0]
|
||||||
1.4.0beta15-36 14 10400 14.so.0.0[.0]
|
1.4.0beta15-36 14 10400 14.so.0.0[.0]
|
||||||
1.4.0beta37-39 14 10400 14.so.14.0[.0]
|
1.4.0beta37-40 14 10400 14.so.14.0[.0]
|
||||||
|
|
||||||
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
|
||||||
@ -3855,7 +3855,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.0beta39 - November 23, 2008:
|
Libpng version 1.4.0beta40 - November 25, 2008:
|
||||||
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).
|
||||||
|
|
||||||
@ -3876,7 +3876,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.0beta39, November 23, 2008, are
|
libpng versions 1.2.6, August 15, 2004, through 1.4.0beta40, November 25, 2008, are
|
||||||
Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
|
Copyright (c) 2004,2006-2007 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
|
||||||
@ -3975,7 +3975,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 23, 2008
|
November 25, 2008
|
||||||
|
|
||||||
.\" end of man page
|
.\" end of man page
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
.TH LIBPNGPF 3 "November 23, 2008"
|
.TH LIBPNGPF 3 "November 25, 2008"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta39
|
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta40
|
||||||
(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 23, 2008"
|
.TH PNG 5 "November 25, 2008"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
png \- Portable Network Graphics (PNG) format
|
png \- Portable Network Graphics (PNG) format
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
|
96
png.c
96
png.c
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* png.c - location for general purpose libpng functions
|
/* png.c - location for general purpose libpng functions
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* 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-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
@ -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_0beta39 Your_png_h_is_not_version_1_4_0beta39;
|
typedef version_1_4_0beta40 Your_png_h_is_not_version_1_4_0beta40;
|
||||||
|
|
||||||
/* 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. */
|
||||||
@ -641,13 +641,13 @@ png_get_copyright(png_structp png_ptr)
|
|||||||
#else
|
#else
|
||||||
#ifdef __STDC__
|
#ifdef __STDC__
|
||||||
return ((png_charp) PNG_STRING_NEWLINE \
|
return ((png_charp) PNG_STRING_NEWLINE \
|
||||||
"libpng version x 1.4.0beta39 - November 23, 2008" PNG_STRING_NEWLINE \
|
"libpng version x 1.4.0beta40 - November 25, 2008" PNG_STRING_NEWLINE \
|
||||||
"Copyright (c) 1998-2008 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
|
"Copyright (c) 1998-2008 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
|
||||||
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
|
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
|
||||||
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
|
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
|
||||||
PNG_STRING_NEWLINE);
|
PNG_STRING_NEWLINE);
|
||||||
#else
|
#else
|
||||||
return ((png_charp) "libpng version 1.4.0beta39 - November 23, 2008\
|
return ((png_charp) "libpng version 1.4.0beta40 - November 25, 2008\
|
||||||
Copyright (c) 1998-2008 Glenn Randers-Pehrson\
|
Copyright (c) 1998-2008 Glenn Randers-Pehrson\
|
||||||
Copyright (c) 1996-1997 Andreas Dilger\
|
Copyright (c) 1996-1997 Andreas Dilger\
|
||||||
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");
|
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");
|
||||||
@ -745,76 +745,9 @@ png_convert_size(size_t size)
|
|||||||
}
|
}
|
||||||
#endif /* PNG_SIZE_T */
|
#endif /* PNG_SIZE_T */
|
||||||
|
|
||||||
/* Added at libpng version 1.4.0 (moved from pngset.c) */
|
/* Added at libpng version 1.2.34 and 1.4.0 (moved from pngset.c) */
|
||||||
#if defined(PNG_cHRM_SUPPORTED)
|
#if defined(PNG_cHRM_SUPPORTED)
|
||||||
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
|
||||||
int /* private */
|
|
||||||
png_check_cHRM(png_structp png_ptr,
|
|
||||||
double white_x, double white_y, double red_x, double red_y,
|
|
||||||
double green_x, double green_y, double blue_x, double blue_y)
|
|
||||||
{
|
|
||||||
int ret = 1;
|
|
||||||
|
|
||||||
png_debug(1, "in png_check_cHRM function");
|
|
||||||
if (png_ptr == NULL)
|
|
||||||
ret = 0;
|
|
||||||
if (!(white_x || white_y || red_x || red_y || green_x || green_y ||
|
|
||||||
blue_x || blue_y))
|
|
||||||
{
|
|
||||||
png_warning(png_ptr,
|
|
||||||
"Ignoring attempt to set all-zero chromaticity values");
|
|
||||||
ret = 0;
|
|
||||||
}
|
|
||||||
if (white_x < 0.0 || white_y < 0.0 ||
|
|
||||||
red_x < 0.0 || red_y < 0.0 ||
|
|
||||||
green_x < 0.0 || green_y < 0.0 ||
|
|
||||||
blue_x < 0.0 || blue_y < 0.0)
|
|
||||||
{
|
|
||||||
png_warning(png_ptr,
|
|
||||||
"Ignoring attempt to set negative chromaticity value");
|
|
||||||
ret = 0;
|
|
||||||
}
|
|
||||||
if (white_x > 21474.83 || white_y > 21474.83 ||
|
|
||||||
red_x > 21474.83 || red_y > 21474.83 ||
|
|
||||||
green_x > 21474.83 || green_y > 21474.83 ||
|
|
||||||
blue_x > 21474.83 || blue_y > 21474.83)
|
|
||||||
{
|
|
||||||
png_warning(png_ptr,
|
|
||||||
"Ignoring attempt to set chromaticity value exceeding 21474.83");
|
|
||||||
ret = 0;
|
|
||||||
}
|
|
||||||
if (white_x > .8 || white_y > .8 || white_x + white_y > 1.0)
|
|
||||||
{
|
|
||||||
png_warning(png_ptr, "Invalid cHRM white point");
|
|
||||||
ret = 0;
|
|
||||||
}
|
|
||||||
if (red_x + red_y > 1.0)
|
|
||||||
{
|
|
||||||
png_warning(png_ptr, "Invalid cHRM red point");
|
|
||||||
ret = 0;
|
|
||||||
}
|
|
||||||
if (green_x + green_y > 1.0)
|
|
||||||
{
|
|
||||||
png_warning(png_ptr, "Invalid cHRM green point");
|
|
||||||
ret = 0;
|
|
||||||
}
|
|
||||||
if (blue_x + blue_y > 1.0)
|
|
||||||
{
|
|
||||||
png_warning(png_ptr, "Invalid cHRM blue point");
|
|
||||||
ret = 0;
|
|
||||||
}
|
|
||||||
if (((green_x - red_x) * (blue_y - red_y)) == ((green_y - red_y) *
|
|
||||||
(blue_x - red_x)))
|
|
||||||
{
|
|
||||||
png_warning(png_ptr,
|
|
||||||
"Ignoring attempt to set cHRM RGB triangle with zero area");
|
|
||||||
ret = 0;
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
#endif /* PNG_FLOATING_POINT_SUPPORTED */
|
|
||||||
|
|
||||||
#ifdef PNG_FIXED_POINT_SUPPORTED
|
|
||||||
/*
|
/*
|
||||||
Multiply two 32-bit numbers, V1 and V2, using 32-bit
|
Multiply two 32-bit numbers, V1 and V2, using 32-bit
|
||||||
arithmetic, to produce a 64 bit result in the HI/LO words.
|
arithmetic, to produce a 64 bit result in the HI/LO words.
|
||||||
@ -866,18 +799,10 @@ png_check_cHRM_fixed(png_structp png_ptr,
|
|||||||
if (png_ptr == NULL)
|
if (png_ptr == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!(white_x || white_y || red_x || red_y || green_x || green_y ||
|
if (white_x < 0 || white_y <= 0 ||
|
||||||
blue_x || blue_y))
|
red_x < 0 || red_y < 0 ||
|
||||||
{
|
green_x < 0 || green_y < 0 ||
|
||||||
png_warning(png_ptr,
|
blue_x < 0 || blue_y < 0)
|
||||||
"Ignoring attempt to set all-zero chromaticity values");
|
|
||||||
ret = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (white_x < 0 || white_y < 0 ||
|
|
||||||
red_x < 0 || red_y < 0 ||
|
|
||||||
green_x < 0 || green_y < 0 ||
|
|
||||||
blue_x < 0 || blue_y < 0)
|
|
||||||
{
|
{
|
||||||
png_warning(png_ptr,
|
png_warning(png_ptr,
|
||||||
"Ignoring attempt to set negative chromaticity value");
|
"Ignoring attempt to set negative chromaticity value");
|
||||||
@ -896,7 +821,7 @@ png_check_cHRM_fixed(png_structp png_ptr,
|
|||||||
"Ignoring attempt to set chromaticity value exceeding 21474.83");
|
"Ignoring attempt to set chromaticity value exceeding 21474.83");
|
||||||
ret = 0;
|
ret = 0;
|
||||||
}
|
}
|
||||||
if (white_x > 80000L || white_y > 80000L || white_x + white_y > 100000L)
|
if (white_x + white_y > 100000L)
|
||||||
{
|
{
|
||||||
png_warning(png_ptr, "Invalid cHRM white point");
|
png_warning(png_ptr, "Invalid cHRM white point");
|
||||||
ret = 0;
|
ret = 0;
|
||||||
@ -929,6 +854,5 @@ png_check_cHRM_fixed(png_structp png_ptr,
|
|||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
#endif /* PNG_FIXED_POINT_SUPPORTED */
|
|
||||||
#endif /* PNG_cHRM_SUPPORTED */
|
#endif /* PNG_cHRM_SUPPORTED */
|
||||||
#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
|
#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
|
||||||
|
18
png.h
18
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.0beta39 - November 23, 2008
|
* libpng version 1.4.0beta40 - November 25, 2008
|
||||||
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 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.0beta39 - November 23, 2008: Glenn
|
* libpng versions 0.97, January 1998, through 1.4.0beta40 - November 25, 2008: Glenn
|
||||||
* See also "Contributing Authors", below.
|
* See also "Contributing Authors", below.
|
||||||
*
|
*
|
||||||
* Note about libpng version numbers:
|
* Note about libpng version numbers:
|
||||||
@ -127,7 +127,7 @@
|
|||||||
* 1.4.0beta9-14 14 10400 14.so.0.0[.0]
|
* 1.4.0beta9-14 14 10400 14.so.0.0[.0]
|
||||||
* 1.2.13 13 10213 12.so.0.10[.0]
|
* 1.2.13 13 10213 12.so.0.10[.0]
|
||||||
* 1.4.0beta15-36 14 10400 14.so.0.0[.0]
|
* 1.4.0beta15-36 14 10400 14.so.0.0[.0]
|
||||||
* 1.4.0beta37-39 14 10400 14.so.14.0[.0]
|
* 1.4.0beta37-40 14 10400 14.so.14.0[.0]
|
||||||
*
|
*
|
||||||
* 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
|
||||||
@ -157,7 +157,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.0beta39, November 23, 2008, are
|
* libpng versions 1.2.6, August 15, 2004, through 1.4.0beta40, November 25, 2008, are
|
||||||
* Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
|
* Copyright (c) 2004, 2006-2007 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:
|
||||||
@ -275,7 +275,7 @@
|
|||||||
* 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.0beta39 are Y2K compliant. It is my belief that earlier
|
* upward through 1.4.0beta40 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
|
||||||
@ -331,9 +331,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.0beta39"
|
#define PNG_LIBPNG_VER_STRING "1.4.0beta40"
|
||||||
#define PNG_HEADER_VERSION_STRING \
|
#define PNG_HEADER_VERSION_STRING \
|
||||||
" libpng version 1.4.0beta39 - November 23, 2008\n"
|
" libpng version 1.4.0beta40 - November 25, 2008\n"
|
||||||
|
|
||||||
#define PNG_LIBPNG_VER_SONUM 14
|
#define PNG_LIBPNG_VER_SONUM 14
|
||||||
#define PNG_LIBPNG_VER_DLLNUM 14
|
#define PNG_LIBPNG_VER_DLLNUM 14
|
||||||
@ -345,7 +345,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 39
|
#define PNG_LIBPNG_VER_BUILD 40
|
||||||
|
|
||||||
/* Release Status */
|
/* Release Status */
|
||||||
#define PNG_LIBPNG_BUILD_ALPHA 1
|
#define PNG_LIBPNG_BUILD_ALPHA 1
|
||||||
@ -1353,7 +1353,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_0beta39;
|
typedef png_structp version_1_4_0beta40;
|
||||||
|
|
||||||
typedef png_struct FAR * FAR * png_structpp;
|
typedef png_struct FAR * FAR * png_structpp;
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngconf.h - machine configurable file for libpng
|
/* pngconf.h - machine configurable file for libpng
|
||||||
*
|
*
|
||||||
* libpng version 1.4.0beta39 - November 23, 2008
|
* libpng version 1.4.0beta40 - November 25, 2008
|
||||||
* 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-2007 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2007 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
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* 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-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
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
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* 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-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 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
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* 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-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 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
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* 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-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
11
pngpriv.h
11
pngpriv.h
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngpriv.h - private declarations for use inside libpng
|
/* pngpriv.h - private declarations for use inside libpng
|
||||||
*
|
*
|
||||||
* libpng version 1.4.0beta39 - November 23, 2008
|
* libpng version 1.4.0beta40 - November 25, 2008
|
||||||
* 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-2007 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
@ -406,14 +406,12 @@ PNG_EXTERN void png_write_cHRM PNGARG((png_structp png_ptr,
|
|||||||
double red_x, double red_y, double green_x, double green_y,
|
double red_x, double red_y, double green_x, double green_y,
|
||||||
double blue_x, double blue_y));
|
double blue_x, double blue_y));
|
||||||
#endif
|
#endif
|
||||||
#ifdef PNG_FIXED_POINT_SUPPORTED
|
|
||||||
PNG_EXTERN void png_write_cHRM_fixed PNGARG((png_structp png_ptr,
|
PNG_EXTERN void png_write_cHRM_fixed PNGARG((png_structp png_ptr,
|
||||||
png_fixed_point int_white_x, png_fixed_point int_white_y,
|
png_fixed_point int_white_x, png_fixed_point int_white_y,
|
||||||
png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
|
png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
|
||||||
int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
|
int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
|
||||||
png_fixed_point int_blue_y));
|
png_fixed_point int_blue_y));
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(PNG_WRITE_sRGB_SUPPORTED)
|
#if defined(PNG_WRITE_sRGB_SUPPORTED)
|
||||||
PNG_EXTERN void png_write_sRGB PNGARG((png_structp png_ptr,
|
PNG_EXTERN void png_write_sRGB PNGARG((png_structp png_ptr,
|
||||||
@ -854,19 +852,12 @@ PNG_EXTERN void png_init_mmx_flags PNGARG((png_structp png_ptr));
|
|||||||
|
|
||||||
/* Added at libpng version 1.4.0 */
|
/* Added at libpng version 1.4.0 */
|
||||||
#if defined(PNG_cHRM_SUPPORTED)
|
#if defined(PNG_cHRM_SUPPORTED)
|
||||||
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
|
||||||
PNG_EXTERN int png_check_cHRM PNGARG((png_structp png_ptr,
|
|
||||||
double white_x, double white_y, double red_x,
|
|
||||||
double red_y, double green_x, double green_y, double blue_x, double blue_y));
|
|
||||||
#endif
|
|
||||||
#ifdef PNG_FIXED_POINT_SUPPORTED
|
|
||||||
PNG_EXTERN int png_check_cHRM_fixed PNGARG((png_structp png_ptr,
|
PNG_EXTERN int png_check_cHRM_fixed PNGARG((png_structp png_ptr,
|
||||||
png_fixed_point int_white_x, png_fixed_point int_white_y,
|
png_fixed_point int_white_x, png_fixed_point int_white_y,
|
||||||
png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
|
png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
|
||||||
int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
|
int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
|
||||||
png_fixed_point int_blue_y));
|
png_fixed_point int_blue_y));
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */
|
/* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngread.c - read a PNG file
|
/* pngread.c - read a PNG file
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* 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-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
2
pngrio.c
2
pngrio.c
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngrio.c - functions for data input
|
/* pngrio.c - functions for data input
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* 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-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 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
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* 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-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 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
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* 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-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
30
pngset.c
30
pngset.c
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngset.c - storage of image information into info struct
|
/* pngset.c - storage of image information into info struct
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* 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-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
@ -575,10 +575,8 @@ png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,
|
|||||||
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
||||||
float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;
|
float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;
|
||||||
#endif
|
#endif
|
||||||
#ifdef PNG_FIXED_POINT_SUPPORTED
|
|
||||||
png_fixed_point int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
|
png_fixed_point int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
|
||||||
int_green_y, int_blue_x, int_blue_y;
|
int_green_y, int_blue_x, int_blue_y;
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
png_debug1(1, "in %s storage function", "sRGB_gAMA_and_cHRM");
|
png_debug1(1, "in %s storage function", "sRGB_gAMA_and_cHRM");
|
||||||
if (png_ptr == NULL || info_ptr == NULL)
|
if (png_ptr == NULL || info_ptr == NULL)
|
||||||
@ -598,7 +596,6 @@ png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(PNG_cHRM_SUPPORTED)
|
#if defined(PNG_cHRM_SUPPORTED)
|
||||||
#ifdef PNG_FIXED_POINT_SUPPORTED
|
|
||||||
int_white_x = 31270L;
|
int_white_x = 31270L;
|
||||||
int_white_y = 32900L;
|
int_white_y = 32900L;
|
||||||
int_red_x = 64000L;
|
int_red_x = 64000L;
|
||||||
@ -608,13 +605,6 @@ png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,
|
|||||||
int_blue_x = 15000L;
|
int_blue_x = 15000L;
|
||||||
int_blue_y = 6000L;
|
int_blue_y = 6000L;
|
||||||
|
|
||||||
if (png_check_cHRM_fixed(png_ptr,
|
|
||||||
int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
|
|
||||||
int_green_y, int_blue_x, int_blue_y))
|
|
||||||
png_set_cHRM_fixed(png_ptr, info_ptr,
|
|
||||||
int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
|
|
||||||
int_green_y, int_blue_x, int_blue_y);
|
|
||||||
#endif
|
|
||||||
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
||||||
white_x = (float).3127;
|
white_x = (float).3127;
|
||||||
white_y = (float).3290;
|
white_y = (float).3290;
|
||||||
@ -624,15 +614,25 @@ png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,
|
|||||||
green_y = (float).60;
|
green_y = (float).60;
|
||||||
blue_x = (float).15;
|
blue_x = (float).15;
|
||||||
blue_y = (float).06;
|
blue_y = (float).06;
|
||||||
|
#endif
|
||||||
|
|
||||||
if (png_check_cHRM(png_ptr,
|
if (png_check_cHRM_fixed(png_ptr,
|
||||||
white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y))
|
int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
|
||||||
|
int_green_y, int_blue_x, int_blue_y))
|
||||||
|
{
|
||||||
|
#ifdef PNG_FIXED_POINT_SUPPORTED
|
||||||
|
png_set_cHRM_fixed(png_ptr, info_ptr,
|
||||||
|
int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
|
||||||
|
int_green_y, int_blue_x, int_blue_y);
|
||||||
|
#endif
|
||||||
|
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
||||||
png_set_cHRM(png_ptr, info_ptr,
|
png_set_cHRM(png_ptr, info_ptr,
|
||||||
white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);
|
white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
}
|
||||||
|
#endif /* cHRM */
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* sRGB */
|
||||||
|
|
||||||
|
|
||||||
#if defined(PNG_iCCP_SUPPORTED)
|
#if defined(PNG_iCCP_SUPPORTED)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngtest.c - a simple test program to test libpng
|
/* pngtest.c - a simple test program to test libpng
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* 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-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
@ -1613,4 +1613,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_0beta39 your_png_h_is_not_version_1_4_0beta39;
|
typedef version_1_4_0beta40 your_png_h_is_not_version_1_4_0beta40;
|
||||||
|
@ -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)
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* 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-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
2
pngwio.c
2
pngwio.c
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngwio.c - functions for data output
|
/* pngwio.c - functions for data output
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* 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-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 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
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* 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-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 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
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* 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-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
49
pngwutil.c
49
pngwutil.c
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngwutil.c - utilities to write a PNG file
|
/* pngwutil.c - utilities to write a PNG file
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.4.0 [November 23, 2008]
|
* Last changed in libpng 1.4.0 [November 25, 2008]
|
||||||
* 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-2008 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
@ -995,34 +995,39 @@ png_write_cHRM(png_structp png_ptr, double white_x, double white_y,
|
|||||||
PNG_cHRM;
|
PNG_cHRM;
|
||||||
#endif
|
#endif
|
||||||
png_byte buf[32];
|
png_byte buf[32];
|
||||||
png_uint_32 itemp;
|
|
||||||
|
png_fixed_point int_white_x, int_white_y, int_red_x, int_red_y,
|
||||||
|
int_green_x, int_green_y, int_blue_x, int_blue_y;
|
||||||
|
|
||||||
png_debug(1, "in png_write_cHRM");
|
png_debug(1, "in png_write_cHRM");
|
||||||
/* each value is saved in 1/100,000ths */
|
|
||||||
if (png_check_cHRM(png_ptr, white_x, white_y, red_x, red_y,
|
int_white_x = (png_uint_32)(white_x * 100000.0 + 0.5);
|
||||||
green_x, green_y, blue_x, blue_y))
|
int_white_y = (png_uint_32)(white_y * 100000.0 + 0.5);
|
||||||
|
int_red_x = (png_uint_32)(red_x * 100000.0 + 0.5);
|
||||||
|
int_red_y = (png_uint_32)(red_y * 100000.0 + 0.5);
|
||||||
|
int_green_x = (png_uint_32)(green_x * 100000.0 + 0.5);
|
||||||
|
int_green_y = (png_uint_32)(green_y * 100000.0 + 0.5);
|
||||||
|
int_blue_x = (png_uint_32)(blue_x * 100000.0 + 0.5);
|
||||||
|
int_blue_y = (png_uint_32)(blue_y * 100000.0 + 0.5);
|
||||||
|
|
||||||
|
if (png_check_cHRM_fixed(png_ptr, int_white_x, int_white_y,
|
||||||
|
int_red_x, int_red_y, int_green_x, int_green_y, int_blue_x, int_blue_y))
|
||||||
{
|
{
|
||||||
itemp = (png_uint_32)(white_x * 100000.0 + 0.5);
|
/* each value is saved in 1/100,000ths */
|
||||||
png_save_uint_32(buf, itemp);
|
|
||||||
itemp = (png_uint_32)(white_y * 100000.0 + 0.5);
|
png_save_uint_32(buf, int_white_x);
|
||||||
png_save_uint_32(buf + 4, itemp);
|
png_save_uint_32(buf + 4, int_white_y);
|
||||||
|
|
||||||
itemp = (png_uint_32)(red_x * 100000.0 + 0.5);
|
png_save_uint_32(buf + 8, int_red_x);
|
||||||
png_save_uint_32(buf + 8, itemp);
|
png_save_uint_32(buf + 12, int_red_y);
|
||||||
itemp = (png_uint_32)(red_y * 100000.0 + 0.5);
|
|
||||||
png_save_uint_32(buf + 12, itemp);
|
|
||||||
|
|
||||||
itemp = (png_uint_32)(green_x * 100000.0 + 0.5);
|
png_save_uint_32(buf + 16, int_green_x);
|
||||||
png_save_uint_32(buf + 16, itemp);
|
png_save_uint_32(buf + 20, int_green_y);
|
||||||
itemp = (png_uint_32)(green_y * 100000.0 + 0.5);
|
|
||||||
png_save_uint_32(buf + 20, itemp);
|
|
||||||
|
|
||||||
itemp = (png_uint_32)(blue_x * 100000.0 + 0.5);
|
png_save_uint_32(buf + 24, int_blue_x);
|
||||||
png_save_uint_32(buf + 24, itemp);
|
png_save_uint_32(buf + 28, int_blue_y);
|
||||||
itemp = (png_uint_32)(blue_y * 100000.0 + 0.5);
|
|
||||||
png_save_uint_32(buf + 28, itemp);
|
|
||||||
|
|
||||||
png_write_chunk(png_ptr, (png_bytep)png_cHRM, buf, (png_size_t)32);
|
png_write_chunk(png_ptr, (png_bytep)png_cHRM, buf, (png_size_t)32);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -178,7 +178,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in
|
|||||||
|
|
||||||
# SET UP LINKS
|
# SET UP LINKS
|
||||||
set_target_properties(${PNG_LIB_NAME} PROPERTIES
|
set_target_properties(${PNG_LIB_NAME} PROPERTIES
|
||||||
# VERSION 0.${PNGLIB_RELEASE}.1.4.0beta39
|
# VERSION 0.${PNGLIB_RELEASE}.1.4.0beta40
|
||||||
VERSION 0.${PNGLIB_RELEASE}.0
|
VERSION 0.${PNGLIB_RELEASE}.0
|
||||||
SOVERSION 0
|
SOVERSION 0
|
||||||
CLEAN_DIRECT_OUTPUT 1)
|
CLEAN_DIRECT_OUTPUT 1)
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
# Modeled after libxml-config.
|
# Modeled after libxml-config.
|
||||||
|
|
||||||
version=1.4.0beta39
|
version=1.4.0beta40
|
||||||
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.0beta39
|
Version: 1.4.0beta40
|
||||||
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 = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
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 = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
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 = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
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 = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
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 = 14
|
PNGMAJ = 14
|
||||||
CYGDLL = 14
|
CYGDLL = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
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 = 12
|
PNGMAJ = 12
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
# Library name:
|
# Library name:
|
||||||
PNGMAJ = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
PNGMAJ = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
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 = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
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 = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
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 = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
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 = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
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 = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -81,7 +81,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
|
|||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
PNGMAJ = 14
|
PNGMAJ = 14
|
||||||
MINGDLL = 14
|
MINGDLL = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
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.0beta39
|
SHLIB_MINOR= 1.4.0beta40
|
||||||
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.0beta39
|
SHLIB_MINOR= 1.4.0beta40
|
||||||
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
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
PNGMAJ = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -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.0beta39
|
SHLIB_MINOR= 1.4.0beta40
|
||||||
|
|
||||||
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 = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
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 = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
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 = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
# Library name:
|
# Library name:
|
||||||
PNGMAJ = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
PNGMAJ = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0beta39
|
PNGMIN = 1.4.0beta40
|
||||||
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.0beta39
|
; Version 1.4.0beta40
|
||||||
|
|
||||||
LIBRARY PNG
|
LIBRARY PNG
|
||||||
DESCRIPTION "PNG image compression library for OS/2"
|
DESCRIPTION "PNG image compression library for OS/2"
|
||||||
@ -230,7 +230,6 @@ EXPORTS
|
|||||||
png_set_premultiply_alpha
|
png_set_premultiply_alpha
|
||||||
png_get_chunk_cache_max
|
png_get_chunk_cache_max
|
||||||
png_set_chunk_cache_max
|
png_set_chunk_cache_max
|
||||||
png_check_cHRM
|
|
||||||
png_check_cHRM_fixed
|
png_check_cHRM_fixed
|
||||||
|
|
||||||
; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS
|
; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
LIBRARY
|
LIBRARY
|
||||||
|
|
||||||
EXPORTS
|
EXPORTS
|
||||||
;Version 1.4.0beta39
|
;Version 1.4.0beta40
|
||||||
png_build_grayscale_palette
|
png_build_grayscale_palette
|
||||||
png_chunk_error
|
png_chunk_error
|
||||||
png_chunk_warning
|
png_chunk_warning
|
||||||
@ -228,5 +228,4 @@ EXPORTS
|
|||||||
png_set_premultiply_alpha
|
png_set_premultiply_alpha
|
||||||
png_get_chunk_cache_max
|
png_get_chunk_cache_max
|
||||||
png_set_chunk_cache_max
|
png_set_chunk_cache_max
|
||||||
png_check_cHRM
|
|
||||||
png_check_cHRM_fixed
|
png_check_cHRM_fixed
|
||||||
|
Loading…
x
Reference in New Issue
Block a user