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

Imported from libpng-1.4.0beta26.tar

上级 eb580913
Libpng 1.4.0beta25 - July 30, 2008
Libpng 1.4.0beta26 - August 4, 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.0beta25.tar.gz
1.4.0beta25.tar.bz2
1.4.0beta26.tar.gz
1.4.0beta26.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
1.4.0beta25-no-config.tar.gz
1.4.0beta25-no-config.tar.bz2
1.4.0beta26-no-config.tar.gz
1.4.0beta26-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lp140b25.zip
lp140b25.tar.bz2
lp140b26.zip
lp140b26.tar.bz2
Other information:
1.4.0beta25-README.txt
1.4.0beta25-KNOWNBUGS.txt
1.4.0beta25-LICENSE.txt
1.4.0beta25-Y2K-compliance.txt
1.4.0beta26-README.txt
1.4.0beta26-KNOWNBUGS.txt
1.4.0beta26-LICENSE.txt
1.4.0beta26-Y2K-compliance.txt
Changes since the last public release (1.2.10):
......@@ -281,11 +281,18 @@ version 1.4.0beta25 [July 30, 2008]
Eliminated all PNG_USELESS_TESTS and PNG_CORRECT_PALETTE_SUPPORTED code.
Synced contrib directory and configure files with libpng-1.2.30beta06.
Eliminated no-longer-used pngdefs.h (but it's still built in the makefiles)
Relocated a misplaced #endif /* PNG_NO_WRITE_FILTER */ in pngwutil.c
Relocated a misplaced "#endif /* PNG_NO_WRITE_FILTER */" in pngwutil.c
version 1.4.0beta26 [August 4, 2008]
Removed png_push_have_buffer() function in pngpread.c. It increased the
compiled library size slightly.
Changed "-Wall" to "-W -Wall" in the CFLAGS in all makefiles (Cosmin Truta)
Declared png_ptr "volatile" in pngread.c and pngwrite.c to avoid warnings.
Updated contrib/visupng/cexcept.h to version 2.0.1
Added PNG_LITERAL_CHARACTER macros for #, [, and ].
version 1.4.0betaN [future]
Build shared libraries with -lz and sometimes -lm.
Revised pngvcrd.c for improved efficiency.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
......
......@@ -1954,7 +1954,15 @@ version 1.4.0beta25 [July 30, 2008]
Eliminated all PNG_USELESS_TESTS and PNG_CORRECT_PALETTE_SUPPORTED code.
Synced contrib directory and configure files with libpng-1.2.30beta06.
Eliminated no-longer-used pngdefs.h (but it's still built in the makefiles)
Relocated a misplaced #endif /* PNG_NO_WRITE_FILTER */ in pngwutil.c
Relocated a misplaced "#endif /* PNG_NO_WRITE_FILTER */" in pngwutil.c
version 1.4.0beta26 [August 4, 2008]
Removed png_push_have_buffer() function in pngpread.c. It increased the
compiled library size slightly.
Changed "-Wall" to "-W -Wall" in the CFLAGS in all makefiles (Cosmin Truta)
Declared png_ptr "volatile" in pngread.c and pngwrite.c to avoid warnings.
Updated contrib/visupng/cexcept.h to version 2.0.1
Added PNG_LITERAL_CHARACTER macros for #, [, and ].
version 1.4.0betaN [future]
Build shared libraries with -lz and sometimes -lm.
......
Installing libpng version 1.4.0beta25 - July 30, 2008
Installing libpng version 1.4.0beta26 - August 4, 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.0beta25" or "lpng109" and "zlib-1.2.1"
might be called "libpng-1.4.0beta26" 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.0.1.4.0beta25)
gcc, creates libpng14.so.0.1.4.0beta26)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng14.so.0.1.4.0beta25)
(gcc, creates libpng14.so.0.1.4.0beta26)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng14.so.0.1.4.0beta25,
(gcc, creates libpng14.so.0.1.4.0beta26,
uses assembler code tuned for Intel MMX platform)
makefile.nommx => Linux/ELF makefile
(gcc, creates libpng14.so.0.1.4.0beta25
(gcc, creates libpng14.so.0.1.4.0beta26
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.0.1.4.0beta25)
creates libpng14.so.0.1.4.0beta26)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng14.so.0.1.4.0beta25)
creates libpng14.so.0.1.4.0beta26)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng14.so.0.1.4.0beta25)
creates libpng14.so.0.1.4.0beta26)
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.0beta25
Known bugs in libpng version 1.4.0beta26
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.0beta25, July 30, 2008, are
libpng versions 1.2.6, August 15, 2004, through 1.4.0beta26, August 4, 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 30, 2008
August 4, 2008
......@@ -86,7 +86,7 @@ EXTRA_DIST= \
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
example.c libpng-1.4.0beta25.txt pngvcrd.c
example.c libpng-1.4.0beta26.txt pngvcrd.c
CLEANFILES= pngout.png libpng14.pc libpng14-config libpng.vers \
libpng.sym
......
......@@ -331,7 +331,7 @@ EXTRA_DIST = \
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
example.c libpng-1.4.0beta25.txt pngvcrd.c
example.c libpng-1.4.0beta26.txt pngvcrd.c
CLEANFILES = pngout.png libpng14.pc libpng14-config libpng.vers \
libpng.sym
......
README for libpng version 1.4.0beta25 - July 30, 2008 (shared library 14.0)
README for libpng version 1.4.0beta26 - August 4, 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.0.1.4.0beta25)
gcc, creates libpng14.so.0.1.4.0beta26)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng14.so.0.1.4.0beta25)
(gcc, creates libpng14.so.0.1.4.0beta26)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng14.so.0.1.4.0beta25,
(gcc, creates libpng14.so.0.1.4.0beta26,
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.0.1.4.0beta25)
(gcc, creates libpng14.so.0.1.4.0beta26)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng14.so.0.1.4.0beta25)
(gcc, creates libpng14.so.0.1.4.0beta26)
makefile.so9 => Solaris 9 makefile
(gcc, creates libpng14.so.0.1.4.0beta25)
(gcc, creates libpng14.so.0.1.4.0beta26)
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
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.62 for libpng 1.4.0beta25.
# Generated by GNU Autoconf 2.62 for libpng 1.4.0beta26.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
......@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.4.0beta25'
PACKAGE_STRING='libpng 1.4.0beta25'
PACKAGE_VERSION='1.4.0beta26'
PACKAGE_STRING='libpng 1.4.0beta26'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
......@@ -1484,7 +1484,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libpng 1.4.0beta25 to adapt to many kinds of systems.
\`configure' configures libpng 1.4.0beta26 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1554,7 +1554,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.4.0beta25:";;
short | recursive ) echo "Configuration of libpng 1.4.0beta26:";;
esac
cat <<\_ACEOF
......@@ -1661,7 +1661,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.4.0beta25
libpng configure 1.4.0beta26
generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -1675,7 +1675,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libpng $as_me 1.4.0beta25, which was
It was created by libpng $as_me 1.4.0beta26, which was
generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@
......@@ -2389,7 +2389,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.4.0beta25'
VERSION='1.4.0beta26'
cat >>confdefs.h <<_ACEOF
......@@ -2558,7 +2558,7 @@ fi
PNGLIB_VERSION=1.4.0beta25
PNGLIB_VERSION=1.4.0beta26
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
PNGLIB_RELEASE=0
......@@ -13125,7 +13125,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.0beta25, which was
This file was extended by libpng $as_me 1.4.0beta26, which was
generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -13178,7 +13178,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
libpng config.status 1.4.0beta25
libpng config.status 1.4.0beta26
configured by $0, generated by GNU Autoconf 2.62,
with options \\"`$as_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.0beta25], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.4.0beta26], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
PNGLIB_VERSION=1.4.0beta25
PNGLIB_VERSION=1.4.0beta26
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
PNGLIB_RELEASE=0
......
/*===
cexcept.h 2.0.0 (2001-Jul-12-Thu)
Adam M. Costello <amc@cs.berkeley.edu>
cexcept.h 2.0.1 (2008-Jul-19-Sat)
http://www.nicemice.net/cexcept/
Adam M. Costello
http://www.nicemice.net/amc/
An interface for exception-handling in ANSI C (C89 and subsequent ISO
standards), developed jointly with Cosmin Truta <cosmin@cs.toronto.edu>.
Copyright (c) 2001 Adam M. Costello and Cosmin Truta. Everyone
is hereby granted permission to do whatever they like with this
file, provided that if they modify it they take reasonable steps to
avoid confusing or misleading people about the authors, version,
and terms of use of the derived file. The copyright holders make
no guarantees regarding this file, and are not responsible for any
damage resulting from its use.
Only user-defined exceptions are supported, not "real" exceptions like
division by zero or memory segmentation violations.
If this interface is used by multiple .c files, they shouldn't include
standards), developed jointly with Cosmin Truta.
Copyright (c) 2000-2008 Adam M. Costello and Cosmin Truta.
This software may be modified only if its author and version
information is updated accurately, and may be redistributed
only if accompanied by this unaltered notice. Subject to those
restrictions, permission is granted to anyone to do anything
with this software. The copyright holders make no guarantees
regarding this software, and are not responsible for any damage
resulting from its use.
The cexcept interface is not compatible with and cannot interact
with system exceptions (like division by zero or memory segmentation
violation), compiler-generated exceptions (like C++ exceptions), or
other exception-handling interfaces.
When using this interface across multiple .c files, do not include
this header file directly. Instead, create a wrapper header file that
includes this header file and then invokes the define_exception_type
macro (see below), and let your .c files include that header file.
macro (see below). The .c files should then include that header file.
The interface consists of one type, one well-known name, and six macros.
......@@ -164,7 +169,7 @@ Throw expression;
be compatible with the type passed to define_exception_type(). The
exception must be caught, otherwise the program may crash.
Slight limitation: If the expression is a comma-expression it must
Slight limitation: If the expression is a comma-expression, it must
be enclosed in parentheses.
......@@ -209,11 +214,11 @@ struct exception_context { \
exception__prev = the_exception_context->penv; \
the_exception_context->penv = &exception__env; \
if (setjmp(exception__env) == 0) { \
if (&exception__prev)
do
#define exception__catch(action) \
else { } \
the_exception_context->caught = 0; \
while (the_exception_context->caught = 0, \
the_exception_context->caught); \
} \
else { \
the_exception_context->caught = 1; \
......@@ -226,14 +231,14 @@ struct exception_context { \
#define Catch(e) exception__catch(((e) = the_exception_context->v.etmp, 0))
#define Catch_anonymous exception__catch(0)
/* Try ends with if(), and Catch begins and ends with else. This */
/* ensures that the Try/Catch syntax is really the same as the */
/* if/else syntax. */
/* Try ends with do, and Catch begins with while(0) and ends with */
/* else, to ensure that Try/Catch syntax is similar to if/else */
/* syntax. */
/* */
/* We use &exception__prev instead of 1 to appease compilers that */
/* warn about constant expressions inside if(). Most compilers */
/* should still recognize that &exception__prev is never zero and */
/* avoid generating test code. */
/* The 0 in while(0) is expressed as x=0,x in order to appease */
/* compilers that warn about constant expressions inside while(). */
/* Most compilers should still recognize that the condition is always */
/* false and avoid generating code for it. */
#define Throw \
for (;; longjmp(*the_exception_context->penv, 1)) \
......
......@@ -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 30, 2008]
* Last changed in libpng 1.4.0 [August 4, 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.0beta25 - July 30, 2008
libpng version 1.4.0beta26 - August 4, 2008
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
......@@ -2919,13 +2919,13 @@ application:
IX. Y2K Compliance in libpng
July 30, 2008
August 4, 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.0beta25 are Y2K compliant. It is my belief that earlier
upward through 1.4.0beta26 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 30, 2008"
.TH LIBPNG 3 "August 4, 2008"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta25
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta26
.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.0beta25 - July 30, 2008
libpng version 1.4.0beta26 - August 4, 2008
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
......@@ -3716,13 +3716,13 @@ application:
.SH IX. Y2K Compliance in libpng
July 30, 2008
August 4, 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.0beta25 are Y2K compliant. It is my belief that earlier
upward through 1.4.0beta26 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
......@@ -3889,7 +3889,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-23 14 10400 14.so.0.0[.0]
1.4.0beta15-26 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
......@@ -3945,7 +3945,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.4.0beta25 - July 30, 2008:
Libpng version 1.4.0beta26 - August 4, 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).
......@@ -3966,7 +3966,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.0beta25, July 30, 2008, are
libpng versions 1.2.6, August 15, 2004, through 1.4.0beta26, August 4, 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
......@@ -4065,7 +4065,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
July 30, 2008
August 4, 2008
.\" end of man page
.TH LIBPNGPF 3 "July 30, 2008"
.TH LIBPNGPF 3 "August 4, 2008"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta25
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta26
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
......
.TH PNG 5 "July 30, 2008"
.TH PNG 5 "August 4, 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 30, 2008]
* Last changed in libpng 1.2.30 [August 4, 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_0beta25 Your_png_h_is_not_version_1_4_0beta25;
typedef version_1_4_0beta26 Your_png_h_is_not_version_1_4_0beta26;
/* Version information for C files. This had better match the version
* string defined in png.h. */
......@@ -636,7 +636,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.0beta25 - July 30, 2008\n\
return ((png_charp) "\n libpng version 1.4.0beta26 - August 4, 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.0beta25 - July 30, 2008
* libpng version 1.4.0beta26 - August 4, 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.0beta25 - July 30, 2008: Glenn
* libpng versions 0.97, January 1998, through 1.4.0beta26 - August 4, 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-23 14 10400 14.so.0.0[.0]
* 1.4.0beta15-26 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.0beta25, July 30, 2008, are
* libpng versions 1.2.6, August 15, 2004, through 1.4.0beta26, August 4, 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.0beta25 are Y2K compliant. It is my belief that earlier
* upward through 1.4.0beta26 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.0beta25"
#define PNG_LIBPNG_VER_STRING "1.4.0beta26"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.4.0beta25 - July 30, 2008\n"
" libpng version 1.4.0beta26 - August 4, 2008\n"
#define PNG_LIBPNG_VER_SONUM 0
#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 25
#define PNG_LIBPNG_VER_BUILD 26
/* 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_0beta25;
typedef png_structp version_1_4_0beta26;
typedef png_struct FAR * FAR * png_structpp;
......
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.4.0beta25 - July 30, 2008
* libpng version 1.4.0beta26 - August 4, 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)
......@@ -683,6 +683,20 @@
# define PNG_IO_STATE_SUPPORTED
#endif
#ifndef PNG_LITERAL_SHARP
# define PNG_LITERAL_SHARP '#'
#endif
#ifndef PNG_LITERAL_EXCLAMATION_POINT
# define PNG_LITERAL_EXCLAMATION_POINT '!'
#endif
#ifndef PNG_LITERAL_LEFT_SQUARE_BRACKET
# define PNG_LITERAL_LEFT_SQUARE_BRACKET '['
#endif
#ifndef PNG_LITERAL_RIGHT_SQUARE_BRACKET
# define PNG_LITERAL_RIGHT_SQUARE_BRACKET ']'
#endif
/* These are currently experimental features, define them if you want */
/* very little testing */
......
/* pngerror.c - stub functions for i/o and memory allocation
*
* Last changed in libpng 1.4.0 [July 30, 2008]
* Last changed in libpng 1.4.0 [August 4, 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)
......@@ -42,7 +42,7 @@ png_error(png_structp png_ptr, png_const_charp error_message)
if (png_ptr->flags&
(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
{
if (*error_message == '#')
if (*error_message == PNG_LITERAL_SHARP)
{
/* Strip "#nnnn " from beginning of error message. */
/*
......@@ -130,7 +130,7 @@ png_warning(png_structp png_ptr, png_const_charp warning_message)
(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
#endif
{
if (*warning_message == '#')
if (*warning_message == PNG_LITERAL_SHARP)
{
for (offset = 1; offset < 15; offset++)
if (warning_message[offset] == ' ')
......@@ -182,10 +182,10 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
int c = png_ptr->chunk_name[iin++];
if (isnonalpha(c))
{
buffer[iout++] = '[';
buffer[iout++] = PNG_LITERAL_LEFT_SQUARE_BRACKET;
buffer[iout++] = png_digit[(c & 0xf0) >> 4];
buffer[iout++] = png_digit[c & 0x0f];
buffer[iout++] = ']';
buffer[iout++] = PNG_LITERAL_RIGHT_SQUARE_BRACKET;
}
else
{
......@@ -258,7 +258,7 @@ png_default_error(png_structp png_ptr, png_const_charp error_message)
{
#ifndef PNG_NO_CONSOLE_IO
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
if (*error_message == '#')
if (*error_message == PNG_LITERAL_SHARP)
{
/* Strip "#nnnn " from beginning of warning message. */
/*
......@@ -335,7 +335,7 @@ png_default_warning(png_structp png_ptr, png_const_charp warning_message)
{
#ifndef PNG_NO_CONSOLE_IO
# ifdef PNG_ERROR_NUMBERS_SUPPORTED
if (*warning_message == '#')
if (*warning_message == PNG_LITERAL_SHARP)
{
int offset;
char warning_number[16];
......
/* pngget.c - retrieval of values from info struct
*
* Last changed in libpng 1.40. [July 30, 2008]
* Last changed in libpng 1.40. [August 4, 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 30, 2008]
* Last changed in libpng 1.4.0 [August 4, 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 30, 2008]
* Last changed in libpng 1.4.0 [August 4, 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)
......@@ -224,14 +224,20 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
{
if (png_ptr->push_length != 13)
png_error(png_ptr, "Invalid IHDR length");
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
}
else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
png_ptr->process_mode = PNG_READ_DONE_MODE;
......@@ -240,8 +246,11 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
else if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
png_ptr->mode |= PNG_HAVE_IDAT;
png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
......@@ -259,8 +268,11 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
#endif
else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
}
else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
......@@ -296,72 +308,99 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
#if defined(PNG_READ_gAMA_SUPPORTED)
else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
#if defined(PNG_READ_sBIT_SUPPORTED)
else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
#if defined(PNG_READ_cHRM_SUPPORTED)
else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
#if defined(PNG_READ_sRGB_SUPPORTED)
else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
#if defined(PNG_READ_iCCP_SUPPORTED)
else if (!png_memcmp(png_ptr->chunk_name, png_iCCP, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
#if defined(PNG_READ_sPLT_SUPPORTED)
else if (!png_memcmp(png_ptr->chunk_name, png_sPLT, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
#if defined(PNG_READ_tRNS_SUPPORTED)
else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
#if defined(PNG_READ_bKGD_SUPPORTED)
else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
#if defined(PNG_READ_hIST_SUPPORTED)
else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
......@@ -379,63 +418,87 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
#if defined(PNG_READ_oFFs_SUPPORTED)
else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
#if defined(PNG_READ_pCAL_SUPPORTED)
else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
#if defined(PNG_READ_sCAL_SUPPORTED)
else if (!png_memcmp(png_ptr->chunk_name, png_sCAL, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
#if defined(PNG_READ_tIME_SUPPORTED)
else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
#if defined(PNG_READ_tEXt_SUPPORTED)
else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_push_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
#if defined(PNG_READ_zTXt_SUPPORTED)
else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_push_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
#if defined(PNG_READ_iTXt_SUPPORTED)
else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4))
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_push_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
else
{
if (!png_push_have_buffer(png_ptr))
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
png_push_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
}
......@@ -536,17 +599,6 @@ png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
}
}
int /* PRIVATE */
png_push_have_buffer(png_structp png_ptr)
{
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return (0);
}
return (1);
}
void /* PRIVATE */
png_push_save_buffer(png_structp png_ptr)
{
......
/* pngpriv.h - private declarations for use inside libpng
*
* libpng version 1.4.0beta25 - July 30, 2008
* libpng version 1.4.0beta26 - August 4, 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)
......@@ -795,7 +795,6 @@ PNG_EXTERN void png_push_check_crc PNGARG((png_structp png_ptr));
PNG_EXTERN void png_push_crc_skip PNGARG((png_structp png_ptr,
png_uint_32 length));
PNG_EXTERN void png_push_crc_finish PNGARG((png_structp png_ptr));
PNG_EXTERN int png_push_have_buffer PNGARG((png_structp png_ptr));
PNG_EXTERN void png_push_save_buffer PNGARG((png_structp png_ptr));
PNG_EXTERN void png_push_restore_buffer PNGARG((png_structp png_ptr,
png_bytep buffer, png_size_t buffer_length));
......
/* pngread.c - read a PNG file
*
* Last changed in libpng 1.4.0 [July 30, 2008]
* Last changed in libpng 1.4.0 [August 4, 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)
......@@ -34,7 +34,7 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
{
#endif /* PNG_USER_MEM_SUPPORTED */
png_structp png_ptr;
volatile png_structp png_ptr;
#ifdef PNG_SETJMP_SUPPORTED
#ifdef USE_FAR_KEYWORD
......
/* pngrio.c - functions for data input
*
* Last changed in libpng 1.4.0 [July 30, 2008]
* Last changed in libpng 1.4.0 [August 4, 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 30, 2008]
* Last changed in libpng 1.4.0 [August 4, 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 30, 2008]
* Last changed in libpng 1.4.0 [August 4, 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)
......
/* pngset.c - storage of image information into info struct
*
* Last changed in libpng 1.4.0 [July 30, 2008]
* Last changed in libpng 1.4.0 [August 4, 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 30, 2008]
* Last changed in libpng 1.4.0 [August 4, 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)
......@@ -1613,4 +1613,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_0beta25 your_png_h_is_not_version_1_4_0beta25;
typedef version_1_4_0beta26 your_png_h_is_not_version_1_4_0beta26;
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
*
* Last changed in libpng 1.4.0 [July 30, 2008]
* Last changed in libpng 1.4.0 [August 4, 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 30, 2008]
* Last changed in libpng 1.4.0 [August 4, 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 30, 2008]
* Last changed in libpng 1.4.0 [August 4, 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)
......@@ -444,7 +444,7 @@ png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
png_malloc_ptr malloc_fn, png_free_ptr free_fn)
{
#endif /* PNG_USER_MEM_SUPPORTED */
png_structp png_ptr;
volatile png_structp png_ptr;
#ifdef PNG_SETJMP_SUPPORTED
#ifdef USE_FAR_KEYWORD
jmp_buf jmpbuf;
......
/* pngwtran.c - transforms the data in a row for PNG writers
*
* Last changed in libpng 1.4.0 [July 30, 2008]
* Last changed in libpng 1.4.0 [August 4, 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 30, 2008]
* Last changed in libpng 1.4.0 [August 4, 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.0beta25
# VERSION 0.${PNGLIB_RELEASE}.1.4.0beta26
VERSION 0.${PNGLIB_RELEASE}.0
SOVERSION 0
CLEAN_DIRECT_OUTPUT 1)
......
......@@ -8,7 +8,7 @@
# Modeled after libxml-config.
version=1.4.0beta25
version=1.4.0beta26
prefix=""
libdir=""
libs=""
......
......@@ -5,6 +5,6 @@ includedir=@includedir@/libpng14
Name: libpng
Description: Loads and saves PNG files
Version: 1.4.0beta25
Version: 1.4.0beta26
Libs: -L${libdir} -lpng14
Cflags: -I${includedir}
......@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -20,7 +20,7 @@ LN_SF = ln -f -s
LIBNAME=libpng14
PNGMAJ = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
......@@ -44,7 +44,7 @@ CDEBUG = -g -DPNG_DEBUG=5
LDDEBUG =
CRELEASE = -O2
LDRELEASE = -s
WARNMORE=-Wall
WARNMORE=-W -Wall
CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE)
LDFLAGS = -L. -L$(ZLIBLIB) -lpng14 -lz -lm $(LDRELEASE)
......
......@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......@@ -39,7 +39,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
# On BeOS, -O1 is actually better than -O3. This is a known bug but it's
# still here in R4.5
CFLAGS=-I$(ZLIBINC) -Wall -O1 -funroll-loops \
CFLAGS=-I$(ZLIBINC) -W -Wall -O1 -funroll-loops \
$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
# LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz
LDFLAGS=-L. -Wl,-soname=$(LIBSOMAJ) -L$(ZLIBLIB) -lz
......
......@@ -59,13 +59,13 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
-Wall -O3 $(ALIGN) -funroll-loops \
-W -Wall -O3 $(ALIGN) -funroll-loops \
-fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
LIBNAME = libpng14
PNGMAJ = 0
CYGDLL = 14
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
......
......@@ -19,7 +19,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME = libpng14
PNGMAJ = 12
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......@@ -38,8 +38,8 @@ LN_SF=ln -sf
RANLIB=ranlib
RM_F=/bin/rm -f
# CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE
CFLAGS=-I$(ZLIBINC) -Wall -O -funroll-loops
# CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE
CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops
LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz
INCPATH=$(prefix)/include
......
......@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14
......
......@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......@@ -51,7 +51,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
# for pgcc version 2.95.1, -O3 is buggy; don't use it.
CFLAGS=-Wall -D_REENTRANT -O2 \
CFLAGS=-W -Wall -D_REENTRANT -O2 \
$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
LDFLAGS=-L. -lpng14
......
......@@ -19,8 +19,8 @@ CDEBUG = -g -DPNG_DEBUG=5
LDDEBUG =
CRELEASE = -O2
LDRELEASE = -s
#CFLAGS = -Wall $(CDEBUG)
CFLAGS = -Wall $(CRELEASE)
#CFLAGS = -W -Wall $(CDEBUG)
CFLAGS = -W -Wall $(CRELEASE)
#LDFLAGS = $(LDDEBUG)
LDFLAGS = $(LDRELEASE)
LIBS = -lz -lm
......
......@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......@@ -56,15 +56,15 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
# for pgcc version 2.95.1, -O3 is buggy; don't use it.
CFLAGS= -I$(ZLIBINC) -Wall \
CFLAGS= -I$(ZLIBINC) -W -Wall \
-O3 $(ALIGN) -funroll-loops \
-fomit-frame-pointer # $(WARNMORE) -g -DPNG_DEBUG=5
### for gcc 2.95.2 on 686:
#CFLAGS= -I$(ZLIBINC) -Wall -O3 \
#CFLAGS= -I$(ZLIBINC) -W -Wall -O3 \
# -mcpu=i686 -malign-double -ffast-math -fstrict-aliasing \
# $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer
### for gcc 2.7.2.3 on 486 and up:
#CFLAGS= -I$(ZLIBINC) -Wall -O3 \
#CFLAGS= -I$(ZLIBINC) -W -Wall -O3 \
# -m486 -malign-double -ffast-math \
# $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer
......
......@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......@@ -51,7 +51,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
# for pgcc version 2.95.1, -O3 is buggy; don't use it.
CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops \
$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng14 -lz -lm
LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz -lm
......
......@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......@@ -45,7 +45,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
# for pgcc version 2.95.1, -O3 is buggy; don't use it.
CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops \
$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng14 -lz -lm
......
......@@ -67,21 +67,21 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
###
### if you don't need thread safety, but want the asm accel
#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD \
# $(addprefix -I,$(ZLIBINC)) -Wall -O3 $(ALIGN) -funroll-loops \
# $(addprefix -I,$(ZLIBINC)) -W -Wall -O3 $(ALIGN) -funroll-loops \
# -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
### if you need thread safety and want (minimal) asm accel
#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_USE_PNGGCCRD $(addprefix -I,$(ZLIBINC)) \
# -Wall -O3 $(ALIGN) -funroll-loops \
# -W -Wall -O3 $(ALIGN) -funroll-loops \
# -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
### Normal (non-asm) compilation
CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
-Wall -O3 $(ALIGN) -funroll-loops \
-W -Wall -O3 $(ALIGN) -funroll-loops \
-fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
LIBNAME = libpng14
PNGMAJ = 0
MINGDLL = 14
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
......
......@@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng14
LIB= png14
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.4.0beta25
SHLIB_MINOR= 1.4.0beta26
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.0beta25
SHLIB_MINOR= 1.4.0beta26
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 = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......@@ -56,15 +56,15 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
# for pgcc version 2.95.1, -O3 is buggy; don't use it.
CFLAGS= -I$(ZLIBINC) -Wall \
CFLAGS= -I$(ZLIBINC) -W -Wall \
-O3 $(ALIGN) -funroll-loops \
-fomit-frame-pointer # $(WARNMORE) -g -DPNG_DEBUG=5
### for gcc 2.95.2 on 686:
#CFLAGS= -I$(ZLIBINC) -Wall -O3 \
#CFLAGS= -I$(ZLIBINC) -W -Wall -O3 \
# -mcpu=i686 -malign-double -ffast-math -fstrict-aliasing \
# $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer
### for gcc 2.7.2.3 on 486 and up:
#CFLAGS= -I$(ZLIBINC) -Wall -O3 \
#CFLAGS= -I$(ZLIBINC) -W -Wall -O3 \
# -m486 -malign-double -ffast-math \
# $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer
......
......@@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.4.0beta25
SHLIB_MINOR= 1.4.0beta26
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
......@@ -17,7 +17,7 @@ SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
HDRS= png.h pngconf.h pngpriv.h pngdefs.h
CFLAGS+= -Wall
CFLAGS+= -W -Wall
CPPFLAGS+= -I${.CURDIR}
all: pngconf.h pngdefs.h
......
......@@ -12,7 +12,7 @@ ZLIBINC=../zlib
WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
-Wmissing-declarations -Wtraditional -Wcast-align \
-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
CFLAGS=-I$(ZLIBINC) -Wall -O6 -funroll-loops -malign-loops=2 \
CFLAGS=-I$(ZLIBINC) -W -Wall -O6 -funroll-loops -malign-loops=2 \
-malign-functions=2 #$(WARNMORE) -g -DPNG_DEBUG=5
LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lzdll -Zcrtdll
AR=emxomfar
......
......@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......
......@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14
......@@ -45,7 +45,7 @@ ZLIBINC=/usr/include
#WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
-Wmissing-declarations -Wtraditional -Wcast-align \
-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
#CFLAGS=-I$(ZLIBINC) -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5
#CFLAGS=-I$(ZLIBINC) -W -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5
CFLAGS=-I$(ZLIBINC) -O3
LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm
......
......@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 0
PNGMIN = 1.4.0beta25
PNGMIN = 1.4.0beta26
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
......@@ -41,7 +41,7 @@ ZLIBINC=/usr/local/include
WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
-Wmissing-declarations -Wtraditional -Wcast-align \
-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
CFLAGS=-I$(ZLIBINC) -Wall -O \
CFLAGS=-I$(ZLIBINC) -W -Wall -O \
# $(WARNMORE) -g -DPNG_DEBUG=5
LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm
......
......@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
; Version 1.4.0beta25
; Version 1.4.0beta26
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
......
......@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.4.0beta25
;Version 1.4.0beta26
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.
先完成此消息的编辑!
想要评论请 注册