mirror of
https://git.code.sf.net/p/libpng/code.git
synced 2025-07-10 18:04:09 +02:00
[master] Imported from libpng-1.4.6beta05.tar
This commit is contained in:
Glenn Randers-Pehrson
parent
ce5d7cb7aa
commit
97d2d68428
20
ANNOUNCE
20
ANNOUNCE
@ -1,5 +1,5 @@
|
||||
|
||||
Libpng 1.4.6beta04 - January 23, 2011
|
||||
Libpng 1.4.6beta05 - January 23, 2011
|
||||
|
||||
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.
|
||||
@ -9,20 +9,20 @@ Files available for download:
|
||||
Source files with LF line endings (for Unix/Linux) and with a
|
||||
"configure" script
|
||||
|
||||
1.4.6beta04.tar.xz (LZMA-compressed, recommended)
|
||||
1.4.6beta04.tar.gz
|
||||
1.4.6beta04.tar.bz2
|
||||
1.4.6beta05.tar.xz (LZMA-compressed, recommended)
|
||||
1.4.6beta05.tar.gz
|
||||
1.4.6beta05.tar.bz2
|
||||
|
||||
Source files with CRLF line endings (for Windows), without the
|
||||
"configure" script
|
||||
|
||||
lp146b04.7z (LZMA-compressed, recommended)
|
||||
lp146b04.zip
|
||||
lp146b05.7z (LZMA-compressed, recommended)
|
||||
lp146b05.zip
|
||||
|
||||
Other information:
|
||||
|
||||
1.4.6beta04-README.txt
|
||||
1.4.6beta04-LICENSE.txt
|
||||
1.4.6beta05-README.txt
|
||||
1.4.6beta05-LICENSE.txt
|
||||
|
||||
Changes since the last public release (1.4.5):
|
||||
|
||||
@ -43,10 +43,14 @@ version 1.4.6beta04 [January 22, 2011]
|
||||
Added png_const_structp and png_const_infop types, and used them in
|
||||
prototypes for most png_get_*() functions.
|
||||
In the manual, describe the png_get_IHDR() arguments in the correct order.
|
||||
|
||||
version 1.4.6beta05 [January 23, 2011]
|
||||
Updated the synopses in the manual to reflect recent changes.
|
||||
Fixed a typo in the *.def files and deleted entries that are now
|
||||
declared in pngpriv.h
|
||||
|
||||
version 1.4.6beta06 [January 23, 2011]
|
||||
|
||||
Send comments/corrections/commendations to glennrp at users.sourceforge.net
|
||||
or to png-mng-implement at lists.sf.net (subscription required; visit
|
||||
https://lists.sourceforge.net/lists/listinfo/png-mng-implement).
|
||||
|
||||
6
CHANGES
6
CHANGES
@ -2754,10 +2754,16 @@ version 1.4.6beta04 [January 22, 2011]
|
||||
In the manual, describe the png_get_IHDR() arguments in the correct order.
|
||||
Ported change in png_do_rgb_to_gray() from libpng-1.5.1, to make
|
||||
it more robust against internal libpng coding errors.
|
||||
|
||||
version 1.4.6beta05 [January 23, 2011]
|
||||
|
||||
Updated the synopses in the manual to reflect recent changes.
|
||||
Fixed a typo in the *.def files and deleted entries that are now
|
||||
declared in pngpriv.h
|
||||
|
||||
version 1.4.6beta06 [January 23, 2011]
|
||||
|
||||
|
||||
Send comments/corrections/commendations to glennrp at users.sourceforge.net
|
||||
or to png-mng-implement at lists.sf.net (subscription required; visit
|
||||
https://lists.sourceforge.net/lists/listinfo/png-mng-implement).
|
||||
|
||||
@ -255,7 +255,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE})
|
||||
# SET UP LINKS
|
||||
if(PNG_SHARED)
|
||||
set_target_properties(${PNG_LIB_NAME} PROPERTIES
|
||||
# VERSION 14.${PNGLIB_RELEASE}.1.4.6beta04
|
||||
# VERSION 14.${PNGLIB_RELEASE}.1.4.6beta05
|
||||
VERSION 14.${PNGLIB_RELEASE}.0
|
||||
SOVERSION 14
|
||||
CLEAN_DIRECT_OUTPUT 1)
|
||||
|
||||
4
INSTALL
4
INSTALL
@ -1,5 +1,5 @@
|
||||
|
||||
Installing libpng version 1.4.6beta04 - January 22, 2011
|
||||
Installing libpng version 1.4.6beta05 - January 23, 2011
|
||||
|
||||
On Unix/Linux and similar systems, you can simply type
|
||||
|
||||
@ -46,7 +46,7 @@ to have access to the zlib.h and zconf.h include files that
|
||||
correspond to the version of zlib that's installed.
|
||||
|
||||
You can rename the directories that you downloaded (they
|
||||
might be called "libpng-1.4.6beta04" or "libpng14" and "zlib-1.2.3"
|
||||
might be called "libpng-1.4.6beta05" or "libpng14" and "zlib-1.2.3"
|
||||
or "zlib123") so that you have directories called "zlib" and "libpng".
|
||||
|
||||
Your directory structure should look like this:
|
||||
|
||||
4
LICENSE
4
LICENSE
@ -10,7 +10,7 @@ this sentence.
|
||||
|
||||
This code is released under the libpng license.
|
||||
|
||||
libpng versions 1.2.6, August 15, 2004, through 1.4.6beta04, January 22, 2011, are
|
||||
libpng versions 1.2.6, August 15, 2004, through 1.4.6beta05, January 23, 2011, are
|
||||
Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
|
||||
distributed according to the same disclaimer and license as libpng-1.2.5
|
||||
with the following individual added to the list of Contributing Authors
|
||||
@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
|
||||
|
||||
Glenn Randers-Pehrson
|
||||
glennrp at users.sourceforge.net
|
||||
January 22, 2011
|
||||
January 23, 2011
|
||||
|
||||
12
README
12
README
@ -1,4 +1,4 @@
|
||||
README for libpng version 1.4.6beta04 - January 22, 2011 (shared library 14.0)
|
||||
README for libpng version 1.4.6beta05 - January 23, 2011 (shared library 14.0)
|
||||
See the note about version numbers near the top of png.h
|
||||
|
||||
See INSTALL for instructions on how to install libpng.
|
||||
@ -185,9 +185,9 @@ Files in this distribution:
|
||||
makefile.std => Generic UNIX makefile (cc, creates static
|
||||
libpng.a)
|
||||
makefile.elf => Linux/ELF makefile symbol versioning,
|
||||
(gcc, creates libpng14.so.14.1.4.6beta04)
|
||||
(gcc, creates libpng14.so.14.1.4.6beta05)
|
||||
makefile.linux => Linux/ELF makefile
|
||||
(gcc, creates libpng14.so.14.1.4.6beta04)
|
||||
(gcc, creates libpng14.so.14.1.4.6beta05)
|
||||
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
|
||||
makefile.knr => Archaic UNIX Makefile that converts files with
|
||||
ansi2knr (Requires ansi2knr.c from
|
||||
@ -209,12 +209,12 @@ Files in this distribution:
|
||||
makefile.openbsd => OpenBSD makefile
|
||||
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
|
||||
makefile.sggcc => Silicon Graphics
|
||||
(gcc, creates libpng14.so.14.1.4.6beta04)
|
||||
(gcc, creates libpng14.so.14.1.4.6beta05)
|
||||
makefile.sunos => Sun makefile
|
||||
makefile.solaris => Solaris 2.X makefile
|
||||
(gcc, creates libpng14.so.14.1.4.6beta04)
|
||||
(gcc, creates libpng14.so.14.1.4.6beta05)
|
||||
makefile.so9 => Solaris 9 makefile
|
||||
(gcc, creates libpng14.so.14.1.4.6beta04)
|
||||
(gcc, creates libpng14.so.14.1.4.6beta05)
|
||||
makefile.32sunu => Sun Ultra 32-bit makefile
|
||||
makefile.64sunu => Sun Ultra 64-bit makefile
|
||||
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
|
||||
|
||||
22
configure
vendored
22
configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.65 for libpng 1.4.6beta04.
|
||||
# Generated by GNU Autoconf 2.65 for libpng 1.4.6beta05.
|
||||
#
|
||||
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
|
||||
#
|
||||
@ -562,8 +562,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='libpng'
|
||||
PACKAGE_TARNAME='libpng'
|
||||
PACKAGE_VERSION='1.4.6beta04'
|
||||
PACKAGE_STRING='libpng 1.4.6beta04'
|
||||
PACKAGE_VERSION='1.4.6beta05'
|
||||
PACKAGE_STRING='libpng 1.4.6beta05'
|
||||
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
|
||||
PACKAGE_URL=''
|
||||
|
||||
@ -1292,7 +1292,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# 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.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures libpng 1.4.6beta04 to adapt to many kinds of systems.
|
||||
\`configure' configures libpng 1.4.6beta05 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1362,7 +1362,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of libpng 1.4.6beta04:";;
|
||||
short | recursive ) echo "Configuration of libpng 1.4.6beta05:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1467,7 +1467,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
libpng configure 1.4.6beta04
|
||||
libpng configure 1.4.6beta05
|
||||
generated by GNU Autoconf 2.65
|
||||
|
||||
Copyright (C) 2009 Free Software Foundation, Inc.
|
||||
@ -1892,7 +1892,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by libpng $as_me 1.4.6beta04, which was
|
||||
It was created by libpng $as_me 1.4.6beta05, which was
|
||||
generated by GNU Autoconf 2.65. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -2700,7 +2700,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='libpng'
|
||||
VERSION='1.4.6beta04'
|
||||
VERSION='1.4.6beta05'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -2764,7 +2764,7 @@ fi
|
||||
|
||||
|
||||
|
||||
PNGLIB_VERSION=1.4.6beta04
|
||||
PNGLIB_VERSION=1.4.6beta05
|
||||
PNGLIB_MAJOR=1
|
||||
PNGLIB_MINOR=4
|
||||
PNGLIB_RELEASE=6
|
||||
@ -12175,7 +12175,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by libpng $as_me 1.4.6beta04, which was
|
||||
This file was extended by libpng $as_me 1.4.6beta05, which was
|
||||
generated by GNU Autoconf 2.65. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -12241,7 +12241,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
libpng config.status 1.4.6beta04
|
||||
libpng config.status 1.4.6beta05
|
||||
configured by $0, generated by GNU Autoconf 2.65,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
@ -16,14 +16,14 @@ dnl should not be necessary to regenerate configure if the time
|
||||
dnl stamps are correct
|
||||
AC_PREREQ(2.59)
|
||||
|
||||
AC_INIT([libpng], [1.4.6beta04], [png-mng-implement@lists.sourceforge.net])
|
||||
AC_INIT([libpng], [1.4.6beta05], [png-mng-implement@lists.sourceforge.net])
|
||||
AM_INIT_AUTOMAKE
|
||||
dnl stop configure from automagically running automake
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
dnl Version number stuff here:
|
||||
|
||||
PNGLIB_VERSION=1.4.6beta04
|
||||
PNGLIB_VERSION=1.4.6beta05
|
||||
PNGLIB_MAJOR=1
|
||||
PNGLIB_MINOR=4
|
||||
PNGLIB_RELEASE=6
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
libpng.txt - A description on how to use and modify libpng
|
||||
|
||||
libpng version 1.4.6beta04 - January 23, 2011
|
||||
libpng version 1.4.6beta05 - January 23, 2011
|
||||
Updated and distributed by Glenn Randers-Pehrson
|
||||
<glennrp at users.sourceforge.net>
|
||||
Copyright (c) 1998-2010 Glenn Randers-Pehrson
|
||||
@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng
|
||||
|
||||
Based on:
|
||||
|
||||
libpng versions 0.97, January 1998, through 1.4.6beta04 - January 23, 2011
|
||||
libpng versions 0.97, January 1998, through 1.4.6beta05 - January 23, 2011
|
||||
Updated and distributed by Glenn Randers-Pehrson
|
||||
Copyright (c) 1998-2010 Glenn Randers-Pehrson
|
||||
|
||||
@ -905,7 +905,7 @@ things.
|
||||
As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
|
||||
added. It expands the sample depth without changing tRNS to alpha.
|
||||
|
||||
As of libpng version 1.4.6beta04, not all possible expansions are supported.
|
||||
As of libpng version 1.4.6beta05, not all possible expansions are supported.
|
||||
|
||||
In the following table, the 01 means grayscale with depth<8, 31 means
|
||||
indexed with depth<8, other numerals represent the color type, "T" means
|
||||
@ -3311,7 +3311,7 @@ Since the PNG Development group is an ad-hoc body, we can't make
|
||||
an official declaration.
|
||||
|
||||
This is your unofficial assurance that libpng from version 0.71 and
|
||||
upward through 1.4.6beta04 are Y2K compliant. It is my belief that earlier
|
||||
upward through 1.4.6beta05 are Y2K compliant. It is my belief that earlier
|
||||
versions were also Y2K compliant.
|
||||
|
||||
Libpng only has three year fields. One is a 2-byte unsigned integer that
|
||||
16
libpng.3
16
libpng.3
@ -1,6 +1,6 @@
|
||||
.TH LIBPNG 3 "January 23, 2011"
|
||||
.SH NAME
|
||||
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta04
|
||||
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta05
|
||||
.SH SYNOPSIS
|
||||
\fI\fB
|
||||
|
||||
@ -895,7 +895,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
|
||||
.SH LIBPNG.TXT
|
||||
libpng.txt - A description on how to use and modify libpng
|
||||
|
||||
libpng version 1.4.6beta04 - January 23, 2011
|
||||
libpng version 1.4.6beta05 - January 23, 2011
|
||||
Updated and distributed by Glenn Randers-Pehrson
|
||||
<glennrp at users.sourceforge.net>
|
||||
Copyright (c) 1998-2010 Glenn Randers-Pehrson
|
||||
@ -906,7 +906,7 @@ libpng.txt - A description on how to use and modify libpng
|
||||
|
||||
Based on:
|
||||
|
||||
libpng versions 0.97, January 1998, through 1.4.6beta04 - January 23, 2011
|
||||
libpng versions 0.97, January 1998, through 1.4.6beta05 - January 23, 2011
|
||||
Updated and distributed by Glenn Randers-Pehrson
|
||||
Copyright (c) 1998-2010 Glenn Randers-Pehrson
|
||||
|
||||
@ -1800,7 +1800,7 @@ things.
|
||||
As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
|
||||
added. It expands the sample depth without changing tRNS to alpha.
|
||||
|
||||
As of libpng version 1.4.6beta04, not all possible expansions are supported.
|
||||
As of libpng version 1.4.6beta05, not all possible expansions are supported.
|
||||
|
||||
In the following table, the 01 means grayscale with depth<8, 31 means
|
||||
indexed with depth<8, other numerals represent the color type, "T" means
|
||||
@ -4206,7 +4206,7 @@ Since the PNG Development group is an ad-hoc body, we can't make
|
||||
an official declaration.
|
||||
|
||||
This is your unofficial assurance that libpng from version 0.71 and
|
||||
upward through 1.4.6beta04 are Y2K compliant. It is my belief that earlier
|
||||
upward through 1.4.6beta05 are Y2K compliant. It is my belief that earlier
|
||||
versions were also Y2K compliant.
|
||||
|
||||
Libpng only has three year fields. One is a 2-byte unsigned integer that
|
||||
@ -4398,7 +4398,7 @@ the first widely used release:
|
||||
1.4.5beta05-07 14 10405 14.so.14.5[.0]
|
||||
1.4.5rc02-03 14 10405 14.so.14.5[.0]
|
||||
1.4.5 14 10405 14.so.14.5[.0]
|
||||
1.4.6beta01-04 14 10406 14.so.14.6[.0]
|
||||
1.4.6beta01-05 14 10406 14.so.14.6[.0]
|
||||
1.4.6rc01 14 10406 14.so.14.6[.0]
|
||||
|
||||
Henceforth the source version will match the shared-library minor
|
||||
@ -4455,7 +4455,7 @@ possible without all of you.
|
||||
|
||||
Thanks to Frank J. T. Wojcik for helping with the documentation.
|
||||
|
||||
Libpng version 1.4.6beta04 - January 23, 2011:
|
||||
Libpng version 1.4.6beta05 - January 23, 2011:
|
||||
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
|
||||
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
|
||||
|
||||
@ -4478,7 +4478,7 @@ this sentence.
|
||||
|
||||
This code is released under the libpng license.
|
||||
|
||||
libpng versions 1.2.6, August 15, 2004, through 1.4.6beta04, January 23, 2011, are
|
||||
libpng versions 1.2.6, August 15, 2004, through 1.4.6beta05, January 23, 2011, are
|
||||
Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
|
||||
distributed according to the same disclaimer and license as libpng-1.2.5
|
||||
with the following individual added to the list of Contributing Authors
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
.TH LIBPNGPF 3 "January 22, 2011"
|
||||
.TH LIBPNGPF 3 "January 23, 2011"
|
||||
.SH NAME
|
||||
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta04
|
||||
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta05
|
||||
(private functions)
|
||||
.SH SYNOPSIS
|
||||
\fB#include <png.h>\fP
|
||||
|
||||
2
png.5
2
png.5
@ -1,4 +1,4 @@
|
||||
.TH PNG 5 "January 22, 2011"
|
||||
.TH PNG 5 "January 23, 2011"
|
||||
.SH NAME
|
||||
png \- Portable Network Graphics (PNG) format
|
||||
.SH DESCRIPTION
|
||||
|
||||
16
png.c
16
png.c
@ -1,7 +1,7 @@
|
||||
|
||||
/* png.c - location for general purpose libpng functions
|
||||
*
|
||||
* Last changed in libpng 1.4.6 [January 22, 2011]
|
||||
* Last changed in libpng 1.4.6 [January 23, 2011]
|
||||
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||
@ -17,7 +17,7 @@
|
||||
#include "pngpriv.h"
|
||||
|
||||
/* Generate a compiler error if there is an old png.h in the search path. */
|
||||
typedef version_1_4_6beta04 Your_png_h_is_not_version_1_4_6beta04;
|
||||
typedef version_1_4_6beta05 Your_png_h_is_not_version_1_4_6beta05;
|
||||
|
||||
/* Tells libpng that we have already handled the first "num_bytes" bytes
|
||||
* of the PNG file signature. If the PNG data is embedded into another
|
||||
@ -539,7 +539,7 @@ png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime)
|
||||
#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
|
||||
|
||||
png_charp PNGAPI
|
||||
png_get_copyright(const_png_structp png_ptr)
|
||||
png_get_copyright(png_const_structp png_ptr)
|
||||
{
|
||||
png_ptr = png_ptr; /* Silence compiler warning about unused png_ptr */
|
||||
#ifdef PNG_STRING_COPYRIGHT
|
||||
@ -547,13 +547,13 @@ png_get_copyright(const_png_structp png_ptr)
|
||||
#else
|
||||
#ifdef __STDC__
|
||||
return ((png_charp) PNG_STRING_NEWLINE \
|
||||
"libpng version 1.4.6beta04 - January 22, 2011" PNG_STRING_NEWLINE \
|
||||
"libpng version 1.4.6beta05 - January 23, 2011" PNG_STRING_NEWLINE \
|
||||
"Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
|
||||
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
|
||||
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
|
||||
PNG_STRING_NEWLINE);
|
||||
#else
|
||||
return ((png_charp) "libpng version 1.4.6beta04 - January 22, 2011\
|
||||
return ((png_charp) "libpng version 1.4.6beta05 - January 23, 2011\
|
||||
Copyright (c) 1998-2010 Glenn Randers-Pehrson\
|
||||
Copyright (c) 1996-1997 Andreas Dilger\
|
||||
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");
|
||||
@ -570,7 +570,7 @@ png_get_copyright(const_png_structp png_ptr)
|
||||
* it is guaranteed that png.c uses the correct version of png.h.
|
||||
*/
|
||||
png_charp PNGAPI
|
||||
png_get_libpng_ver(const_png_structp png_ptr)
|
||||
png_get_libpng_ver(png_const_structp png_ptr)
|
||||
{
|
||||
/* Version of *.c files used when building libpng */
|
||||
png_ptr = png_ptr; /* Silence compiler warning about unused png_ptr */
|
||||
@ -578,7 +578,7 @@ png_get_libpng_ver(const_png_structp png_ptr)
|
||||
}
|
||||
|
||||
png_charp PNGAPI
|
||||
png_get_header_ver(const_png_structp png_ptr)
|
||||
png_get_header_ver(png_const_structp png_ptr)
|
||||
{
|
||||
/* Version of *.h files used when building libpng */
|
||||
png_ptr = png_ptr; /* Silence compiler warning about unused png_ptr */
|
||||
@ -586,7 +586,7 @@ png_get_header_ver(const_png_structp png_ptr)
|
||||
}
|
||||
|
||||
png_charp PNGAPI
|
||||
png_get_header_version(const_png_structp png_ptr)
|
||||
png_get_header_version(png_const_structp png_ptr)
|
||||
{
|
||||
/* Returns longer string containing both version and date */
|
||||
png_ptr = png_ptr; /* Silence compiler warning about unused png_ptr */
|
||||
|
||||
224
png.h
224
png.h
@ -1,7 +1,7 @@
|
||||
|
||||
/* png.h - header file for PNG reference library
|
||||
*
|
||||
* libpng version 1.4.6beta04 - January 22, 2011
|
||||
* libpng version 1.4.6beta05 - January 23, 2011
|
||||
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||
@ -11,7 +11,7 @@
|
||||
* Authors and maintainers:
|
||||
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
|
||||
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
|
||||
* libpng versions 0.97, January 1998, through 1.4.6beta04 - January 22, 2011: Glenn
|
||||
* libpng versions 0.97, January 1998, through 1.4.6beta05 - January 23, 2011: Glenn
|
||||
* See also "Contributing Authors", below.
|
||||
*
|
||||
* Note about libpng version numbers:
|
||||
@ -153,7 +153,7 @@
|
||||
* 1.4.5beta05-07 14 10405 14.so.14.5[.0]
|
||||
* 1.4.5rc02-03 14 10405 14.so.14.5[.0]
|
||||
* 1.4.5 14 10405 14.so.14.5[.0]
|
||||
* 1.4.6beta01-04 14 10406 14.so.14.6[.0]
|
||||
* 1.4.6beta01-05 14 10406 14.so.14.6[.0]
|
||||
* 1.4.6rc01 14 10406 14.so.14.6[.0]
|
||||
*
|
||||
* Henceforth the source version will match the shared-library major
|
||||
@ -186,7 +186,7 @@
|
||||
*
|
||||
* This code is released under the libpng license.
|
||||
*
|
||||
* libpng versions 1.2.6, August 15, 2004, through 1.4.6beta04, January 22, 2011, are
|
||||
* libpng versions 1.2.6, August 15, 2004, through 1.4.6beta05, January 23, 2011, are
|
||||
* Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
|
||||
* distributed according to the same disclaimer and license as libpng-1.2.5
|
||||
* with the following individual added to the list of Contributing Authors:
|
||||
@ -298,13 +298,13 @@
|
||||
* Y2K compliance in libpng:
|
||||
* =========================
|
||||
*
|
||||
* January 22, 2011
|
||||
* January 23, 2011
|
||||
*
|
||||
* Since the PNG Development group is an ad-hoc body, we can't make
|
||||
* an official declaration.
|
||||
*
|
||||
* This is your unofficial assurance that libpng from version 0.71 and
|
||||
* upward through 1.4.6beta04 are Y2K compliant. It is my belief that earlier
|
||||
* upward through 1.4.6beta05 are Y2K compliant. It is my belief that earlier
|
||||
* versions were also Y2K compliant.
|
||||
*
|
||||
* Libpng only has three year fields. One is a 2-byte unsigned integer
|
||||
@ -360,9 +360,9 @@
|
||||
*/
|
||||
|
||||
/* Version information for png.h - this should match the version in png.c */
|
||||
#define PNG_LIBPNG_VER_STRING "1.4.6beta04"
|
||||
#define PNG_LIBPNG_VER_STRING "1.4.6beta05"
|
||||
#define PNG_HEADER_VERSION_STRING \
|
||||
" libpng version 1.4.6beta04 - January 22, 2011\n"
|
||||
" libpng version 1.4.6beta05 - January 23, 2011\n"
|
||||
|
||||
#define PNG_LIBPNG_VER_SONUM 14
|
||||
#define PNG_LIBPNG_VER_DLLNUM 14
|
||||
@ -375,7 +375,7 @@
|
||||
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
|
||||
*/
|
||||
|
||||
#define PNG_LIBPNG_VER_BUILD 04
|
||||
#define PNG_LIBPNG_VER_BUILD 05
|
||||
|
||||
/* Release Status */
|
||||
#define PNG_LIBPNG_BUILD_ALPHA 1
|
||||
@ -907,7 +907,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED)
|
||||
} png_info;
|
||||
|
||||
typedef png_info FAR * png_infop;
|
||||
typedef PNG_CONST png_info FAR * const_png_infop;
|
||||
typedef PNG_CONST png_info FAR * png_const_infop;
|
||||
typedef png_info FAR * FAR * png_infopp;
|
||||
|
||||
/* Maximum positive integer used in PNG is (2^31)-1 */
|
||||
@ -1028,7 +1028,7 @@ typedef png_row_info FAR * FAR * png_row_infopp;
|
||||
*/
|
||||
typedef struct png_struct_def png_struct;
|
||||
typedef png_struct FAR * png_structp;
|
||||
typedef PNG_CONST png_struct FAR * const_png_structp;
|
||||
typedef PNG_CONST png_struct FAR * png_const_structp;
|
||||
|
||||
typedef void (PNGAPI *png_error_ptr) PNGARG((png_structp, png_const_charp));
|
||||
typedef void (PNGAPI *png_rw_ptr) PNGARG((png_structp, png_bytep, png_size_t));
|
||||
@ -1486,7 +1486,7 @@ struct png_struct_def
|
||||
/* This triggers a compiler error in png.c, if png.c and png.h
|
||||
* do not agree upon the version number.
|
||||
*/
|
||||
typedef png_structp version_1_4_6beta04;
|
||||
typedef png_structp version_1_4_6beta05;
|
||||
|
||||
typedef png_struct FAR * FAR * png_structpp;
|
||||
|
||||
@ -1529,7 +1529,7 @@ PNG_EXPORT(png_structp,png_create_write_struct)
|
||||
png_error_ptr error_fn, png_error_ptr warn_fn)) PNG_ALLOCATED;
|
||||
|
||||
PNG_EXPORT(png_size_t,png_get_compression_buffer_size)
|
||||
PNGARG((const_png_structp png_ptr));
|
||||
PNGARG((png_const_structp png_ptr));
|
||||
|
||||
PNG_EXPORT(void,png_set_compression_buffer_size)
|
||||
PNGARG((png_structp png_ptr, png_size_t size));
|
||||
@ -1651,7 +1651,7 @@ PNG_EXPORT(void,png_set_rgb_to_gray) PNGARG((png_structp png_ptr,
|
||||
#endif
|
||||
PNG_EXPORT(void,png_set_rgb_to_gray_fixed) PNGARG((png_structp png_ptr,
|
||||
int error_action, png_fixed_point red, png_fixed_point green ));
|
||||
PNG_EXPORT(png_byte,png_get_rgb_to_gray_status) PNGARG((const_png_structp
|
||||
PNG_EXPORT(png_byte,png_get_rgb_to_gray_status) PNGARG((png_const_structp
|
||||
png_ptr));
|
||||
#endif
|
||||
|
||||
@ -1973,7 +1973,7 @@ PNG_EXPORT(void,png_set_error_fn) PNGARG((png_structp png_ptr,
|
||||
png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn));
|
||||
|
||||
/* Return the user pointer associated with the error functions */
|
||||
PNG_EXPORT(png_voidp,png_get_error_ptr) PNGARG((const_png_structp png_ptr));
|
||||
PNG_EXPORT(png_voidp,png_get_error_ptr) PNGARG((png_const_structp png_ptr));
|
||||
|
||||
/* Replace the default data output functions with a user supplied one(s).
|
||||
* If buffered output is not used, then output_flush_fn can be set to NULL.
|
||||
@ -2006,7 +2006,7 @@ PNG_EXPORT(void,png_set_write_status_fn) PNGARG((png_structp png_ptr,
|
||||
PNG_EXPORT(void,png_set_mem_fn) PNGARG((png_structp png_ptr,
|
||||
png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn));
|
||||
/* Return the user pointer associated with the memory functions */
|
||||
PNG_EXPORT(png_voidp,png_get_mem_ptr) PNGARG((const_png_structp png_ptr));
|
||||
PNG_EXPORT(png_voidp,png_get_mem_ptr) PNGARG((png_const_structp png_ptr));
|
||||
#endif
|
||||
|
||||
#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
|
||||
@ -2026,13 +2026,13 @@ PNG_EXPORT(void,png_set_user_transform_info) PNGARG((png_structp
|
||||
int user_transform_channels));
|
||||
/* Return the user pointer associated with the user transform functions */
|
||||
PNG_EXPORT(png_voidp,png_get_user_transform_ptr)
|
||||
PNGARG((const_png_structp png_ptr));
|
||||
PNGARG((png_const_structp png_ptr));
|
||||
#endif
|
||||
|
||||
#ifdef PNG_USER_CHUNKS_SUPPORTED
|
||||
PNG_EXPORT(void,png_set_read_user_chunk_fn) PNGARG((png_structp png_ptr,
|
||||
png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
|
||||
PNG_EXPORT(png_voidp,png_get_user_chunk_ptr) PNGARG((const_png_structp
|
||||
PNG_EXPORT(png_voidp,png_get_user_chunk_ptr) PNGARG((png_const_structp
|
||||
png_ptr));
|
||||
#endif
|
||||
|
||||
@ -2047,7 +2047,7 @@ PNG_EXPORT(void,png_set_progressive_read_fn) PNGARG((png_structp png_ptr,
|
||||
|
||||
/* Returns the user pointer associated with the push read functions */
|
||||
PNG_EXPORT(png_voidp,png_get_progressive_ptr)
|
||||
PNGARG((const_png_structp png_ptr));
|
||||
PNGARG((png_const_structp png_ptr));
|
||||
|
||||
/* Function to be called when data becomes available */
|
||||
PNG_EXPORT(void,png_process_data) PNGARG((png_structp png_ptr,
|
||||
@ -2155,19 +2155,19 @@ PNG_EXPORT(void,png_set_benign_errors) PNGARG((png_structp
|
||||
* png_info_struct.
|
||||
*/
|
||||
/* Returns "flag" if chunk data is valid in info_ptr. */
|
||||
PNG_EXPORT(png_uint_32,png_get_valid) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, png_uint_32 flag));
|
||||
PNG_EXPORT(png_uint_32,png_get_valid) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr, png_uint_32 flag));
|
||||
|
||||
/* Returns number of bytes needed to hold a transformed row. */
|
||||
PNG_EXPORT(png_size_t,png_get_rowbytes) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_size_t,png_get_rowbytes) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr));
|
||||
|
||||
#ifdef PNG_INFO_IMAGE_SUPPORTED
|
||||
/* Returns row_pointers, which is an array of pointers to scanlines that was
|
||||
* returned from png_read_png().
|
||||
*/
|
||||
PNG_EXPORT(png_bytepp,png_get_rows) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_bytepp,png_get_rows) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr));
|
||||
/* Set row_pointers, which is an array of pointers to scanlines for use
|
||||
* by png_write_png().
|
||||
*/
|
||||
@ -2176,70 +2176,70 @@ PNG_EXPORT(void,png_set_rows) PNGARG((png_structp png_ptr,
|
||||
#endif
|
||||
|
||||
/* Returns number of color channels in image. */
|
||||
PNG_EXPORT(png_byte,png_get_channels) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_byte,png_get_channels) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr));
|
||||
|
||||
#ifdef PNG_EASY_ACCESS_SUPPORTED
|
||||
/* Returns image width in pixels. */
|
||||
PNG_EXPORT(png_uint_32, png_get_image_width) PNGARG((const_png_structp
|
||||
png_ptr, const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_uint_32, png_get_image_width) PNGARG((png_const_structp
|
||||
png_ptr, png_const_infop info_ptr));
|
||||
|
||||
/* Returns image height in pixels. */
|
||||
PNG_EXPORT(png_uint_32, png_get_image_height) PNGARG((const_png_structp
|
||||
png_ptr, const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_uint_32, png_get_image_height) PNGARG((png_const_structp
|
||||
png_ptr, png_const_infop info_ptr));
|
||||
|
||||
/* Returns image bit_depth. */
|
||||
PNG_EXPORT(png_byte, png_get_bit_depth) PNGARG((const_png_structp
|
||||
png_ptr, const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_byte, png_get_bit_depth) PNGARG((png_const_structp
|
||||
png_ptr, png_const_infop info_ptr));
|
||||
|
||||
/* Returns image color_type. */
|
||||
PNG_EXPORT(png_byte, png_get_color_type) PNGARG((const_png_structp
|
||||
png_ptr, const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_byte, png_get_color_type) PNGARG((png_const_structp
|
||||
png_ptr, png_const_infop info_ptr));
|
||||
|
||||
/* Returns image filter_type. */
|
||||
PNG_EXPORT(png_byte, png_get_filter_type) PNGARG((const_png_structp
|
||||
png_ptr, const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_byte, png_get_filter_type) PNGARG((png_const_structp
|
||||
png_ptr, png_const_infop info_ptr));
|
||||
|
||||
/* Returns image interlace_type. */
|
||||
PNG_EXPORT(png_byte, png_get_interlace_type) PNGARG((const_png_structp
|
||||
png_ptr, const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_byte, png_get_interlace_type) PNGARG((png_const_structp
|
||||
png_ptr, png_const_infop info_ptr));
|
||||
|
||||
/* Returns image compression_type. */
|
||||
PNG_EXPORT(png_byte, png_get_compression_type) PNGARG((const_png_structp
|
||||
png_ptr, const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_byte, png_get_compression_type) PNGARG((png_const_structp
|
||||
png_ptr, png_const_infop info_ptr));
|
||||
|
||||
/* Returns image resolution in pixels per meter, from pHYs chunk data. */
|
||||
PNG_EXPORT(png_uint_32, png_get_pixels_per_meter) PNGARG((const_png_structp
|
||||
png_ptr, const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_uint_32, png_get_x_pixels_per_meter) PNGARG((const_png_structp
|
||||
png_ptr, const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_uint_32, png_get_y_pixels_per_meter) PNGARG((const_png_structp
|
||||
png_ptr, const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_uint_32, png_get_pixels_per_meter) PNGARG((png_const_structp
|
||||
png_ptr, png_const_infop info_ptr));
|
||||
PNG_EXPORT(png_uint_32, png_get_x_pixels_per_meter) PNGARG((png_const_structp
|
||||
png_ptr, png_const_infop info_ptr));
|
||||
PNG_EXPORT(png_uint_32, png_get_y_pixels_per_meter) PNGARG((png_const_structp
|
||||
png_ptr, png_const_infop info_ptr));
|
||||
|
||||
/* Returns pixel aspect ratio, computed from pHYs chunk data. */
|
||||
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
||||
PNG_EXPORT(float, png_get_pixel_aspect_ratio) PNGARG((const_png_structp
|
||||
png_ptr, const_png_infop info_ptr));
|
||||
PNG_EXPORT(float, png_get_pixel_aspect_ratio) PNGARG((png_const_structp
|
||||
png_ptr, png_const_infop info_ptr));
|
||||
#endif
|
||||
|
||||
/* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
|
||||
PNG_EXPORT(png_int_32, png_get_x_offset_pixels) PNGARG((const_png_structp
|
||||
png_ptr, const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_int_32, png_get_y_offset_pixels) PNGARG((const_png_structp
|
||||
png_ptr, const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_int_32, png_get_x_offset_microns) PNGARG((const_png_structp
|
||||
png_ptr, const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_int_32, png_get_y_offset_microns) PNGARG((const_png_structp
|
||||
png_ptr, const_png_infop info_ptr));
|
||||
PNG_EXPORT(png_int_32, png_get_x_offset_pixels) PNGARG((png_const_structp
|
||||
png_ptr, png_const_infop info_ptr));
|
||||
PNG_EXPORT(png_int_32, png_get_y_offset_pixels) PNGARG((png_const_structp
|
||||
png_ptr, png_const_infop info_ptr));
|
||||
PNG_EXPORT(png_int_32, png_get_x_offset_microns) PNGARG((png_const_structp
|
||||
png_ptr, png_const_infop info_ptr));
|
||||
PNG_EXPORT(png_int_32, png_get_y_offset_microns) PNGARG((png_const_structp
|
||||
png_ptr, png_const_infop info_ptr));
|
||||
|
||||
#endif /* PNG_EASY_ACCESS_SUPPORTED */
|
||||
|
||||
/* Returns pointer to signature string read from PNG header */
|
||||
PNG_EXPORT(png_bytep,png_get_signature) PNGARG((const_png_structp png_ptr,
|
||||
PNG_EXPORT(png_bytep,png_get_signature) PNGARG((png_const_structp png_ptr,
|
||||
png_infop info_ptr));
|
||||
|
||||
#ifdef PNG_bKGD_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_bKGD) PNGARG((const_png_structp png_ptr,
|
||||
PNG_EXPORT(png_uint_32,png_get_bKGD) PNGARG((png_const_structp png_ptr,
|
||||
png_infop info_ptr, png_color_16p *background));
|
||||
#endif
|
||||
|
||||
@ -2250,14 +2250,14 @@ PNG_EXPORT(void,png_set_bKGD) PNGARG((png_structp png_ptr,
|
||||
|
||||
#ifdef PNG_cHRM_SUPPORTED
|
||||
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_cHRM) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, double *white_x, double *white_y, double *red_x,
|
||||
PNG_EXPORT(png_uint_32,png_get_cHRM) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_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_EXPORT(png_uint_32,png_get_cHRM_fixed) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, png_fixed_point *int_white_x, png_fixed_point
|
||||
PNG_EXPORT(png_uint_32,png_get_cHRM_fixed) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr, 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 *int_green_x, png_fixed_point *int_green_y, png_fixed_point
|
||||
*int_blue_x, png_fixed_point *int_blue_y));
|
||||
@ -2281,11 +2281,11 @@ PNG_EXPORT(void,png_set_cHRM_fixed) PNGARG((png_structp png_ptr,
|
||||
|
||||
#ifdef PNG_gAMA_SUPPORTED
|
||||
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_gAMA) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, double *file_gamma));
|
||||
PNG_EXPORT(png_uint_32,png_get_gAMA) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr, double *file_gamma));
|
||||
#endif
|
||||
PNG_EXPORT(png_uint_32,png_get_gAMA_fixed) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, png_fixed_point *int_file_gamma));
|
||||
PNG_EXPORT(png_uint_32,png_get_gAMA_fixed) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr, png_fixed_point *int_file_gamma));
|
||||
#endif
|
||||
|
||||
#ifdef PNG_gAMA_SUPPORTED
|
||||
@ -2298,8 +2298,8 @@ PNG_EXPORT(void,png_set_gAMA_fixed) PNGARG((png_structp png_ptr,
|
||||
#endif
|
||||
|
||||
#ifdef PNG_hIST_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_hIST) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, png_uint_16p *hist));
|
||||
PNG_EXPORT(png_uint_32,png_get_hIST) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr, png_uint_16p *hist));
|
||||
#endif
|
||||
|
||||
#ifdef PNG_hIST_SUPPORTED
|
||||
@ -2318,8 +2318,8 @@ PNG_EXPORT(void,png_set_IHDR) PNGARG((png_structp png_ptr,
|
||||
int filter_method));
|
||||
|
||||
#ifdef PNG_oFFs_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_oFFs) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
|
||||
PNG_EXPORT(png_uint_32,png_get_oFFs) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
|
||||
int *unit_type));
|
||||
#endif
|
||||
|
||||
@ -2330,8 +2330,8 @@ PNG_EXPORT(void,png_set_oFFs) PNGARG((png_structp png_ptr,
|
||||
#endif
|
||||
|
||||
#ifdef PNG_pCAL_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_pCAL) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, png_charp *purpose, png_int_32 *X0, png_int_32 *X1,
|
||||
PNG_EXPORT(png_uint_32,png_get_pCAL) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr, png_charp *purpose, png_int_32 *X0, png_int_32 *X1,
|
||||
int *type, int *nparams, png_charp *units, png_charpp *params));
|
||||
#endif
|
||||
|
||||
@ -2342,8 +2342,8 @@ PNG_EXPORT(void,png_set_pCAL) PNGARG((png_structp png_ptr,
|
||||
#endif
|
||||
|
||||
#ifdef PNG_pHYs_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_pHYs) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
|
||||
PNG_EXPORT(png_uint_32,png_get_pHYs) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
|
||||
#endif
|
||||
|
||||
#ifdef PNG_pHYs_SUPPORTED
|
||||
@ -2351,14 +2351,14 @@ PNG_EXPORT(void,png_set_pHYs) PNGARG((png_structp png_ptr,
|
||||
png_infop info_ptr, png_uint_32 res_x, png_uint_32 res_y, int unit_type));
|
||||
#endif
|
||||
|
||||
PNG_EXPORT(png_uint_32,png_get_PLTE) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, png_colorp *palette, int *num_palette));
|
||||
PNG_EXPORT(png_uint_32,png_get_PLTE) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr, png_colorp *palette, int *num_palette));
|
||||
|
||||
PNG_EXPORT(void,png_set_PLTE) PNGARG((png_structp png_ptr,
|
||||
png_infop info_ptr, png_colorp palette, int num_palette));
|
||||
|
||||
#ifdef PNG_sBIT_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_sBIT) PNGARG((const_png_structp png_ptr,
|
||||
PNG_EXPORT(png_uint_32,png_get_sBIT) PNGARG((png_const_structp png_ptr,
|
||||
png_infop info_ptr, png_color_8p *sig_bit));
|
||||
#endif
|
||||
|
||||
@ -2368,8 +2368,8 @@ PNG_EXPORT(void,png_set_sBIT) PNGARG((png_structp png_ptr,
|
||||
#endif
|
||||
|
||||
#ifdef PNG_sRGB_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_sRGB) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, int *intent));
|
||||
PNG_EXPORT(png_uint_32,png_get_sRGB) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr, int *intent));
|
||||
#endif
|
||||
|
||||
#ifdef PNG_sRGB_SUPPORTED
|
||||
@ -2380,8 +2380,8 @@ PNG_EXPORT(void,png_set_sRGB_gAMA_and_cHRM) PNGARG((png_structp png_ptr,
|
||||
#endif
|
||||
|
||||
#ifdef PNG_iCCP_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_iCCP) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, png_charpp name, int *compression_type,
|
||||
PNG_EXPORT(png_uint_32,png_get_iCCP) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr, png_charpp name, int *compression_type,
|
||||
png_charpp profile, png_uint_32 *proflen));
|
||||
/* Note to maintainer: profile should be png_bytepp */
|
||||
#endif
|
||||
@ -2394,8 +2394,8 @@ PNG_EXPORT(void,png_set_iCCP) PNGARG((png_structp png_ptr,
|
||||
#endif
|
||||
|
||||
#ifdef PNG_sPLT_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_sPLT) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, png_sPLT_tpp entries));
|
||||
PNG_EXPORT(png_uint_32,png_get_sPLT) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr, png_sPLT_tpp entries));
|
||||
#endif
|
||||
|
||||
#ifdef PNG_sPLT_SUPPORTED
|
||||
@ -2405,8 +2405,8 @@ PNG_EXPORT(void,png_set_sPLT) PNGARG((png_structp png_ptr,
|
||||
|
||||
#ifdef PNG_TEXT_SUPPORTED
|
||||
/* png_get_text also returns the number of text chunks in *num_text */
|
||||
PNG_EXPORT(png_uint_32,png_get_text) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, png_textp *text_ptr, int *num_text));
|
||||
PNG_EXPORT(png_uint_32,png_get_text) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr, png_textp *text_ptr, int *num_text));
|
||||
#endif
|
||||
|
||||
/* Note while png_set_text() will accept a structure whose text,
|
||||
@ -2422,7 +2422,7 @@ PNG_EXPORT(void,png_set_text) PNGARG((png_structp png_ptr,
|
||||
#endif
|
||||
|
||||
#ifdef PNG_tIME_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_tIME) PNGARG((const_png_structp png_ptr,
|
||||
PNG_EXPORT(png_uint_32,png_get_tIME) PNGARG((png_const_structp png_ptr,
|
||||
png_infop info_ptr, png_timep *mod_time));
|
||||
#endif
|
||||
|
||||
@ -2432,7 +2432,7 @@ PNG_EXPORT(void,png_set_tIME) PNGARG((png_structp png_ptr,
|
||||
#endif
|
||||
|
||||
#ifdef PNG_tRNS_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_tRNS) PNGARG((const_png_structp png_ptr,
|
||||
PNG_EXPORT(png_uint_32,png_get_tRNS) PNGARG((png_const_structp png_ptr,
|
||||
png_infop info_ptr, png_bytep *trans_alpha, int *num_trans,
|
||||
png_color_16p *trans_color));
|
||||
#endif
|
||||
@ -2448,12 +2448,12 @@ PNG_EXPORT(void,png_set_tRNS) PNGARG((png_structp png_ptr,
|
||||
|
||||
#ifdef PNG_sCAL_SUPPORTED
|
||||
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_sCAL) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, int *unit, double *width, double *height));
|
||||
PNG_EXPORT(png_uint_32,png_get_sCAL) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr, int *unit, double *width, double *height));
|
||||
#else
|
||||
#ifdef PNG_FIXED_POINT_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_sCAL_s) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, int *unit, png_charpp swidth, png_charpp sheight));
|
||||
PNG_EXPORT(png_uint_32,png_get_sCAL_s) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr, int *unit, png_charpp swidth, png_charpp sheight));
|
||||
#endif
|
||||
#endif
|
||||
#endif /* PNG_sCAL_SUPPORTED */
|
||||
@ -2490,8 +2490,8 @@ PNG_EXPORT(void, png_set_unknown_chunks) PNGARG((png_structp png_ptr,
|
||||
png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns));
|
||||
PNG_EXPORT(void, png_set_unknown_chunk_location)
|
||||
PNGARG((png_structp png_ptr, png_infop info_ptr, int chunk, int location));
|
||||
PNG_EXPORT(png_uint_32,png_get_unknown_chunks) PNGARG((const_png_structp
|
||||
png_ptr, const_png_infop info_ptr, png_unknown_chunkpp entries));
|
||||
PNG_EXPORT(png_uint_32,png_get_unknown_chunks) PNGARG((png_const_structp
|
||||
png_ptr, png_const_infop info_ptr, png_unknown_chunkpp entries));
|
||||
#endif
|
||||
|
||||
/* Png_free_data() will turn off the "valid" flag for anything it frees.
|
||||
@ -2513,11 +2513,11 @@ PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr,
|
||||
png_voidp params));
|
||||
#endif
|
||||
|
||||
PNG_EXPORT(png_charp,png_get_copyright) PNGARG((const_png_structp png_ptr));
|
||||
PNG_EXPORT(png_charp,png_get_header_ver) PNGARG((const_png_structp png_ptr));
|
||||
PNG_EXPORT(png_charp,png_get_header_version) PNGARG((const_png_structp
|
||||
PNG_EXPORT(png_charp,png_get_copyright) PNGARG((png_const_structp png_ptr));
|
||||
PNG_EXPORT(png_charp,png_get_header_ver) PNGARG((png_const_structp png_ptr));
|
||||
PNG_EXPORT(png_charp,png_get_header_version) PNGARG((png_const_structp
|
||||
png_ptr));
|
||||
PNG_EXPORT(png_charp,png_get_libpng_ver) PNGARG((const_png_structp png_ptr));
|
||||
PNG_EXPORT(png_charp,png_get_libpng_ver) PNGARG((png_const_structp png_ptr));
|
||||
|
||||
#ifdef PNG_MNG_FEATURES_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp
|
||||
@ -2542,48 +2542,48 @@ PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp
|
||||
#ifdef PNG_SET_USER_LIMITS_SUPPORTED
|
||||
PNG_EXPORT(void,png_set_user_limits) PNGARG((png_structp
|
||||
png_ptr, png_uint_32 user_width_max, png_uint_32 user_height_max));
|
||||
PNG_EXPORT(png_uint_32,png_get_user_width_max) PNGARG((const_png_structp
|
||||
PNG_EXPORT(png_uint_32,png_get_user_width_max) PNGARG((png_const_structp
|
||||
png_ptr));
|
||||
PNG_EXPORT(png_uint_32,png_get_user_height_max) PNGARG((const_png_structp
|
||||
PNG_EXPORT(png_uint_32,png_get_user_height_max) PNGARG((png_const_structp
|
||||
png_ptr));
|
||||
/* Added in libpng-1.4.0 */
|
||||
PNG_EXPORT(void,png_set_chunk_cache_max) PNGARG((png_structp
|
||||
png_ptr, png_uint_32 user_chunk_cache_max));
|
||||
PNG_EXPORT(png_uint_32,png_get_chunk_cache_max)
|
||||
PNGARG((const_png_structp png_ptr));
|
||||
PNGARG((png_const_structp png_ptr));
|
||||
/* Added in libpng-1.4.1 */
|
||||
PNG_EXPORT(void,png_set_chunk_malloc_max) PNGARG((png_structp
|
||||
png_ptr, png_alloc_size_t user_chunk_cache_max));
|
||||
PNG_EXPORT(png_alloc_size_t,png_get_chunk_malloc_max)
|
||||
PNGARG((const_png_structp png_ptr));
|
||||
PNGARG((png_const_structp png_ptr));
|
||||
#endif
|
||||
|
||||
#if defined(PNG_INCH_CONVERSIONS) && defined(PNG_FLOATING_POINT_SUPPORTED)
|
||||
PNG_EXPORT(png_uint_32,png_get_pixels_per_inch)
|
||||
PNGARG((const_png_structp png_ptr, const_png_infop info_ptr));
|
||||
PNGARG((png_const_structp png_ptr, png_const_infop info_ptr));
|
||||
|
||||
PNG_EXPORT(png_uint_32,png_get_x_pixels_per_inch)
|
||||
PNGARG((const_png_structp png_ptr, const_png_infop info_ptr));
|
||||
PNGARG((png_const_structp png_ptr, png_const_infop info_ptr));
|
||||
|
||||
PNG_EXPORT(png_uint_32,png_get_y_pixels_per_inch)
|
||||
PNGARG((const_png_structp png_ptr, const_png_infop info_ptr));
|
||||
PNGARG((png_const_structp png_ptr, png_const_infop info_ptr));
|
||||
|
||||
PNG_EXPORT(float,png_get_x_offset_inches) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr));
|
||||
PNG_EXPORT(float,png_get_x_offset_inches) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr));
|
||||
|
||||
PNG_EXPORT(float,png_get_y_offset_inches) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr));
|
||||
PNG_EXPORT(float,png_get_y_offset_inches) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr));
|
||||
|
||||
#ifdef PNG_pHYs_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_pHYs_dpi) PNGARG((const_png_structp png_ptr,
|
||||
const_png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
|
||||
PNG_EXPORT(png_uint_32,png_get_pHYs_dpi) PNGARG((png_const_structp png_ptr,
|
||||
png_const_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
|
||||
int *unit_type));
|
||||
#endif /* PNG_pHYs_SUPPORTED */
|
||||
#endif /* PNG_INCH_CONVERSIONS && PNG_FLOATING_POINT_SUPPORTED */
|
||||
|
||||
/* Added in libpng-1.4.0 */
|
||||
#ifdef PNG_IO_STATE_SUPPORTED
|
||||
PNG_EXPORT(png_uint_32,png_get_io_state) PNGARG((const_png_structp png_ptr));
|
||||
PNG_EXPORT(png_uint_32,png_get_io_state) PNGARG((png_const_structp png_ptr));
|
||||
|
||||
PNG_EXPORT(png_bytep,png_get_io_chunk_name)
|
||||
PNGARG((png_structp png_ptr));
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
|
||||
/* pngconf.h - machine configurable file for libpng
|
||||
*
|
||||
* libpng version 1.4.6beta04 - January 22, 2011
|
||||
* libpng version 1.4.6beta05 - January 23, 2011
|
||||
* For conditions of distribution and use, see copyright notice in png.h
|
||||
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||
@ -1379,15 +1379,15 @@ typedef char FAR * FAR * FAR * png_charppp;
|
||||
# endif
|
||||
# ifndef PNG_ALLOCATED
|
||||
# define PNG_ALLOCATED __attribute__((__malloc__))
|
||||
# endif
|
||||
# ifndef PNG_DEPRECATED
|
||||
# define PNG_DEPRECATED __attribute__((__deprecated__))
|
||||
# endif
|
||||
|
||||
/* This specifically protects structure members that should only be
|
||||
* accessed from within the library, therefore should be empty during
|
||||
* a library build.
|
||||
*/
|
||||
# ifndef PNG_DEPRECATED
|
||||
# define PNG_DEPRECATED __attribute__((__deprecated__))
|
||||
# endif
|
||||
# ifndef PNG_DEPSTRUCT
|
||||
# define PNG_DEPSTRUCT __attribute__((__deprecated__))
|
||||
# endif
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
|
||||
/* pngerror.c - stub functions for i/o and memory allocation
|
||||
*
|
||||
* Last changed in libpng 1.4.6 [January 22, 2011]
|
||||
* Last changed in libpng 1.4.6 [January 23, 2011]
|
||||
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||
@ -380,7 +380,7 @@ png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
|
||||
* pointer before png_write_destroy and png_read_destroy are called.
|
||||
*/
|
||||
png_voidp PNGAPI
|
||||
png_get_error_ptr(const_png_structp png_ptr)
|
||||
png_get_error_ptr(png_const_structp png_ptr)
|
||||
{
|
||||
if (png_ptr == NULL)
|
||||
return NULL;
|
||||
|
||||
110
pngget.c
110
pngget.c
@ -1,7 +1,7 @@
|
||||
|
||||
/* pngget.c - retrieval of values from info struct
|
||||
*
|
||||
* Last changed in libpng 1.4.6 [January 22, 2011]
|
||||
* Last changed in libpng 1.4.6 [January 23, 2011]
|
||||
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||
@ -18,7 +18,7 @@
|
||||
#include "pngpriv.h"
|
||||
|
||||
png_uint_32 PNGAPI
|
||||
png_get_valid(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_valid(png_const_structp png_ptr, png_const_infop info_ptr,
|
||||
png_uint_32 flag)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
@ -29,7 +29,7 @@ png_get_valid(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
}
|
||||
|
||||
png_size_t PNGAPI
|
||||
png_get_rowbytes(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_rowbytes(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
return(info_ptr->rowbytes);
|
||||
@ -40,7 +40,7 @@ png_get_rowbytes(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
|
||||
#ifdef PNG_INFO_IMAGE_SUPPORTED
|
||||
png_bytepp PNGAPI
|
||||
png_get_rows(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_rows(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
return(info_ptr->row_pointers);
|
||||
@ -53,7 +53,7 @@ png_get_rows(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
#ifdef PNG_EASY_ACCESS_SUPPORTED
|
||||
/* Easy access to info, added in libpng-0.99 */
|
||||
png_uint_32 PNGAPI
|
||||
png_get_image_width(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_image_width(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
return info_ptr->width;
|
||||
@ -62,7 +62,7 @@ png_get_image_width(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
}
|
||||
|
||||
png_uint_32 PNGAPI
|
||||
png_get_image_height(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_image_height(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
return info_ptr->height;
|
||||
@ -71,7 +71,7 @@ png_get_image_height(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
}
|
||||
|
||||
png_byte PNGAPI
|
||||
png_get_bit_depth(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_bit_depth(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
return info_ptr->bit_depth;
|
||||
@ -80,7 +80,7 @@ png_get_bit_depth(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
}
|
||||
|
||||
png_byte PNGAPI
|
||||
png_get_color_type(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_color_type(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
return info_ptr->color_type;
|
||||
@ -89,7 +89,7 @@ png_get_color_type(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
}
|
||||
|
||||
png_byte PNGAPI
|
||||
png_get_filter_type(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_filter_type(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
return info_ptr->filter_type;
|
||||
@ -98,7 +98,7 @@ png_get_filter_type(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
}
|
||||
|
||||
png_byte PNGAPI
|
||||
png_get_interlace_type(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_interlace_type(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
return info_ptr->interlace_type;
|
||||
@ -107,7 +107,7 @@ png_get_interlace_type(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
}
|
||||
|
||||
png_byte PNGAPI
|
||||
png_get_compression_type(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_compression_type(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
return info_ptr->compression_type;
|
||||
@ -116,7 +116,7 @@ png_get_compression_type(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
}
|
||||
|
||||
png_uint_32 PNGAPI
|
||||
png_get_x_pixels_per_meter(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_x_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
#ifdef PNG_pHYs_SUPPORTED
|
||||
@ -137,7 +137,7 @@ png_get_x_pixels_per_meter(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
}
|
||||
|
||||
png_uint_32 PNGAPI
|
||||
png_get_y_pixels_per_meter(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_y_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
#ifdef PNG_pHYs_SUPPORTED
|
||||
@ -158,7 +158,7 @@ png_get_y_pixels_per_meter(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
}
|
||||
|
||||
png_uint_32 PNGAPI
|
||||
png_get_pixels_per_meter(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
#ifdef PNG_pHYs_SUPPORTED
|
||||
@ -181,7 +181,7 @@ png_get_pixels_per_meter(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
|
||||
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
||||
float PNGAPI
|
||||
png_get_pixel_aspect_ratio(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_pixel_aspect_ratio(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
#ifdef PNG_pHYs_SUPPORTED
|
||||
@ -205,7 +205,7 @@ png_get_pixel_aspect_ratio(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
#endif
|
||||
|
||||
png_int_32 PNGAPI
|
||||
png_get_x_offset_microns(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_x_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
#ifdef PNG_oFFs_SUPPORTED
|
||||
@ -227,7 +227,7 @@ png_get_x_offset_microns(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
}
|
||||
|
||||
png_int_32 PNGAPI
|
||||
png_get_y_offset_microns(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_y_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
|
||||
@ -249,7 +249,7 @@ png_get_y_offset_microns(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
}
|
||||
|
||||
png_int_32 PNGAPI
|
||||
png_get_x_offset_pixels(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_x_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
|
||||
@ -271,7 +271,7 @@ png_get_x_offset_pixels(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
}
|
||||
|
||||
png_int_32 PNGAPI
|
||||
png_get_y_offset_pixels(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_y_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
|
||||
@ -294,35 +294,35 @@ png_get_y_offset_pixels(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
|
||||
#if defined(PNG_INCH_CONVERSIONS) && defined(PNG_FLOATING_POINT_SUPPORTED)
|
||||
png_uint_32 PNGAPI
|
||||
png_get_pixels_per_inch(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
return ((png_uint_32)((float)png_get_pixels_per_meter(png_ptr, info_ptr)
|
||||
*.0254 +.5));
|
||||
}
|
||||
|
||||
png_uint_32 PNGAPI
|
||||
png_get_x_pixels_per_inch(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_x_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
return ((png_uint_32)((float)png_get_x_pixels_per_meter(png_ptr, info_ptr)
|
||||
*.0254 +.5));
|
||||
}
|
||||
|
||||
png_uint_32 PNGAPI
|
||||
png_get_y_pixels_per_inch(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_y_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
return ((png_uint_32)((float)png_get_y_pixels_per_meter(png_ptr, info_ptr)
|
||||
*.0254 +.5));
|
||||
}
|
||||
|
||||
float PNGAPI
|
||||
png_get_x_offset_inches(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_x_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
return ((float)png_get_x_offset_microns(png_ptr, info_ptr)
|
||||
*.00003937);
|
||||
}
|
||||
|
||||
float PNGAPI
|
||||
png_get_y_offset_inches(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_y_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
return ((float)png_get_y_offset_microns(png_ptr, info_ptr)
|
||||
*.00003937);
|
||||
@ -330,7 +330,7 @@ png_get_y_offset_inches(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
|
||||
#ifdef PNG_pHYs_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_pHYs_dpi(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_pHYs_dpi(png_const_structp png_ptr, png_const_infop info_ptr,
|
||||
png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
|
||||
{
|
||||
png_uint_32 retval = 0;
|
||||
@ -370,7 +370,7 @@ png_get_pHYs_dpi(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
#endif /* PNG_EASY_ACCESS_SUPPORTED */
|
||||
|
||||
png_byte PNGAPI
|
||||
png_get_channels(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
png_get_channels(png_const_structp png_ptr, png_const_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
return(info_ptr->channels);
|
||||
@ -379,7 +379,7 @@ png_get_channels(const_png_structp png_ptr, const_png_infop info_ptr)
|
||||
}
|
||||
|
||||
png_bytep PNGAPI
|
||||
png_get_signature(const_png_structp png_ptr, png_infop info_ptr)
|
||||
png_get_signature(png_const_structp png_ptr, png_infop info_ptr)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL)
|
||||
return(info_ptr->signature);
|
||||
@ -389,7 +389,7 @@ png_get_signature(const_png_structp png_ptr, png_infop info_ptr)
|
||||
|
||||
#ifdef PNG_bKGD_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_bKGD(const_png_structp png_ptr, png_infop info_ptr,
|
||||
png_get_bKGD(png_const_structp png_ptr, png_infop info_ptr,
|
||||
png_color_16p *background)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD)
|
||||
@ -407,7 +407,7 @@ png_get_bKGD(const_png_structp png_ptr, png_infop info_ptr,
|
||||
#ifdef PNG_cHRM_SUPPORTED
|
||||
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_cHRM(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_cHRM(png_const_structp png_ptr, png_const_infop info_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)
|
||||
{
|
||||
@ -438,7 +438,7 @@ png_get_cHRM(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
#endif
|
||||
#ifdef PNG_FIXED_POINT_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_cHRM_fixed(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_cHRM_fixed(png_const_structp png_ptr, png_const_infop info_ptr,
|
||||
png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,
|
||||
png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,
|
||||
png_fixed_point *blue_x, png_fixed_point *blue_y)
|
||||
@ -473,7 +473,7 @@ png_get_cHRM_fixed(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
#ifdef PNG_gAMA_SUPPORTED
|
||||
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_gAMA(const_png_structp png_ptr, const_png_infop info_ptr, double *file_gamma)
|
||||
png_get_gAMA(png_const_structp png_ptr, png_const_infop info_ptr, double *file_gamma)
|
||||
{
|
||||
png_debug1(1, "in %s retrieval function", "gAMA");
|
||||
|
||||
@ -488,7 +488,7 @@ png_get_gAMA(const_png_structp png_ptr, const_png_infop info_ptr, double *file_g
|
||||
#endif
|
||||
#ifdef PNG_FIXED_POINT_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_gAMA_fixed(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_gAMA_fixed(png_const_structp png_ptr, png_const_infop info_ptr,
|
||||
png_fixed_point *int_file_gamma)
|
||||
{
|
||||
png_debug1(1, "in %s retrieval function", "gAMA");
|
||||
@ -506,7 +506,7 @@ png_get_gAMA_fixed(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
|
||||
#ifdef PNG_sRGB_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_sRGB(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_sRGB(png_const_structp png_ptr, png_const_infop info_ptr,
|
||||
int *file_srgb_intent)
|
||||
{
|
||||
png_debug1(1, "in %s retrieval function", "sRGB");
|
||||
@ -523,7 +523,7 @@ png_get_sRGB(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
|
||||
#ifdef PNG_iCCP_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_iCCP(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_iCCP(png_const_structp png_ptr, png_const_infop info_ptr,
|
||||
png_charpp name, int *compression_type,
|
||||
png_charpp profile, png_uint_32 *proflen)
|
||||
{
|
||||
@ -547,7 +547,7 @@ png_get_iCCP(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
|
||||
#ifdef PNG_sPLT_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_sPLT(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_sPLT(png_const_structp png_ptr, png_const_infop info_ptr,
|
||||
png_sPLT_tpp spalettes)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL && spalettes != NULL)
|
||||
@ -561,7 +561,7 @@ png_get_sPLT(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
|
||||
#ifdef PNG_hIST_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_hIST(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_hIST(png_const_structp png_ptr, png_const_infop info_ptr,
|
||||
png_uint_16p *hist)
|
||||
{
|
||||
png_debug1(1, "in %s retrieval function", "hIST");
|
||||
@ -617,7 +617,7 @@ png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
|
||||
|
||||
#ifdef PNG_oFFs_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_oFFs(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_oFFs(png_const_structp png_ptr, png_const_infop info_ptr,
|
||||
png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type)
|
||||
{
|
||||
png_debug1(1, "in %s retrieval function", "oFFs");
|
||||
@ -636,7 +636,7 @@ png_get_oFFs(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
|
||||
#ifdef PNG_pCAL_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_pCAL(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_pCAL(png_const_structp png_ptr, png_const_infop info_ptr,
|
||||
png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,
|
||||
png_charp *units, png_charpp *params)
|
||||
{
|
||||
@ -662,7 +662,7 @@ png_get_pCAL(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
#ifdef PNG_sCAL_SUPPORTED
|
||||
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_sCAL(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_sCAL(png_const_structp png_ptr, png_const_infop info_ptr,
|
||||
int *unit, double *width, double *height)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL &&
|
||||
@ -678,7 +678,7 @@ png_get_sCAL(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
#else
|
||||
#ifdef PNG_FIXED_POINT_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_sCAL_s(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_sCAL_s(png_const_structp png_ptr, png_const_infop info_ptr,
|
||||
int *unit, png_charpp width, png_charpp height)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL &&
|
||||
@ -697,7 +697,7 @@ png_get_sCAL_s(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
|
||||
#ifdef PNG_pHYs_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_pHYs(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_pHYs(png_const_structp png_ptr, png_const_infop info_ptr,
|
||||
png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
|
||||
{
|
||||
png_uint_32 retval = 0;
|
||||
@ -730,7 +730,7 @@ png_get_pHYs(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
#endif
|
||||
|
||||
png_uint_32 PNGAPI
|
||||
png_get_PLTE(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_PLTE(png_const_structp png_ptr, png_const_infop info_ptr,
|
||||
png_colorp *palette,
|
||||
int *num_palette)
|
||||
{
|
||||
@ -749,7 +749,7 @@ png_get_PLTE(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
|
||||
#ifdef PNG_sBIT_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_sBIT(const_png_structp png_ptr, png_infop info_ptr,
|
||||
png_get_sBIT(png_const_structp png_ptr, png_infop info_ptr,
|
||||
png_color_8p *sig_bit)
|
||||
{
|
||||
png_debug1(1, "in %s retrieval function", "sBIT");
|
||||
@ -766,7 +766,7 @@ png_get_sBIT(const_png_structp png_ptr, png_infop info_ptr,
|
||||
|
||||
#ifdef PNG_TEXT_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_text(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_text(png_const_structp png_ptr, png_const_infop info_ptr,
|
||||
png_textp *text_ptr, int *num_text)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)
|
||||
@ -791,7 +791,7 @@ png_get_text(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
|
||||
#ifdef PNG_tIME_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_tIME(const_png_structp png_ptr, png_infop info_ptr,
|
||||
png_get_tIME(png_const_structp png_ptr, png_infop info_ptr,
|
||||
png_timep *mod_time)
|
||||
{
|
||||
png_debug1(1, "in %s retrieval function", "tIME");
|
||||
@ -808,7 +808,7 @@ png_get_tIME(const_png_structp png_ptr, png_infop info_ptr,
|
||||
|
||||
#ifdef PNG_tRNS_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_tRNS(const_png_structp png_ptr, png_infop info_ptr,
|
||||
png_get_tRNS(png_const_structp png_ptr, png_infop info_ptr,
|
||||
png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color)
|
||||
{
|
||||
png_uint_32 retval = 0;
|
||||
@ -850,7 +850,7 @@ png_get_tRNS(const_png_structp png_ptr, png_infop info_ptr,
|
||||
|
||||
#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_unknown_chunks(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
png_get_unknown_chunks(png_const_structp png_ptr, png_const_infop info_ptr,
|
||||
png_unknown_chunkpp unknowns)
|
||||
{
|
||||
if (png_ptr != NULL && info_ptr != NULL && unknowns != NULL)
|
||||
@ -864,7 +864,7 @@ png_get_unknown_chunks(const_png_structp png_ptr, const_png_infop info_ptr,
|
||||
|
||||
#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
|
||||
png_byte PNGAPI
|
||||
png_get_rgb_to_gray_status(const_png_structp png_ptr)
|
||||
png_get_rgb_to_gray_status(png_const_structp png_ptr)
|
||||
{
|
||||
return (png_byte)(png_ptr? png_ptr->rgb_to_gray_status : 0);
|
||||
}
|
||||
@ -872,14 +872,14 @@ png_get_rgb_to_gray_status(const_png_structp png_ptr)
|
||||
|
||||
#ifdef PNG_USER_CHUNKS_SUPPORTED
|
||||
png_voidp PNGAPI
|
||||
png_get_user_chunk_ptr(const_png_structp png_ptr)
|
||||
png_get_user_chunk_ptr(png_const_structp png_ptr)
|
||||
{
|
||||
return (png_ptr? png_ptr->user_chunk_ptr : NULL);
|
||||
}
|
||||
#endif
|
||||
|
||||
png_size_t PNGAPI
|
||||
png_get_compression_buffer_size(const_png_structp png_ptr)
|
||||
png_get_compression_buffer_size(png_const_structp png_ptr)
|
||||
{
|
||||
return (png_ptr ? png_ptr->zbuf_size : 0L);
|
||||
}
|
||||
@ -889,24 +889,24 @@ png_get_compression_buffer_size(const_png_structp png_ptr)
|
||||
/* These functions were added to libpng 1.2.6 and were enabled
|
||||
* by default in libpng-1.4.0 */
|
||||
png_uint_32 PNGAPI
|
||||
png_get_user_width_max(const_png_structp png_ptr)
|
||||
png_get_user_width_max(png_const_structp png_ptr)
|
||||
{
|
||||
return (png_ptr? png_ptr->user_width_max : 0);
|
||||
}
|
||||
png_uint_32 PNGAPI
|
||||
png_get_user_height_max(const_png_structp png_ptr)
|
||||
png_get_user_height_max(png_const_structp png_ptr)
|
||||
{
|
||||
return (png_ptr? png_ptr->user_height_max : 0);
|
||||
}
|
||||
/* This function was added to libpng 1.4.0 */
|
||||
png_uint_32 PNGAPI
|
||||
png_get_chunk_cache_max(const_png_structp png_ptr)
|
||||
png_get_chunk_cache_max(png_const_structp png_ptr)
|
||||
{
|
||||
return (png_ptr? png_ptr->user_chunk_cache_max : 0);
|
||||
}
|
||||
/* This function was added to libpng 1.4.1 */
|
||||
png_alloc_size_t PNGAPI
|
||||
png_get_chunk_malloc_max(const_png_structp png_ptr)
|
||||
png_get_chunk_malloc_max(png_const_structp png_ptr)
|
||||
{
|
||||
return (png_ptr?
|
||||
png_ptr->user_chunk_malloc_max : 0);
|
||||
@ -916,7 +916,7 @@ png_get_chunk_malloc_max(const_png_structp png_ptr)
|
||||
/* These functions were added to libpng 1.4.0 */
|
||||
#ifdef PNG_IO_STATE_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_io_state(const_png_structp png_ptr)
|
||||
png_get_io_state(png_const_structp png_ptr)
|
||||
{
|
||||
return png_ptr->io_state;
|
||||
}
|
||||
|
||||
4
pngmem.c
4
pngmem.c
@ -1,7 +1,7 @@
|
||||
|
||||
/* pngmem.c - stub functions for memory allocation
|
||||
*
|
||||
* Last changed in libpng 1.4.6 [January 22, 2011]
|
||||
* Last changed in libpng 1.4.6 [January 23, 2011]
|
||||
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||
@ -601,7 +601,7 @@ png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
|
||||
* pointer before png_write_destroy and png_read_destroy are called.
|
||||
*/
|
||||
png_voidp PNGAPI
|
||||
png_get_mem_ptr(const_png_structp png_ptr)
|
||||
png_get_mem_ptr(png_const_structp png_ptr)
|
||||
{
|
||||
if (png_ptr == NULL)
|
||||
return (NULL);
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
|
||||
/* pngpread.c - read a png file in push mode
|
||||
*
|
||||
* Last changed in libpng 1.4.6 [January 22, 2011]
|
||||
* Last changed in libpng 1.4.6 [January 23, 2011]
|
||||
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||
@ -1757,7 +1757,7 @@ png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,
|
||||
}
|
||||
|
||||
png_voidp PNGAPI
|
||||
png_get_progressive_ptr(const_png_structp png_ptr)
|
||||
png_get_progressive_ptr(png_const_structp png_ptr)
|
||||
{
|
||||
if (png_ptr == NULL)
|
||||
return (NULL);
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
|
||||
/* pngpriv.h - private declarations for use inside libpng
|
||||
*
|
||||
* libpng version 1.4.6beta04 - January 22, 2011
|
||||
* libpng version 1.4.6beta05 - January 23, 2011
|
||||
* For conditions of distribution and use, see copyright notice in png.h
|
||||
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
|
||||
/* pngrutil.c - utilities to read a PNG file
|
||||
*
|
||||
* Last changed in libpng 1.4.6 [January 22, 2011]
|
||||
* Last changed in libpng 1.4.6 [January 23, 2011]
|
||||
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||
|
||||
@ -1687,4 +1687,4 @@ main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
/* Generate a compiler error if there is an old png.h in the search path. */
|
||||
typedef version_1_4_6beta04 your_png_h_is_not_version_1_4_6beta04;
|
||||
typedef version_1_4_6beta05 your_png_h_is_not_version_1_4_6beta05;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
|
||||
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
|
||||
*
|
||||
* Last changed in libpng 1.4.6 [January 22, 2011]
|
||||
* Last changed in libpng 1.4.6 [January 23, 2011]
|
||||
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||
@ -662,7 +662,7 @@ png_set_user_transform_info(png_structp png_ptr, png_voidp
|
||||
* are called.
|
||||
*/
|
||||
png_voidp PNGAPI
|
||||
png_get_user_transform_ptr(const_png_structp png_ptr)
|
||||
png_get_user_transform_ptr(png_const_structp png_ptr)
|
||||
{
|
||||
if (png_ptr == NULL)
|
||||
return (NULL);
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
|
||||
VisualStudio instructions
|
||||
|
||||
libpng version 1.4.6beta04 - January 22, 2011
|
||||
libpng version 1.4.6beta05 - January 23, 2011
|
||||
|
||||
Copyright (c) 1998-2010 Glenn Randers-Pehrson
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<!--
|
||||
* zlib.props - location of zlib source and build
|
||||
*
|
||||
* libpng version 1.4.6beta04 - January 22, 2011
|
||||
* libpng version 1.4.6beta05 - January 23, 2011
|
||||
*
|
||||
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
|
||||
*
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
|
||||
Makefiles for libpng version 1.4.6beta04 - January 22, 2011
|
||||
Makefiles for libpng version 1.4.6beta05 - January 23, 2011
|
||||
|
||||
makefile.linux => Linux/ELF makefile
|
||||
(gcc, creates libpng14.so.14.1.4.6beta04)
|
||||
(gcc, creates libpng14.so.14.1.4.6beta05)
|
||||
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
|
||||
makefile.knr => Archaic UNIX Makefile that converts files with
|
||||
ansi2knr (Requires ansi2knr.c from
|
||||
@ -20,7 +20,7 @@ Makefiles for libpng version 1.4.6beta04 - January 22, 2011
|
||||
makefile.dec => DEC Alpha UNIX makefile
|
||||
makefile.dj2 => DJGPP 2 makefile
|
||||
makefile.elf => Linux/ELF makefile symbol versioning,
|
||||
(gcc, creates libpng14.so.14.1.4.6beta04)
|
||||
(gcc, creates libpng14.so.14.1.4.6beta05)
|
||||
makefile.freebsd => FreeBSD makefile
|
||||
makefile.gcc => Generic gcc makefile
|
||||
makefile.hpgcc => HPUX makefile using gcc
|
||||
@ -36,12 +36,12 @@ Makefiles for libpng version 1.4.6beta04 - January 22, 2011
|
||||
makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def)
|
||||
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
|
||||
makefile.sggcc => Silicon Graphics (gcc,
|
||||
creates libpng14.so.14.1.4.6beta04)
|
||||
creates libpng14.so.14.1.4.6beta05)
|
||||
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
|
||||
makefile.solaris => Solaris 2.X makefile (gcc,
|
||||
creates libpng14.so.14.1.4.6beta04)
|
||||
creates libpng14.so.14.1.4.6beta05)
|
||||
makefile.so9 => Solaris 9 makefile (gcc,
|
||||
creates libpng14.so.14.1.4.6beta04)
|
||||
creates libpng14.so.14.1.4.6beta05)
|
||||
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
|
||||
makefile.sunos => Sun makefile
|
||||
makefile.32sunu => Sun Ultra 32-bit makefile
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
# Modeled after libxml-config.
|
||||
|
||||
version=1.4.6beta04
|
||||
version=1.4.6beta05
|
||||
prefix=""
|
||||
libdir=""
|
||||
libs=""
|
||||
|
||||
@ -5,6 +5,6 @@ includedir=@includedir@/libpng14
|
||||
|
||||
Name: libpng
|
||||
Description: Loads and saves PNG files
|
||||
Version: 1.4.6beta04
|
||||
Version: 1.4.6beta05
|
||||
Libs: -L${libdir} -lpng14
|
||||
Cflags: -I${includedir}
|
||||
|
||||
@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng14
|
||||
|
||||
LIB= png14
|
||||
SHLIB_MAJOR= 0
|
||||
SHLIB_MINOR= 1.4.6beta04
|
||||
SHLIB_MINOR= 1.4.6beta05
|
||||
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
|
||||
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
|
||||
pngwtran.c pngmem.c pngerror.c pngpread.c
|
||||
|
||||
@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
|
||||
|
||||
LIB= png
|
||||
SHLIB_MAJOR= 3
|
||||
SHLIB_MINOR= 1.4.6beta04
|
||||
SHLIB_MINOR= 1.4.6beta05
|
||||
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
|
||||
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
|
||||
pngwtran.c pngmem.c pngerror.c pngpread.c
|
||||
|
||||
@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
|
||||
MANDIR= ${PREFIX}/man/cat
|
||||
|
||||
SHLIB_MAJOR= 0
|
||||
SHLIB_MINOR= 1.4.6beta04
|
||||
SHLIB_MINOR= 1.4.6beta05
|
||||
|
||||
LIB= png
|
||||
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
|
||||
|
||||
@ -15,7 +15,7 @@ LIBRARY lpngce
|
||||
png_get_int_32
|
||||
|
||||
EXPORTS
|
||||
;Version 1.4.6beta04
|
||||
;Version 1.4.6beta05
|
||||
png_build_grayscale_palette @1
|
||||
; png_check_sig @2
|
||||
png_chunk_error @3
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
; PNG.LIB module definition file for OS/2
|
||||
;----------------------------------------
|
||||
|
||||
; Version 1.4.6beta04
|
||||
; Version 1.4.6beta05
|
||||
|
||||
LIBRARY PNG
|
||||
DESCRIPTION "PNG image compression library for OS/2"
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
LIBRARY
|
||||
|
||||
EXPORTS
|
||||
;Version 1.4.6beta04
|
||||
;Version 1.4.6beta05
|
||||
png_build_grayscale_palette
|
||||
png_chunk_error
|
||||
png_chunk_warning
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user