Skip to content

T
Third Party Libpng

OpenHarmony / Third Party Libpng
11 个月 前同步成功

通知 4
Star 22
Fork 0
T
Third Party Libpng

体验新版 GitCode，发现更多精彩内容 >>

提交 d8d7b949 编写于 作者: G Glenn Randers-Pehrson
浏览文件
操作

Imported from libpng-1.4.0beta22.tar

上级 b3ff9685
隐藏空白更改
内联 并排
Showing with 133 addition and 120 deletion
ANNOUNCE
浏览文件 @ d8d7b949
Libpng 1.4.0beta21 - July 21, 2008
Libpng 1.4.0beta22 - July 21, 2008
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,27 +9,27 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
1.4.0beta21.tar.gz
1.4.0beta21.tar.bz2
1.4.0beta22.tar.gz
1.4.0beta22.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
1.4.0beta21-no-config.tar.gz
1.4.0beta21-no-config.tar.bz2
1.4.0beta22-no-config.tar.gz
1.4.0beta22-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lp140b21.zip
lp140b21.tar.bz2
lp140b22.zip
lp140b22.tar.bz2
Other information:
1.4.0beta21-README.txt
1.4.0beta21-KNOWNBUGS.txt
1.4.0beta21-LICENSE.txt
1.4.0beta21-Y2K-compliance.txt
1.4.0beta22-README.txt
1.4.0beta22-KNOWNBUGS.txt
1.4.0beta22-LICENSE.txt
1.4.0beta22-Y2K-compliance.txt
Changes since the last public release (1.2.10):
......
CHANGES
浏览文件 @ d8d7b949
......@@ -1929,6 +1929,9 @@ version 1.4.0beta21 [July 21, 2008]
Moved local array "chunkdata" from pngrutil.c to the png_struct, so
it will be freed by png_read_destroy() in case of a read error.
version 1.4.0beta22 [July 21, 2008]
Change "purpose" and "buffer" to png_ptr->chunkdata to avoid memory leaking.
version 1.4.0betaN [future]
Build shared libraries with -lz and sometimes -lm.
......
INSTALL
浏览文件 @ d8d7b949
Installing libpng version 1.4.0beta21 - July 21, 2008
Installing libpng version 1.4.0beta22 - July 21, 2008
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.
You can rename the directories that you downloaded (they
might be called "libpng-1.4.0beta21" or "lpng109" and "zlib-1.2.1"
might be called "libpng-1.4.0beta22" or "lpng109" and "zlib-1.2.1"
or "zlib121") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:
......@@ -95,14 +95,14 @@ include
CMakeLists.txt => "cmake" script
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng14.so.1.1.4.0beta21)
gcc, creates libpng14.so.1.1.4.0beta22)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng14.so.1.1.4.0beta21)
(gcc, creates libpng14.so.1.1.4.0beta22)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng14.so.1.1.4.0beta21,
(gcc, creates libpng14.so.1.1.4.0beta22,
uses assembler code tuned for Intel MMX platform)
makefile.nommx => Linux/ELF makefile
(gcc, creates libpng14.so.1.1.4.0beta21
(gcc, creates libpng14.so.1.1.4.0beta22
does not use Intel MMX assembler code)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
......@@ -125,12 +125,12 @@ include
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.sggcc => Silicon Graphics (gcc,
creates libpng14.so.1.1.4.0beta21)
creates libpng14.so.1.1.4.0beta22)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng14.so.1.1.4.0beta21)
creates libpng14.so.1.1.4.0beta22)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng14.so.1.1.4.0beta21)
creates libpng14.so.1.1.4.0beta22)
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
......
KNOWNBUG
浏览文件 @ d8d7b949
Known bugs in libpng version 1.4.0beta21
Known bugs in libpng version 1.4.0beta22
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
......
LICENSE
浏览文件 @ d8d7b949
......@@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
If you modify libpng you may insert additional notices immediately following
this sentence.
libpng versions 1.2.6, August 15, 2004, through 1.4.0beta21, July 21, 2008, are
libpng versions 1.2.6, August 15, 2004, through 1.4.0beta22, July 21, 2008, 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
......
README
浏览文件 @ d8d7b949
README for libpng version 1.4.0beta21 - July 21, 2008 (shared library 14.0)
README for libpng version 1.4.0beta22 - July 21, 2008 (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.
......@@ -184,11 +184,11 @@ Files in this distribution:
descrip.mms => VMS makefile for MMS or MMK
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng14.so.1.1.4.0beta21)
gcc, creates libpng14.so.1.1.4.0beta22)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng14.so.1.1.4.0beta21)
(gcc, creates libpng14.so.1.1.4.0beta22)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng14.so.1.1.4.0beta21,
(gcc, creates libpng14.so.1.1.4.0beta22,
uses assembler code tuned for Intel MMX platform)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
......@@ -210,12 +210,12 @@ 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.1.1.4.0beta21)
(gcc, creates libpng14.so.1.1.4.0beta22)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng14.so.1.1.4.0beta21)
(gcc, creates libpng14.so.1.1.4.0beta22)
makefile.so9 => Solaris 9 makefile
(gcc, creates libpng14.so.1.1.4.0beta21)
(gcc, creates libpng14.so.1.1.4.0beta22)
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
......
configure
浏览文件 @ d8d7b949
......@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.4.0beta21'
PACKAGE_STRING='libpng 1.4.0beta21'
PACKAGE_VERSION='1.4.0beta22'
PACKAGE_STRING='libpng 1.4.0beta22'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
......@@ -1404,7 +1404,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.0beta21 to adapt to many kinds of systems.
\`configure' configures libpng 1.4.0beta22 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1474,7 +1474,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.4.0beta21:";;
short | recursive ) echo "Configuration of libpng 1.4.0beta22:";;
esac
cat <<\_ACEOF
......@@ -1584,7 +1584,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.4.0beta21
libpng configure 1.4.0beta22
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -1598,7 +1598,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.0beta21, which was
It was created by libpng $as_me 1.4.0beta22, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
......@@ -2268,7 +2268,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.4.0beta21'
VERSION='1.4.0beta22'
cat >>confdefs.h <<_ACEOF
......@@ -2439,7 +2439,7 @@ fi
PNGLIB_VERSION=1.4.0beta21
PNGLIB_VERSION=1.4.0beta22
PNGLIB_MAJOR=14
PNGLIB_MINOR=0
......@@ -21119,7 +21119,7 @@ exec 6>&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.0beta21, which was
This file was extended by libpng $as_me 1.4.0beta22, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -21172,7 +21172,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
libpng config.status 1.4.0beta21
libpng config.status 1.4.0beta22
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
......
configure.ac
浏览文件 @ d8d7b949
......@@ -18,12 +18,12 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
AC_INIT([libpng], [1.4.0beta21], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.4.0beta22], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
PNGLIB_VERSION=1.4.0beta21
PNGLIB_VERSION=1.4.0beta22
PNGLIB_MAJOR=14
PNGLIB_MINOR=0
......
libpng-1.4.0beta21.txt → libpng-1.4.0beta22.txt
浏览文件 @ d8d7b949
libpng.txt - A description on how to use and modify libpng
libpng version 1.4.0beta21 - July 21, 2008
libpng version 1.4.0beta22 - July 21, 2008
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
......@@ -2923,7 +2923,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.0beta21 are Y2K compliant. It is my belief that earlier
upward through 1.4.0beta22 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
......
libpng.3
浏览文件 @ d8d7b949
.TH LIBPNG 3 "July 21, 2008"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta21
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta22
.SH SYNOPSIS
\fI\fB
......@@ -797,7 +797,7 @@ Following is a copy of the libpng.txt file that accompanies libpng.
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
libpng version 1.4.0beta21 - July 21, 2008
libpng version 1.4.0beta22 - July 21, 2008
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
......@@ -3720,7 +3720,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.0beta21 are Y2K compliant. It is my belief that earlier
upward through 1.4.0beta22 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
......@@ -3887,7 +3887,7 @@ the first widely used release:
1.2.12 13 10212 12.so.0.12[.0]
1.4.0beta9-14 14 10400 14.so.0.0[.0]
1.2.13 13 10213 12.so.0.13[.0]
1.4.0beta15-21 14 10400 14.so.0.0[.0]
1.4.0beta15-22 14 10400 14.so.0.0[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
......@@ -3943,7 +3943,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.4.0beta21 - July 21, 2008:
Libpng version 1.4.0beta22 - July 21, 2008:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
......@@ -3964,7 +3964,7 @@ included in the libpng distribution, the latter shall prevail.)
If you modify libpng you may insert additional notices immediately following
this sentence.
libpng versions 1.2.6, August 15, 2004, through 1.4.0beta21, July 21, 2008, are
libpng versions 1.2.6, August 15, 2004, through 1.4.0beta22, July 21, 2008, 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
......
libpngpf.3
浏览文件 @ d8d7b949
.TH LIBPNGPF 3 "July 21, 2008"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta21
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta22
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
......
png.c
浏览文件 @ d8d7b949
......@@ -13,7 +13,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_4_0beta21 Your_png_h_is_not_version_1_4_0beta21;
typedef version_1_4_0beta22 Your_png_h_is_not_version_1_4_0beta22;
/* Version information for C files. This had better match the version
* string defined in png.h. */
......@@ -638,7 +638,7 @@ png_charp PNGAPI
png_get_copyright(png_structp png_ptr)
{
png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */
return ((png_charp) "\n libpng version 1.4.0beta21 - July 21, 2008\n\
return ((png_charp) "\n libpng version 1.4.0beta22 - July 21, 2008\n\
Copyright (c) 1998-2008 Glenn Randers-Pehrson\n\
Copyright (c) 1996-1997 Andreas Dilger\n\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
......
png.h
浏览文件 @ d8d7b949
/* png.h - header file for PNG reference library
*
* libpng version 1.4.0beta21 - July 21, 2008
* libpng version 1.4.0beta22 - July 21, 2008
* Copyright (c) 1998-2008 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.)
......@@ -9,7 +9,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.0beta21 - July 21, 2008: Glenn
* libpng versions 0.97, January 1998, through 1.4.0beta22 - July 21, 2008: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
......@@ -126,7 +126,7 @@
* 1.2.12 13 10212 12.so.0.10[.0]
* 1.4.0beta9-14 14 10400 14.so.0.0[.0]
* 1.2.13 13 10213 12.so.0.10[.0]
* 1.4.0beta15-21 14 10400 14.so.0.0[.0]
* 1.4.0beta15-22 14 10400 14.so.0.0[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
......@@ -156,7 +156,7 @@
* If you modify libpng you may insert additional notices immediately following
* this sentence.
*
* libpng versions 1.2.6, August 15, 2004, through 1.4.0beta21, July 21, 2008, are
* libpng versions 1.2.6, August 15, 2004, through 1.4.0beta22, July 21, 2008, 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:
......@@ -274,7 +274,7 @@
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
* upward through 1.4.0beta21 are Y2K compliant. It is my belief that earlier
* upward through 1.4.0beta22 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
......@@ -330,9 +330,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.4.0beta21"
#define PNG_LIBPNG_VER_STRING "1.4.0beta22"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.4.0beta21 - July 21, 2008\n"
" libpng version 1.4.0beta22 - July 21, 2008\n"
#define PNG_LIBPNG_VER_SONUM 1
#define PNG_LIBPNG_VER_DLLNUM 14
......@@ -344,7 +344,7 @@
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero: */
#define PNG_LIBPNG_VER_BUILD 21
#define PNG_LIBPNG_VER_BUILD 22
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
......@@ -1347,7 +1347,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_0beta21;
typedef png_structp version_1_4_0beta22;
typedef png_struct FAR * FAR * png_structpp;
......
pngpriv.h
浏览文件 @ d8d7b949
/* pngpriv.h - private declarations for use inside libpng
*
* libpng version 1.4.0beta21 - July 21, 2008
* libpng version 1.4.0beta22 - July 21, 2008
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
pngrutil.c
浏览文件 @ d8d7b949
......@@ -1590,7 +1590,6 @@ png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
void /* PRIVATE */
png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
{
png_charp purpose;
png_int_32 X0, X1;
png_byte type, nparams;
png_charp buf, units, endptr;
......@@ -1617,35 +1616,38 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
png_debug1(2, "Allocating and reading pCAL chunk data (%lu bytes)\n",
length + 1);
purpose = (png_charp)png_malloc_warn(png_ptr, length + 1);
if (purpose == NULL)
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
if (png_ptr->chunkdata == NULL)
{
png_warning(png_ptr, "No memory for pCAL purpose");
return;
}
slength = (png_size_t)length;
png_crc_read(png_ptr, (png_bytep)purpose, slength);
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
if (png_crc_finish(png_ptr, 0))
{
png_free(png_ptr, purpose);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
return;
}
purpose[slength] = 0x00; /* null terminate the last string */
png_ptr->chunkdata[slength] = 0x00; /* null terminate the last string */
png_debug(3, "Finding end of pCAL purpose string\n");
for (buf = purpose; *buf; buf++)
for (buf = png_ptr->chunkdata; *buf; buf++)
/* empty loop */ ;
endptr = purpose + slength;
endptr = png_ptr->chunkdata + slength;
/* We need to have at least 12 bytes after the purpose string
in order to get the parameter information. */
if (endptr <= buf + 12)
{
png_warning(png_ptr, "Invalid pCAL data");
png_free(png_ptr, purpose);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
return;
}
......@@ -1665,7 +1667,8 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
(type == PNG_EQUATION_HYPERBOLIC && nparams != 4))
{
png_warning(png_ptr, "Invalid pCAL parameters for equation type");
png_free(png_ptr, purpose);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
return;
}
else if (type >= PNG_EQUATION_LAST)
......@@ -1681,7 +1684,8 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
(png_size_t)(nparams * png_sizeof(png_charp)));
if (params == NULL)
{
png_free(png_ptr, purpose);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
png_warning(png_ptr, "No memory for pCAL params");
return;
}
......@@ -1699,16 +1703,18 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
if (buf > endptr)
{
png_warning(png_ptr, "Invalid pCAL data");
png_free(png_ptr, purpose);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
png_free(png_ptr, params);
return;
}
}
png_set_pCAL(png_ptr, info_ptr, purpose, X0, X1, type, nparams,
png_set_pCAL(png_ptr, info_ptr, png_ptr->chunkdata, X0, X1, type, nparams,
units, params);
png_free(png_ptr, purpose);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
png_free(png_ptr, params);
}
#endif
......@@ -1718,7 +1724,7 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
void /* PRIVATE */
png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
{
png_charp buffer, ep;
png_charp ep;
#ifdef PNG_FLOATING_POINT_SUPPORTED
double width, height;
png_charp vp;
......@@ -1748,24 +1754,25 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
png_debug1(2, "Allocating and reading sCAL chunk data (%lu bytes)\n",
length + 1);
buffer = (png_charp)png_malloc_warn(png_ptr, length + 1);
if (buffer == NULL)
png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
if (png_ptr->chunkdata == NULL)
{
png_warning(png_ptr, "Out of memory while processing sCAL chunk");
return;
}
slength = (png_size_t)length;
png_crc_read(png_ptr, (png_bytep)buffer, slength);
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
if (png_crc_finish(png_ptr, 0))
{
png_free(png_ptr, buffer);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
return;
}
buffer[slength] = 0x00; /* null terminate the last string */
png_ptr->chunkdata[slength] = 0x00; /* null terminate the last string */
ep = buffer + 1; /* skip unit byte */
ep = png_ptr->chunkdata + 1; /* skip unit byte */
#ifdef PNG_FLOATING_POINT_SUPPORTED
width = png_strtod(png_ptr, ep, &vp);
......@@ -1786,18 +1793,19 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
#endif
#endif
for (ep = buffer; *ep; ep++)
for (ep = png_ptr->chunkdata; *ep; ep++)
/* empty loop */ ;
ep++;
if (buffer + slength < ep)
if (png_ptr->chunkdata + slength < ep)
{
png_warning(png_ptr, "Truncated sCAL chunk");
#if defined(PNG_FIXED_POINT_SUPPORTED) && \
!defined(PNG_FLOATING_POINT_SUPPORTED)
png_free(png_ptr, swidth);
#endif
png_free(png_ptr, buffer);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
return;
}
......@@ -1820,14 +1828,15 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
#endif
#endif
if (buffer + slength < ep
if (png_ptr->chunkdata + slength < ep
#ifdef PNG_FLOATING_POINT_SUPPORTED
|| width <= 0. || height <= 0.
#endif
)
{
png_warning(png_ptr, "Invalid sCAL data");
png_free(png_ptr, buffer);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
png_free(png_ptr, swidth);
png_free(png_ptr, sheight);
......@@ -1837,14 +1846,15 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
#ifdef PNG_FLOATING_POINT_SUPPORTED
png_set_sCAL(png_ptr, info_ptr, buffer[0], width, height);
png_set_sCAL(png_ptr, info_ptr, png_ptr->chunkdata[0], width, height);
#else
#ifdef PNG_FIXED_POINT_SUPPORTED
png_set_sCAL_s(png_ptr, info_ptr, buffer[0], swidth, sheight);
png_set_sCAL_s(png_ptr, info_ptr, png_ptr->chunkdata[0], swidth, sheight);
#endif
#endif
png_free(png_ptr, buffer);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
png_free(png_ptr, swidth);
png_free(png_ptr, sheight);
......
pngtest.c
浏览文件 @ d8d7b949
......@@ -1612,4 +1612,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_0beta21 your_png_h_is_not_version_1_4_0beta21;
typedef version_1_4_0beta22 your_png_h_is_not_version_1_4_0beta22;
scripts/CMakeLists.txt
浏览文件 @ d8d7b949
......@@ -178,7 +178,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in
# SET UP LINKS
set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 0.${PNGLIB_RELEASE}.1.4.0beta21
# VERSION 0.${PNGLIB_RELEASE}.1.4.0beta22
VERSION 0.${PNGLIB_RELEASE}.0
SOVERSION 0
CLEAN_DIRECT_OUTPUT 1)
......
scripts/libpng-config-head.in
浏览文件 @ d8d7b949
......@@ -8,7 +8,7 @@
# Modeled after libxml-config.
version=1.4.0beta21
version=1.4.0beta22
prefix=""
libdir=""
libs=""
......
scripts/libpng.pc.in
浏览文件 @ d8d7b949
......@@ -5,6 +5,6 @@ includedir=@includedir@/libpng14
Name: libpng
Description: Loads and saves PNG files
Version: 1.4.0beta21
Version: 1.4.0beta22
Libs: -L${libdir} -lpng14
Cflags: -I${includedir}
scripts/makefile.32sunu
浏览文件 @ d8d7b949
......@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
scripts/makefile.64sunu
浏览文件 @ d8d7b949
......@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
scripts/makefile.aix
浏览文件 @ d8d7b949
......@@ -20,7 +20,7 @@ LN_SF = ln -f -s
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
......
scripts/makefile.beos
浏览文件 @ d8d7b949
......@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
scripts/makefile.cygwin
浏览文件 @ d8d7b949
......@@ -65,7 +65,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng14
PNGMAJ = 1
CYGDLL = 14
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
......
scripts/makefile.darwin
浏览文件 @ d8d7b949
......@@ -19,7 +19,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
scripts/makefile.dec
浏览文件 @ d8d7b949
......@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14
......
scripts/makefile.elf
浏览文件 @ d8d7b949
......@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
scripts/makefile.gcmmx
浏览文件 @ d8d7b949
......@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
scripts/makefile.hp64
浏览文件 @ d8d7b949
......@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
scripts/makefile.hpgcc
浏览文件 @ d8d7b949
......@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
scripts/makefile.hpux
浏览文件 @ d8d7b949
......@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
scripts/makefile.linux
浏览文件 @ d8d7b949
......@@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
scripts/makefile.mingw
浏览文件 @ d8d7b949
......@@ -81,7 +81,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng14
PNGMAJ = 1
MINGDLL = 14
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
......
scripts/makefile.ne12bsd
浏览文件 @ d8d7b949
......@@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng14
LIB= png14
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.4.0beta21
SHLIB_MINOR= 1.4.0beta22
SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
......
scripts/makefile.netbsd
浏览文件 @ d8d7b949
......@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng
LIB= png
SHLIB_MAJOR= 3
SHLIB_MINOR= 1.4.0beta21
SHLIB_MINOR= 1.4.0beta22
SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
......
scripts/makefile.nommx
浏览文件 @ d8d7b949
......@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
scripts/makefile.openbsd
浏览文件 @ d8d7b949
......@@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.4.0beta21
SHLIB_MINOR= 1.4.0beta22
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
......
scripts/makefile.sco
浏览文件 @ d8d7b949
......@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
scripts/makefile.sggcc
浏览文件 @ d8d7b949
......@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
scripts/makefile.sgi
浏览文件 @ d8d7b949
......@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
scripts/makefile.so9
浏览文件 @ d8d7b949
......@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14
......
scripts/makefile.solaris
浏览文件 @ d8d7b949
......@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta21
PNGMIN = 1.4.0beta22
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
scripts/pngos2.def
浏览文件 @ d8d7b949
......@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
; Version 1.4.0beta21
; Version 1.4.0beta22
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
......
scripts/pngwin.def
浏览文件 @ d8d7b949
......@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.4.0beta21
;Version 1.4.0beta22
png_build_grayscale_palette
png_chunk_error
png_chunk_warning
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或