提交 b3ff9685 编写于 作者: G Glenn Randers-Pehrson

Imported from libpng-1.4.0beta21.tar

上级 145f5c81
Libpng 1.4.0beta20 - July 10, 2008
Libpng 1.4.0beta21 - 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.0beta20.tar.gz
1.4.0beta20.tar.bz2
1.4.0beta21.tar.gz
1.4.0beta21.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
1.4.0beta20-no-config.tar.gz
1.4.0beta20-no-config.tar.bz2
1.4.0beta21-no-config.tar.gz
1.4.0beta21-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lp140b20.zip
lp140b20.tar.bz2
lp140b21.zip
lp140b21.tar.bz2
Other information:
1.4.0beta20-README.txt
1.4.0beta20-KNOWNBUGS.txt
1.4.0beta20-LICENSE.txt
1.4.0beta20-Y2K-compliance.txt
1.4.0beta21-README.txt
1.4.0beta21-KNOWNBUGS.txt
1.4.0beta21-LICENSE.txt
1.4.0beta21-Y2K-compliance.txt
Changes since the last public release (1.2.10):
......@@ -241,7 +241,7 @@ version 1.4.0beta19 [May 16, 2007]
Added "png_ptr->num_trans=0" before error return in png_handle_tRNS,
to eliminate a vulnerability (CVE-2007-2554, CERT VU#684664)
version 1.4.0beta20 [July 10, 2008]
version 1.4.0beta20 [July 9, 2008]
Moved several PNG_HAVE_* macros from pngpriv.h to png.h because applications
calling set_unknown_chunk_location() need them.
Moved several macro definitions from pngpriv.h to pngconf.h
......@@ -252,6 +252,10 @@ version 1.4.0beta20 [July 10, 2008]
Revised makefile.mingw
Prefer PNG_USE_PNGVCRD when _MSC_VER is defined in pngconf.h
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.0betaN [future]
Build shared libraries with -lz and sometimes -lm.
Revised pngvcrd.c for improved efficiency.
......
......@@ -1917,13 +1917,17 @@ version 1.4.0beta19 [May 16, 2007]
Added conditional #undef jmpbuf in pngtest.c to undo #define in AIX headers.
Added scripts/makefile.nommx
version 1.4.0beta20 [July 10, 2008]
version 1.4.0beta20 [July 9, 2008]
Moved several PNG_HAVE_* macros from pngpriv.h to png.h because applications
calling set_unknown_chunk_location() need them.
Moved several macro definitions from pngpriv.h to pngconf.h
Merge with changes to the 1.2.X branch, as of 1.2.19beta10.
Merge with changes to the 1.2.X branch, as of 1.2.30beta04.
Deleted all use of the MMX assembler code and Intel-licensed optimizations.
Revised makefile.mingw
Prefer PNG_USE_PNGVCRD when _MSC_VER is defined in pngconf.h
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.0betaN [future]
Build shared libraries with -lz and sometimes -lm.
......
Installing libpng version 1.4.0beta20 - July 10, 2008
Installing libpng version 1.4.0beta21 - 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.0beta20" or "lpng109" and "zlib-1.2.1"
might be called "libpng-1.4.0beta21" 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.0beta20)
gcc, creates libpng14.so.1.1.4.0beta21)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng14.so.1.1.4.0beta20)
(gcc, creates libpng14.so.1.1.4.0beta21)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng14.so.1.1.4.0beta20,
(gcc, creates libpng14.so.1.1.4.0beta21,
uses assembler code tuned for Intel MMX platform)
makefile.nommx => Linux/ELF makefile
(gcc, creates libpng14.so.1.1.4.0beta20
(gcc, creates libpng14.so.1.1.4.0beta21
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.0beta20)
creates libpng14.so.1.1.4.0beta21)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng14.so.1.1.4.0beta20)
creates libpng14.so.1.1.4.0beta21)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng14.so.1.1.4.0beta20)
creates libpng14.so.1.1.4.0beta21)
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
......
Known bugs in libpng version 1.4.0beta20
Known bugs in libpng version 1.4.0beta21
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
......
......@@ -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.0beta20, July 10, 2008, are
libpng versions 1.2.6, August 15, 2004, through 1.4.0beta21, 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
......@@ -106,4 +106,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
July 10, 2008
July 21, 2008
README for libpng version 1.4.0beta20 - July 10, 2008 (shared library 14.0)
README for libpng version 1.4.0beta21 - 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.0beta20)
gcc, creates libpng14.so.1.1.4.0beta21)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng14.so.1.1.4.0beta20)
(gcc, creates libpng14.so.1.1.4.0beta21)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng14.so.1.1.4.0beta20,
(gcc, creates libpng14.so.1.1.4.0beta21,
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.0beta20)
(gcc, creates libpng14.so.1.1.4.0beta21)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng14.so.1.1.4.0beta20)
(gcc, creates libpng14.so.1.1.4.0beta21)
makefile.so9 => Solaris 9 makefile
(gcc, creates libpng14.so.1.1.4.0beta20)
(gcc, creates libpng14.so.1.1.4.0beta21)
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
......
......@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.4.0beta20'
PACKAGE_STRING='libpng 1.4.0beta20'
PACKAGE_VERSION='1.4.0beta21'
PACKAGE_STRING='libpng 1.4.0beta21'
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.0beta20 to adapt to many kinds of systems.
\`configure' configures libpng 1.4.0beta21 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.0beta20:";;
short | recursive ) echo "Configuration of libpng 1.4.0beta21:";;
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.0beta20
libpng configure 1.4.0beta21
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.0beta20, which was
It was created by libpng $as_me 1.4.0beta21, 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.0beta20'
VERSION='1.4.0beta21'
cat >>confdefs.h <<_ACEOF
......@@ -2439,7 +2439,7 @@ fi
PNGLIB_VERSION=1.4.0beta20
PNGLIB_VERSION=1.4.0beta21
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.0beta20, which was
This file was extended by libpng $as_me 1.4.0beta21, 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.0beta20
libpng config.status 1.4.0beta21
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
......
......@@ -18,12 +18,12 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
AC_INIT([libpng], [1.4.0beta20], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.4.0beta21], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
PNGLIB_VERSION=1.4.0beta20
PNGLIB_VERSION=1.4.0beta21
PNGLIB_MAJOR=14
PNGLIB_MINOR=0
......
......@@ -2,7 +2,7 @@
#if 0 /* in case someone actually tries to compile this */
/* example.c - an example of using libpng
* Last changed in libpng 1.4.0 [July 10, 2008]
* Last changed in libpng 1.4.0 [July 21, 2008]
* This file has been placed in the public domain by the authors.
* Maintained 1998-2008 Glenn Randers-Pehrson
* Maintained 1996, 1997 Andreas Dilger)
......
libpng.txt - A description on how to use and modify libpng
libpng version 1.4.0beta20 - July 10, 2008
libpng version 1.4.0beta21 - July 21, 2008
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
......@@ -2917,13 +2917,13 @@ application:
IX. Y2K Compliance in libpng
July 10, 2008
July 21, 2008
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.0beta20 are Y2K compliant. It is my belief that earlier
upward through 1.4.0beta21 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
......
.TH LIBPNG 3 "July 10, 2008"
.TH LIBPNG 3 "July 21, 2008"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta20
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta21
.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.0beta20 - July 10, 2008
libpng version 1.4.0beta21 - July 21, 2008
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
......@@ -3714,13 +3714,13 @@ application:
.SH IX. Y2K Compliance in libpng
July 10, 2008
July 21, 2008
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.0beta20 are Y2K compliant. It is my belief that earlier
upward through 1.4.0beta21 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-20 14 10400 14.so.0.0[.0]
1.4.0beta15-21 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.0beta20 - July 10, 2008:
Libpng version 1.4.0beta21 - 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.0beta20, July 10, 2008, are
libpng versions 1.2.6, August 15, 2004, through 1.4.0beta21, 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
......@@ -4063,7 +4063,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
July 10, 2008
July 21, 2008
.\" end of man page
.TH LIBPNGPF 3 "July 10, 2008"
.TH LIBPNGPF 3 "July 21, 2008"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta20
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta21
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
......
.TH PNG 5 "July 10, 2008"
.TH PNG 5 "July 21, 2008"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
......
/* png.c - location for general purpose libpng functions
*
* Last changed in libpng 1.2.30 [July 10, 2008]
* Last changed in libpng 1.2.30 [July 21, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......@@ -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_0beta20 Your_png_h_is_not_version_1_4_0beta20;
typedef version_1_4_0beta21 Your_png_h_is_not_version_1_4_0beta21;
/* 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.0beta20 - July 10, 2008\n\
return ((png_charp) "\n libpng version 1.4.0beta21 - 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 - header file for PNG reference library
*
* libpng version 1.4.0beta20 - July 10, 2008
* libpng version 1.4.0beta21 - 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.0beta20 - July 1, 2008: Glenn
* libpng versions 0.97, January 1998, through 1.4.0beta21 - 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-20 14 10400 14.so.0.0[.0]
* 1.4.0beta15-21 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.0beta20, July 1, 2008, are
* libpng versions 1.2.6, August 15, 2004, through 1.4.0beta21, 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.0beta20 are Y2K compliant. It is my belief that earlier
* upward through 1.4.0beta21 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.0beta20"
#define PNG_LIBPNG_VER_STRING "1.4.0beta21"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.4.0beta20 - July 1, 2008 (header)\n"
" libpng version 1.4.0beta21 - July 21, 2008\n"
#define PNG_LIBPNG_VER_SONUM 1
#define PNG_LIBPNG_VER_DLLNUM 14
......@@ -1325,14 +1325,19 @@ struct png_struct_def
png_uint_32 user_height_max;
#endif
/* New members added in libpng-1.2.26 */
png_uint_32 old_big_row_buf_size, old_prev_row_size;
/* New members added in libpng-1.4.0 */
/* New member added in libpng-1.0.25 and 1.2.17 */
#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
/* storage for unknown chunk that the library doesn't recognize. */
png_unknown_chunk unknown_chunk;
#endif
/* New members added in libpng-1.2.26 */
png_uint_32 old_big_row_buf_size, old_prev_row_size;
/* New member added in libpng-1.2.30 */
png_charp chunkdata; /* buffer for reading chunk data */
/* New member added in libpng-1.4.0 */
#ifdef PNG_IO_STATE_SUPPORTED
png_uint_32 io_state;
#endif
......@@ -1342,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_0beta20;
typedef png_structp version_1_4_0beta21;
typedef png_struct FAR * FAR * png_structpp;
......
/* pngerror.c - stub functions for i/o and memory allocation
*
* Last changed in libpng 1.4.0 [July 10, 2008]
* Last changed in libpng 1.4.0 [July 21, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
/* pngget.c - retrieval of values from info struct
*
* Last changed in libpng 1.40. [July 10, 2008]
* Last changed in libpng 1.40. [July 21, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
/* pngmem.c - stub functions for memory allocation
*
* Last changed in libpng 1.4.0 [July 10, 2008]
* Last changed in libpng 1.4.0 [July 21, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
/* pngpread.c - read a png file in push mode
*
* Last changed in libpng 1.4.0 [July 10, 2008]
* Last changed in libpng 1.4.0 [July 21, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
/* pngpriv.h - private declarations for use inside libpng
*
* libpng version 1.4.0beta20 - July 10, 2008
* libpng version 1.4.0beta21 - 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)
......
/* pngread.c - read a PNG file
*
* Last changed in libpng 1.4.0 [July 10, 2008]
* Last changed in libpng 1.4.0 [July 21, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......@@ -1116,6 +1116,7 @@ png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr
png_free(png_ptr, png_ptr->zbuf);
png_free(png_ptr, png_ptr->big_row_buf);
png_free(png_ptr, png_ptr->prev_row);
png_free(png_ptr, png_ptr->chunkdata);
#if defined(PNG_READ_DITHER_SUPPORTED)
png_free(png_ptr, png_ptr->palette_lookup);
png_free(png_ptr, png_ptr->dither_index);
......
/* pngrio.c - functions for data input
*
* Last changed in libpng 1.4.0 [July 10, 2008]
* Last changed in libpng 1.4.0 [July 21, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
/* pngrtran.c - transforms the data in a row for PNG readers
*
* Last changed in libpng 1.4.0 [July 10, 2008]
* Last changed in libpng 1.4.0 [July 21, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
/* pngrutil.c - utilities to read a PNG file
*
* Last changed in libpng 1.4.0 [July 10, 2008]
* Last changed in libpng 1.4.0 [July 21, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......@@ -246,6 +246,7 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
if (text == NULL)
{
png_free(png_ptr, chunkdata);
chunkdata = NULL;
png_error(png_ptr, "Not enough memory to decompress chunk");
}
png_memcpy(text, chunkdata, prefix_size);
......@@ -270,6 +271,7 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
if (text == NULL)
{
png_free(png_ptr, chunkdata);
chunkdata = NULL;
png_error(png_ptr,
"Not enough memory to decompress chunk");
}
......@@ -290,6 +292,7 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
{
png_free(png_ptr, tmp);
png_free(png_ptr, chunkdata);
chunkdata = NULL;
png_error(png_ptr,
"Not enough memory to decompress chunk");
}
......@@ -338,6 +341,7 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
if (text == NULL)
{
png_free(png_ptr, chunkdata);
chunkdata = NULL;
png_error(png_ptr, "Not enough memory for text");
}
png_memcpy(text, chunkdata, prefix_size);
......@@ -999,7 +1003,6 @@ void /* PRIVATE */
png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
/* Note: this does not properly handle chunks that are > 64K under DOS */
{
png_charp chunkdata;
png_byte compression_type;
png_bytep pC;
png_charp profile;
......@@ -1037,28 +1040,31 @@ png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
}
#endif
chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
slength = (png_size_t)length;
png_crc_read(png_ptr, (png_bytep)chunkdata, slength);
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
if (png_crc_finish(png_ptr, skip))
{
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
return;
}
chunkdata[slength] = 0x00;
png_ptr->chunkdata[slength] = 0x00;
for (profile = chunkdata; *profile; profile++)
for (profile = png_ptr->chunkdata; *profile; profile++)
/* empty loop to find end of name */ ;
++profile;
/* there should be at least one zero (the compression type byte)
following the separator, and we should be on it */
if ( profile >= chunkdata + slength - 1)
if ( profile >= png_ptr->chunkdata + slength - 1)
{
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
png_warning(png_ptr, "Malformed iCCP chunk");
return;
}
......@@ -1072,21 +1078,22 @@ png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
wrote nonzero) */
}
prefix_length = profile - chunkdata;
chunkdata = png_decompress_chunk(png_ptr, compression_type, chunkdata,
slength, prefix_length, &data_length);
prefix_length = profile - png_ptr->chunkdata;
png_ptr->chunkdata = png_decompress_chunk(png_ptr, compression_type,
png_ptr->chunkdata, slength, prefix_length, &data_length);
profile_length = data_length - prefix_length;
if ( prefix_length > data_length || profile_length < 4)
{
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
png_warning(png_ptr, "Profile size field missing from iCCP chunk");
return;
}
/* Check the profile_size recorded in the first 32 bits of the ICC profile */
pC = (png_bytep)(chunkdata + prefix_length);
pC = (png_bytep)(png_ptr->chunkdata + prefix_length);
profile_size = ((*(pC ))<<24) |
((*(pC + 1))<<16) |
((*(pC + 2))<< 8) |
......@@ -1097,14 +1104,16 @@ png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
if (profile_size > profile_length)
{
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
png_warning(png_ptr, "Ignoring truncated iCCP profile");
return;
}
png_set_iCCP(png_ptr, info_ptr, chunkdata, compression_type,
chunkdata + prefix_length, profile_length);
png_free(png_ptr, chunkdata);
png_set_iCCP(png_ptr, info_ptr, png_ptr->chunkdata,
compression_type, png_ptr->chunkdata + prefix_length, profile_length);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
}
#endif /* PNG_READ_iCCP_SUPPORTED */
......@@ -1113,7 +1122,6 @@ void /* PRIVATE */
png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
/* Note: this does not properly handle chunks that are > 64K under DOS */
{
png_bytep chunkdata;
png_bytep entry_start;
png_sPLT_t new_palette;
#ifdef PNG_NO_POINTER_INDEXING
......@@ -1143,38 +1151,42 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
}
#endif
chunkdata = (png_bytep)png_malloc(png_ptr, length + 1);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
slength = (png_size_t)length;
png_crc_read(png_ptr, (png_bytep)chunkdata, slength);
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
if (png_crc_finish(png_ptr, skip))
{
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
return;
}
chunkdata[slength] = 0x00;
png_ptr->chunkdata[slength] = 0x00;
for (entry_start = chunkdata; *entry_start; entry_start++)
for (entry_start = (png_bytep)png_ptr->chunkdata; *entry_start; entry_start++)
/* empty loop to find end of name */ ;
++entry_start;
/* a sample depth should follow the separator, and we should be on it */
if (entry_start > chunkdata + slength - 2)
if (entry_start > (png_bytep)png_ptr->chunkdata + slength - 2)
{
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
png_warning(png_ptr, "malformed sPLT chunk");
return;
}
new_palette.depth = *entry_start++;
entry_size = (new_palette.depth == 8 ? 6 : 10);
data_length = (slength - (entry_start - chunkdata));
data_length = (slength - (entry_start - (png_bytep)png_ptr->chunkdata));
/* integrity-check the data length */
if (data_length % entry_size)
{
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
png_warning(png_ptr, "sPLT chunk has bad length");
return;
}
......@@ -1239,11 +1251,12 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
#endif
/* discard all chunk data except the name and stash that */
new_palette.name = (png_charp)chunkdata;
new_palette.name = png_ptr->chunkdata;
png_set_sPLT(png_ptr, info_ptr, &new_palette, 1);
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
png_free(png_ptr, new_palette.entries);
}
#endif /* PNG_READ_sPLT_SUPPORTED */
......@@ -1967,7 +1980,6 @@ void /* PRIVATE */
png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
{
png_textp text_ptr;
png_charp chunkdata;
png_charp text;
int comp_type;
int ret;
......@@ -1991,30 +2003,33 @@ png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
}
#endif
chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
if (chunkdata == 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, "Out of memory processing zTXt chunk");
return;
}
slength = (png_size_t)length;
png_crc_read(png_ptr, (png_bytep)chunkdata, slength);
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
if (png_crc_finish(png_ptr, 0))
{
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
return;
}
chunkdata[slength] = 0x00;
png_ptr->chunkdata[slength] = 0x00;
for (text = chunkdata; *text; text++)
for (text = png_ptr->chunkdata; *text; text++)
/* empty loop */ ;
/* zTXt must have some text after the chunkdataword */
if (text >= chunkdata + slength - 2)
if (text >= png_ptr->chunkdata + slength - 2)
{
png_warning(png_ptr, "Truncated zTXt chunk");
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
return;
}
else
......@@ -2027,33 +2042,35 @@ png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
}
text++; /* skip the compression_method byte */
}
prefix_len = text - chunkdata;
prefix_len = text - png_ptr->chunkdata;
chunkdata = (png_charp)png_decompress_chunk(png_ptr, comp_type, chunkdata,
(png_size_t)length, prefix_len, &data_len);
png_ptr->chunkdata = (png_charp)png_decompress_chunk(png_ptr, comp_type,
png_ptr->chunkdata, (png_size_t)length, prefix_len, &data_len);
text_ptr = (png_textp)png_malloc_warn(png_ptr,
png_sizeof(png_text));
if (text_ptr == NULL)
{
png_warning(png_ptr, "Not enough memory to process zTXt chunk");
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
return;
}
text_ptr->compression = comp_type;
text_ptr->key = chunkdata;
text_ptr->key = png_ptr->chunkdata;
#ifdef PNG_iTXt_SUPPORTED
text_ptr->lang = NULL;
text_ptr->lang_key = NULL;
text_ptr->itxt_length = 0;
#endif
text_ptr->text = chunkdata + prefix_len;
text_ptr->text = png_ptr->chunkdata + prefix_len;
text_ptr->text_length = data_len;
ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
png_free(png_ptr, text_ptr);
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
if (ret)
png_error(png_ptr, "Insufficient memory to store zTXt chunk");
}
......@@ -2065,7 +2082,6 @@ void /* PRIVATE */
png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
{
png_textp text_ptr;
png_charp chunkdata;
png_charp key, lang, text, lang_key;
int comp_flag;
int comp_type = 0;
......@@ -2091,23 +2107,25 @@ png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
}
#endif
chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
if (chunkdata == 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 to process iTXt chunk");
return;
}
slength = (png_size_t)length;
png_crc_read(png_ptr, (png_bytep)chunkdata, slength);
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
if (png_crc_finish(png_ptr, 0))
{
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
return;
}
chunkdata[slength] = 0x00;
png_ptr->chunkdata[slength] = 0x00;
for (lang = chunkdata; *lang; lang++)
for (lang = png_ptr->chunkdata; *lang; lang++)
/* empty loop */ ;
lang++; /* skip NUL separator */
......@@ -2115,10 +2133,11 @@ png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
translated keyword (possibly empty), and possibly some text after the
keyword */
if (lang >= chunkdata + slength - 3)
if (lang >= png_ptr->chunkdata + slength - 3)
{
png_warning(png_ptr, "Truncated iTXt chunk");
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
return;
}
else
......@@ -2131,51 +2150,55 @@ png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
/* empty loop */ ;
lang_key++; /* skip NUL separator */
if (lang_key >= chunkdata + slength)
if (lang_key >= png_ptr->chunkdata + slength)
{
png_warning(png_ptr, "Truncated iTXt chunk");
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
return;
}
for (text = lang_key; *text; text++)
/* empty loop */ ;
text++; /* skip NUL separator */
if (text >= chunkdata + slength)
if (text >= png_ptr->chunkdata + slength)
{
png_warning(png_ptr, "Malformed iTXt chunk");
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
return;
}
prefix_len = text - chunkdata;
prefix_len = text - png_ptr->chunkdata;
key=chunkdata;
key=png_ptr->chunkdata;
if (comp_flag)
chunkdata = png_decompress_chunk(png_ptr, comp_type, chunkdata,
(size_t)length, prefix_len, &data_len);
png_ptr->chunkdata = png_decompress_chunk(png_ptr, comp_type,
png_ptr->chunkdata, (size_t)length, prefix_len, &data_len);
else
data_len = png_strlen(chunkdata + prefix_len);
data_len = png_strlen(png_ptr->chunkdata + prefix_len);
text_ptr = (png_textp)png_malloc_warn(png_ptr,
png_sizeof(png_text));
if (text_ptr == NULL)
{
png_warning(png_ptr, "Not enough memory to process iTXt chunk");
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
return;
}
text_ptr->compression = (int)comp_flag + 1;
text_ptr->lang_key = chunkdata + (lang_key - key);
text_ptr->lang = chunkdata + (lang - key);
text_ptr->lang_key = png_ptr->chunkdata + (lang_key - key);
text_ptr->lang = png_ptr->chunkdata + (lang - key);
text_ptr->itxt_length = data_len;
text_ptr->text_length = 0;
text_ptr->key = chunkdata;
text_ptr->text = chunkdata + prefix_len;
text_ptr->key = png_ptr->chunkdata;
text_ptr->text = png_ptr->chunkdata + prefix_len;
ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
png_free(png_ptr, text_ptr);
png_free(png_ptr, chunkdata);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
if (ret)
png_error(png_ptr, "Insufficient memory to store iTXt chunk");
}
......
/* pngset.c - storage of image information into info struct
*
* Last changed in libpng 1.4.0 [July 10, 2008]
* Last changed in libpng 1.4.0 [July 21, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
/* pngtest.c - a simple test program to test libpng
*
* Last changed in libpng 1.4.0 [July 10, 2008]
* Last changed in libpng 1.4.0 [July 21, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......@@ -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_0beta20 your_png_h_is_not_version_1_4_0beta20;
typedef version_1_4_0beta21 your_png_h_is_not_version_1_4_0beta21;
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
*
* Last changed in libpng 1.4.0 [July 10, 2008]
* Last changed in libpng 1.4.0 [July 21, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
/* pngwio.c - functions for data output
*
* Last changed in libpng 1.4.0 [July 10, 2008]
* Last changed in libpng 1.4.0 [July 21, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
/* pngwrite.c - general routines to write a PNG file
*
* Last changed in libpng 1.4.0 [July 10, 2008]
* Last changed in libpng 1.4.0 [July 21, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
/* pngwtran.c - transforms the data in a row for PNG writers
*
* Last changed in libpng 1.4.0 [July 10, 2008]
* Last changed in libpng 1.4.0 [July 21, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
/* pngwutil.c - utilities to write a PNG file
*
* Last changed in libpng 1.4.0 [July 10, 2008]
* Last changed in libpng 1.4.0 [July 21, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
......@@ -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.0beta20
# VERSION 0.${PNGLIB_RELEASE}.1.4.0beta21
VERSION 0.${PNGLIB_RELEASE}.0
SOVERSION 0
CLEAN_DIRECT_OUTPUT 1)
......
......@@ -8,7 +8,7 @@
# Modeled after libxml-config.
version=1.4.0beta20
version=1.4.0beta21
prefix=""
libdir=""
libs=""
......
......@@ -5,6 +5,6 @@ includedir=@includedir@/libpng14
Name: libpng
Description: Loads and saves PNG files
Version: 1.4.0beta20
Version: 1.4.0beta21
Libs: -L${libdir} -lpng14
Cflags: -I${includedir}
......@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -20,7 +20,7 @@ LN_SF = ln -f -s
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
......
......@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -65,7 +65,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng14
PNGMAJ = 1
CYGDLL = 14
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
......
......@@ -19,7 +19,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14
......
......@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -81,7 +81,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng14
PNGMAJ = 1
MINGDLL = 14
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
......
......@@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng14
LIB= png14
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.4.0beta20
SHLIB_MINOR= 1.4.0beta21
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
......
......@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng
LIB= png
SHLIB_MAJOR= 3
SHLIB_MINOR= 1.4.0beta20
SHLIB_MINOR= 1.4.0beta21
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
......
......@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.4.0beta20
SHLIB_MINOR= 1.4.0beta21
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
......
......@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14
......
......@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta20
PNGMIN = 1.4.0beta21
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
; Version 1.4.0beta20
; Version 1.4.0beta21
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
......
......@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.4.0beta20
;Version 1.4.0beta21
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.
先完成此消息的编辑!
想要评论请 注册