mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng10] Imported from libpng-1.0.53beta02.tar

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2010-01-27 08:49:35 -06:00
parent 9c9662527e
commit a4ad250d5a
51 changed files with 208 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.0.53beta01 - January 14, 2010
Libpng 1.0.53beta02 - January 27, 2010
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,46 +9,47 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
libpng-1.0.53beta01.tar.xz (LZMA-compressed, recommended)
libpng-1.0.53beta01.tar.gz
libpng-1.0.53beta01.tar.bz2
libpng-1.0.53beta02.tar.xz (LZMA-compressed, recommended)
libpng-1.0.53beta02.tar.gz
libpng-1.0.53beta02.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
libpng-1.0.53beta01-no-config.tar.xz (LZMA-compressed, recommended)
libpng-1.0.53beta01-no-config.tar.gz
libpng-1.0.53beta01-no-config.tar.bz2
libpng-1.0.53beta02-no-config.tar.xz (LZMA-compressed, recommended)
libpng-1.0.53beta02-no-config.tar.gz
libpng-1.0.53beta02-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lp1053b01.zip
lp1053b01.7z
lp1053b01.tar.bz2
lp1053b02.zip
lp1053b02.7z
lp1053b02.tar.bz2
Project files
libpng-1.0.53beta01-project-netware.zip
libpng-1.0.53beta01-project-wince.zip
libpng-1.0.53beta02-project-netware.zip
libpng-1.0.53beta02-project-wince.zip
Other information:
libpng-1.0.53beta01-README.txt
libpng-1.0.53beta01-KNOWNBUGS.txt
libpng-1.0.53beta01-LICENSE.txt
libpng-1.0.53beta01-Y2K-compliance.txt
libpng-1.0.53beta01-[previous version]-diff.txt
libpng-1.0.53beta02-README.txt
libpng-1.0.53beta02-KNOWNBUGS.txt
libpng-1.0.53beta02-LICENSE.txt
libpng-1.0.53beta02-Y2K-compliance.txt
libpng-1.0.53beta02-[previous version]-diff.txt
Changes since the last public release (1.0.52):
version 1.2.43beta01 [January 14, 2010]
version 1.2.43beta01 [January 27, 2010]
Updated CMakeLists.txt for consistent indentation and to avoid an
unclosed if-statement warning (Philip Lowman).
Removed "#ifdef PNG_1_0_X / #endif" surrounding
PNG_READ_16_TO_8_SUPPORTED and PNG_READ_GRAY_TO_RGB_SUPPORTED
in pngconf.h. These were added in libpng-1.2.41beta08 and libpng-1.0.51,
which introduced a binary incompatibility with libpng-1.0.50.
Backported new png_decompress_chunk() algorithm from libpng-1.4.1
Send comments/corrections/commendations to png-mng-implement at lists.sf.net

3
CHANGES
View File

@ -2632,13 +2632,14 @@ version 1.2.42rc05 [January 2, 2010]
version 1.2.42 and 1.0.52 [January 3, 2010]
No changes.
version 1.2.43beta01 [January 14, 2010]
version 1.2.43beta01 [January 27, 2010]
Updated CMakeLists.txt for consistent indentation and to avoid an
unclosed if-statement warning (Philip Lowman).
Removed "#ifdef PNG_1_0_X / #endif" surrounding
PNG_READ_16_TO_8_SUPPORTED and PNG_READ_GRAY_TO_RGB_SUPPORTED
in pngconf.h. These were added in libpng-1.2.41beta08 and libpng-1.0.51,
which introduced a binary incompatibility with libpng-1.0.50.
Backported new png_decompress_chunk() algorithm from libpng-1.4.1
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

4
INSTALL
View File

@ -1,5 +1,5 @@
Installing libpng version 1.0.53beta01 - January 14, 2010
Installing libpng version 1.0.53beta02 - January 27, 2010
On Unix/Linux and similar systems, you can simply type
@ -46,7 +46,7 @@ to have access to the zlib.h and zconf.h include files that
correspond to the version of zlib that's installed.
You can rename the directories that you downloaded (they
might be called "libpng-1.0.53beta01" or "libpng10" and "zlib-1.2.3"
might be called "libpng-1.0.53beta02" or "libpng10" and "zlib-1.2.3"
or "zlib123") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:

2
KNOWNBUG
View File

@ -1,5 +1,5 @@
Known bugs in libpng version 1.0.53beta01
Known bugs in libpng version 1.0.53beta02
1. December 4, 2009: The PNG_NO_ERROR_NUMBERS macro was inadvertently
defined in libpng-1.2.41/pngconf.h, which may cause a problem with

4
LICENSE
View File

@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.0.53beta01, January 14, 2010, are
libpng versions 1.2.6, August 15, 2004, through 1.0.53beta02, January 27, 2010, are
Copyright (c) 2004, 2006-2009 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
January 14, 2010
January 27, 2010

2
Makefile.am
View File

@ -86,7 +86,7 @@ EXTRA_DIST= \
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
example.c libpng-1.0.53beta01.txt pngvcrd.c
example.c libpng-1.0.53beta02.txt pngvcrd.c
CLEANFILES= pngout.png libpng10.pc libpng10-config libpng.vers \
libpng.sym

2
Makefile.in
View File

@ -351,7 +351,7 @@ EXTRA_DIST = \
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
example.c libpng-1.0.53beta01.txt pngvcrd.c
example.c libpng-1.0.53beta02.txt pngvcrd.c
CLEANFILES = pngout.png libpng10.pc libpng10-config libpng.vers \
libpng.sym

14
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.0.53beta01 - January 14, 2010 (shared library 10.0)
README for libpng version 1.0.53beta02 - January 27, 2010 (shared library 10.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@ -199,11 +199,11 @@ Files in this distribution:
makefile.std => Generic UNIX makefile (cc, creates static
libpng.a)
makefile.elf => Linux/ELF gcc makefile symbol versioning,
creates libpng10.so.0.1.0.53beta01)
creates libpng10.so.0.1.0.53beta02)
makefile.linux => Linux/ELF makefile (gcc, creates
libpng10.so.0.1.0.53beta01)
libpng10.so.0.1.0.53beta02)
makefile.gcmmx => Linux/ELF makefile (gcc, creates
libpng10.so.0.1.0.53beta01, previously
libpng10.so.0.1.0.53beta02, previously
used assembler code tuned for Intel MMX
platform)
makefile.gcc => Generic makefile (gcc, creates static
@ -228,12 +228,12 @@ Files in this distribution:
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
(gcc, creates libpng10.so.0.1.0.53beta01)
(gcc, creates libpng10.so.0.1.0.53beta02)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng10.so.0.1.0.53beta01)
(gcc, creates libpng10.so.0.1.0.53beta02)
makefile.so9 => Solaris 9 makefile
(gcc, creates libpng10.so.0.1.0.53beta01)
(gcc, creates libpng10.so.0.1.0.53beta02)
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

4
Y2KINFO
View File

@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
January 14, 2010
January 27, 2010
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.0.53beta01 are Y2K compliant. It is my belief that earlier
upward through 1.0.53beta02 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

22
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for libpng 1.0.53beta01.
# Generated by GNU Autoconf 2.65 for libpng 1.0.53beta02.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@ -701,8 +701,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.0.53beta01'
PACKAGE_STRING='libpng 1.0.53beta01'
PACKAGE_VERSION='1.0.53beta02'
PACKAGE_STRING='libpng 1.0.53beta02'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''
@ -1435,7 +1435,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.0.53beta01 to adapt to many kinds of systems.
\`configure' configures libpng 1.0.53beta02 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1505,7 +1505,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.0.53beta01:";;
short | recursive ) echo "Configuration of libpng 1.0.53beta02:";;
esac
cat <<\_ACEOF
@ -1612,7 +1612,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.0.53beta01
libpng configure 1.0.53beta02
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@ -2037,7 +2037,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.0.53beta01, which was
It was created by libpng $as_me 1.0.53beta02, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@ -2845,7 +2845,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.0.53beta01'
VERSION='1.0.53beta02'
cat >>confdefs.h <<_ACEOF
@ -2909,7 +2909,7 @@ fi
PNGLIB_VERSION=1.0.53beta01
PNGLIB_VERSION=1.0.53beta02
PNGLIB_MAJOR=1
PNGLIB_MINOR=0
PNGLIB_RELEASE=53
@ -12074,7 +12074,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libpng $as_me 1.0.53beta01, which was
This file was extended by libpng $as_me 1.0.53beta02, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -12140,7 +12140,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libpng config.status 1.0.53beta01
libpng config.status 1.0.53beta02
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"

4
configure.ac
View File

@ -18,12 +18,12 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
AC_INIT([libpng], [1.0.53beta01], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.0.53beta02], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
PNGLIB_VERSION=1.0.53beta01
PNGLIB_VERSION=1.0.53beta02
PNGLIB_MAJOR=1
PNGLIB_MINOR=0
PNGLIB_RELEASE=53

10
libpng-1.0.53beta01.txt → libpng-1.0.53beta02.txt
View File

@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
libpng version 1.0.53beta01 - January 14, 2010
libpng version 1.0.53beta02 - January 27, 2010
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng
Based on:
libpng versions 0.97, January 1998, through 1.0.53beta01 - January 14, 2010
libpng versions 0.97, January 1998, through 1.0.53beta02 - January 27, 2010
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@ -878,7 +878,7 @@ things.
As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
added. It expands the sample depth without changing tRNS to alpha.
As of libpng version 1.0.53beta01, not all possible expansions are supported.
As of libpng version 1.0.53beta02, not all possible expansions are supported.
In the following table, the 01 means grayscale with depth<8, 31 means
indexed with depth<8, other numerals represent the color type, "T" means
@ -3076,13 +3076,13 @@ Other rules can be inferred by inspecting the libpng source.
XIII. Y2K Compliance in libpng
January 14, 2010
January 27, 2010
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.0.53beta01 are Y2K compliant. It is my belief that earlier
upward through 1.0.53beta02 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

20
libpng.3
View File

@ -1,6 +1,6 @@
.TH LIBPNG 3 "January 14, 2010"
.TH LIBPNG 3 "January 27, 2010"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.0.53beta01
libpng \- Portable Network Graphics (PNG) Reference Library 1.0.53beta02
.SH SYNOPSIS
\fI\fB
@ -821,7 +821,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.0.53beta01 - January 14, 2010
libpng version 1.0.53beta02 - January 27, 2010
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@ -832,7 +832,7 @@ libpng.txt - A description on how to use and modify libpng
Based on:
libpng versions 0.97, January 1998, through 1.0.53beta01 - January 14, 2010
libpng versions 0.97, January 1998, through 1.0.53beta02 - January 27, 2010
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@ -1699,7 +1699,7 @@ things.
As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
added. It expands the sample depth without changing tRNS to alpha.
As of libpng version 1.0.53beta01, not all possible expansions are supported.
As of libpng version 1.0.53beta02, not all possible expansions are supported.
In the following table, the 01 means grayscale with depth<8, 31 means
indexed with depth<8, other numerals represent the color type, "T" means
@ -3897,13 +3897,13 @@ Other rules can be inferred by inspecting the libpng source.
.SH XIII. Y2K Compliance in libpng
January 14, 2010
January 27, 2010
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.0.53beta01 are Y2K compliant. It is my belief that earlier
upward through 1.0.53beta02 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
@ -4252,7 +4252,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.0.53beta01 - January 14, 2010:
Libpng version 1.0.53beta02 - January 27, 2010:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@ -4275,7 +4275,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.0.53beta01, January 14, 2010, are
libpng versions 1.2.6, August 15, 2004, through 1.0.53beta02, January 27, 2010, are
Copyright (c) 2004,2006-2008 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
@ -4374,7 +4374,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
January 14, 2010
January 27, 2010
.\" end of man page

4
libpngpf.3
View File

@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "January 14, 2010"
.TH LIBPNGPF 3 "January 27, 2010"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.0.53beta01
libpng \- Portable Network Graphics (PNG) Reference Library 1.0.53beta02
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "January 14, 2010"
.TH PNG 5 "January 27, 2010"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION

6
png.c
View File

@ -17,7 +17,7 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_0_53beta01 Your_png_h_is_not_version_1_0_53beta01;
typedef version_1_0_53beta02 Your_png_h_is_not_version_1_0_53beta02;
/* Version information for C files. This had better match the version
* string defined in png.h.
@ -723,13 +723,13 @@ png_get_copyright(png_structp png_ptr)
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
"libpng version 1.0.53beta01 - January 14, 2010" PNG_STRING_NEWLINE \
"libpng version 1.0.53beta02 - January 27, 2010" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE);
#else
return ((png_charp) "libpng version 1.0.53beta01 - January 14, 2010\
return ((png_charp) "libpng version 1.0.53beta02 - January 27, 2010\
Copyright (c) 1998-2010 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");

18
png.h
View File

@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.0.53beta01 - January 14, 2010
* libpng version 1.0.53beta02 - January 27, 2010
* Copyright (c) 1998-2010 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.)
@ -10,7 +10,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.0.53beta01 - January 14, 2010: Glenn
* libpng versions 0.97, January 1998, through 1.0.53beta02 - January 27, 2010: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -286,7 +286,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.0.53beta01, January 14, 2010, are
* libpng versions 1.2.6, August 15, 2004, through 1.0.53beta02, January 27, 2010, are
* Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.2.5
* with the following individual added to the list of Contributing Authors:
@ -398,13 +398,13 @@
* Y2K compliance in libpng:
* =========================
*
* January 14, 2010
* January 27, 2010
*
* 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.0.53beta01 are Y2K compliant. It is my belief that earlier
* upward through 1.0.53beta02 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
@ -460,9 +460,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.0.53beta01"
#define PNG_LIBPNG_VER_STRING "1.0.53beta02"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.0.53beta01 - January 14, 2010\n"
" libpng version 1.0.53beta02 - January 27, 2010\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 10
@ -475,7 +475,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
#define PNG_LIBPNG_VER_BUILD 01
#define PNG_LIBPNG_VER_BUILD 02
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@ -1531,7 +1531,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_0_53beta01;
typedef png_structp version_1_0_53beta02;
typedef png_struct FAR * FAR * png_structpp;

2
pngconf.h
View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.0.53beta01 - January 14, 2010
* libpng version 1.0.53beta02 - January 27, 2010
* Copyright (c) 1998-2010 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.)

126
pngrutil.c
View File

@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
* Last changed in libpng 1.2.41 [December 3, 2009]
* Last changed in libpng 1.2.43 [January 27, 2010]
* Copyright (c) 1998-2009 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.)
@ -226,8 +226,8 @@ png_crc_error(png_structp png_ptr)
*/
void /* PRIVATE */
png_decompress_chunk(png_structp png_ptr, int comp_type,
png_size_t chunklength,
png_size_t prefix_size, png_size_t *newlength)
png_size_t chunklength,
png_size_t prefix_size, png_size_t *newlength)
{
static PNG_CONST char msg[] = "Error decoding compressed chunk";
png_charp text;
@ -236,6 +236,8 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
if (comp_type == PNG_COMPRESSION_TYPE_BASE)
{
int ret = Z_OK;
png_size_t buffer_size;
png_ptr->zstream.next_in = (png_bytep)(png_ptr->chunkdata + prefix_size);
png_ptr->zstream.avail_in = (uInt)(chunklength - prefix_size);
png_ptr->zstream.next_out = png_ptr->zbuf;
@ -243,6 +245,7 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
text_size = 0;
text = NULL;
buffer_size = 0;
while (png_ptr->zstream.avail_in)
{
@ -261,11 +264,12 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
text_size = prefix_size + png_sizeof(msg) + 1;
text = (png_charp)png_malloc_warn(png_ptr, text_size);
if (text == NULL)
{
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
png_error(png_ptr, "Not enough memory to decompress chunk");
}
{
png_error(png_ptr,
"Not enough memory to decompress chunk");
text_size = 0;
break;
}
png_memcpy(text, png_ptr->chunkdata, prefix_size);
}
@ -273,63 +277,101 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
/* Copy what we can of the error message into the text chunk */
text_size = (png_size_t)(chunklength -
(text - png_ptr->chunkdata) - 1);
(text - png_ptr->chunkdata) - 1);
if (text_size > png_sizeof(msg))
text_size = png_sizeof(msg);
png_memcpy(text + prefix_size, msg, text_size);
buffer_size = text_size;
break;
}
if (!png_ptr->zstream.avail_out || ret == Z_STREAM_END)
{
if (text == NULL)
if (text == NULL) /* Initialize the decompression buffer */
{
text_size = prefix_size +
png_ptr->zbuf_size - png_ptr->zstream.avail_out;
text = (png_charp)png_malloc_warn(png_ptr, text_size + 1);
if (text == NULL)
{
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
png_error(png_ptr,
"Not enough memory to decompress chunk.");
text_size = 0;
break;
}
png_memcpy(text + prefix_size, png_ptr->zbuf,
text_size - prefix_size);
png_memcpy(text, png_ptr->chunkdata, prefix_size);
*(text + text_size) = 0x00;
buffer_size = text_size;
}
else
else /* Enlarge the decompression buffer */
{
png_charp tmp;
png_charp tmp = text;
png_size_t new_text_size;
tmp = text;
text = (png_charp)png_malloc_warn(png_ptr,
(png_uint_32)(text_size +
png_ptr->zbuf_size - png_ptr->zstream.avail_out + 1));
if (text == NULL)
new_text_size = text_size + png_ptr->zbuf_size -
png_ptr->zstream.avail_out;
if (new_text_size > buffer_size)
{
png_free(png_ptr, tmp);
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
png_error(png_ptr,
"Not enough memory to decompress chunk..");
if (png_ptr->zstream.avail_out)
buffer_size = new_text_size;
else
buffer_size += buffer_size;
text = (png_charp)png_malloc_warn(png_ptr,
buffer_size + 1);
if (text == NULL)
{
png_warning(png_ptr,
"Not enough memory to decompress chunk..");
break;
}
png_memcpy(text, tmp, text_size);
png_free(png_ptr, tmp);
}
png_memcpy(text, tmp, text_size);
png_free(png_ptr, tmp);
png_memcpy(text + text_size, png_ptr->zbuf,
(png_ptr->zbuf_size - png_ptr->zstream.avail_out));
text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
*(text + text_size) = 0x00;
}
if (ret == Z_STREAM_END)
break;
else
{
png_ptr->zstream.next_out = png_ptr->zbuf;
png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
/* FIX ME: zTXt chunk written by pngtest is 6 bytes too large */
png_memcpy(text + text_size, png_ptr->zbuf,
(png_ptr->zbuf_size - png_ptr->zstream.avail_out));
text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
*(text + text_size) = 0x00;
}
}
if (ret == Z_STREAM_END)
break;
else
{
png_ptr->zstream.next_out = png_ptr->zbuf;
png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
}
}
if (text != NULL && buffer_size > text_size)
{
/* Reduce text allocation to actual size */
png_charp tmp;
tmp = text;
text = (png_charp)png_malloc_warn(png_ptr,
(png_uint_32)(text_size));
if (text == NULL)
text = tmp;
else
{
png_memcpy(text, tmp, text_size + 1);
png_free(png_ptr, tmp);
}
}
if (ret != Z_STREAM_END)
{
#if defined(PNG_STDIO_SUPPORTED) && !defined(_WIN32_WCE)
@ -360,11 +402,11 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
{
text = (png_charp)png_malloc_warn(png_ptr, text_size+1);
if (text == NULL)
{
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
png_error(png_ptr, "Not enough memory for text.");
}
{
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = NULL;
png_error(png_ptr, "Not enough memory for text");
}
png_memcpy(text, png_ptr->chunkdata, prefix_size);
}
*(text + text_size) = 0x00;

11
pngtest.c
View File

@ -1536,14 +1536,14 @@ main(int argc, char *argv[])
#endif
for (i=2; i<argc; ++i)
{
#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
int k;
#endif
int kerror;
fprintf(STDERR, "\n Testing %s:", argv[i]);
kerror = test_one_file(argv[i], outname);
if (kerror == 0)
{
#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
int k;
#endif
#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
fprintf(STDERR, "\n PASS (%lu zero samples)\n",
(unsigned long)zero_samples);
@ -1629,8 +1629,7 @@ main(int argc, char *argv[])
for (k = 0; k<256; k++)
if (filters_used[k])
fprintf(STDERR, " Filter %d was used %lu times\n",
k,
(unsigned long)filters_used[k]);
k, (unsigned long)filters_used[k]);
#endif
#ifdef PNG_TIME_RFC1123_SUPPORTED
if (tIME_chunk_present != 0)
@ -1698,4 +1697,4 @@ main(int argc, char *argv[])
}
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_0_53beta01 your_png_h_is_not_version_1_0_53beta01;
typedef version_1_0_53beta02 your_png_h_is_not_version_1_0_53beta02;

4
projects/wince.txt
View File

@ -1,6 +1,6 @@
A set of project files is available for WinCE. Get
libpng-1.0.53beta01-project-wince.zip from a libpng distribution
libpng-1.0.53beta02-project-wince.zip from a libpng distribution
site such as http://libpng.sourceforge.net/index.html
Put the zip file in this directory (projects) and then run
"unzip -a libpng-1.0.53beta01-project-wince.zip"
"unzip -a libpng-1.0.53beta02-project-wince.zip"

14
scripts/README.txt
View File

@ -1,8 +1,8 @@
Makefiles for libpng version 1.0.53beta01 - January 14, 2010
Makefiles for libpng version 1.0.53beta02 - January 27, 2010
makefile.linux => Linux/ELF makefile
(gcc, creates libpng10.so.0.1.0.53beta01)
(gcc, creates libpng10.so.0.1.0.53beta02)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@ -20,7 +20,7 @@ Makefiles for libpng version 1.0.53beta01 - January 14, 2010
makefile.dec => DEC Alpha UNIX makefile
makefile.dj2 => DJGPP 2 makefile
makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng10.so.0.1.0.53beta01)
gcc, creates libpng10.so.0.1.0.53beta02)
makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile
makefile.gccmmx => Generic gcc makefile previously using MMX code
@ -38,14 +38,14 @@ Makefiles for libpng version 1.0.53beta01 - January 14, 2010
makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def)
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
makefile.sggcc => Silicon Graphics (gcc,
creates libpng10.so.0.1.0.53beta01)
creates libpng10.so.0.1.0.53beta02)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng10.so.0.1.0.53beta01)
creates libpng10.so.0.1.0.53beta02)
makefile.solaris-x86 => Solaris 2.X makefile (gcc, no MMX code,
creates libpng10.so.0.1.0.53beta01)
creates libpng10.so.0.1.0.53beta02)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng10.so.0.1.0.53beta01)
creates libpng10.so.0.1.0.53beta02)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile

2
scripts/libpng-config-head.in
View File

@ -11,7 +11,7 @@
# Modeled after libxml-config.
version=1.0.53beta01
version=1.0.53beta02
prefix=""
libdir=""
libs=""

2
scripts/libpng.pc.in
View File

@ -5,6 +5,6 @@ includedir=@includedir@/libpng10
Name: libpng
Description: Loads and saves PNG files
Version: 1.0.53beta01
Version: 1.0.53beta02
Libs: -L${libdir} -lpng10
Cflags: -I${includedir}

2
scripts/makefile.32sunu
View File

@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.64sunu
View File

@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.aix
View File

@ -23,7 +23,7 @@ LN_SF = ln -f -s
LIBNAME=libpng10
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local

2
scripts/makefile.beos
View File

@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.cygwin
View File

@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng10
PNGMAJ = 0
CYGDLL = 10
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll

2
scripts/makefile.darwin
View File

@ -22,7 +22,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME = libpng10
PNGMAJ = 10
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.dec
View File

@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng10

2
scripts/makefile.elf
View File

@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.gcmmx
View File

@ -17,7 +17,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.hp64
View File

@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.hpgcc
View File

@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.hpux
View File

@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.linux
View File

@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.mingw
View File

@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng10
PNGMAJ = 0
MINGDLL = 10
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll

2
scripts/makefile.ne12bsd
View File

@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng10
LIB= png10
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.0.53beta01
SHLIB_MINOR= 1.0.53beta02
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c

2
scripts/makefile.netbsd
View File

@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB= png
SHLIB_MAJOR= 3
SHLIB_MINOR= 1.0.53beta01
SHLIB_MINOR= 1.0.53beta02
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c

2
scripts/makefile.nommx
View File

@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.openbsd
View File

@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.0.53beta01
SHLIB_MINOR= 1.0.53beta02
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \

2
scripts/makefile.sco
View File

@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.sggcc
View File

@ -9,7 +9,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.sgi
View File

@ -9,7 +9,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.so9
View File

@ -11,7 +11,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng10

2
scripts/makefile.solaris
View File

@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.solaris-x86
View File

@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.53beta01
PNGMIN = 1.0.53beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/png32ce.def
View File

@ -5,7 +5,7 @@
LIBRARY lpngce
EXPORTS
;Version 1.0.53beta01
;Version 1.0.53beta02
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3

2
scripts/pngos2.def
View File

@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
; Version 1.0.53beta01
; Version 1.0.53beta02
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"

2
scripts/pngw32.def
View File

@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.0.53beta01
;Version 1.0.53beta02
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3