[legacy] Imported from libpng-1.2.44beta03.tar

This commit is contained in:
Glenn Randers-Pehrson 2010-06-19 19:11:54 -05:00
parent 191fb4f5ba
commit e4fc243de4
55 changed files with 229 additions and 187 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.2.44beta02 - June 19, 2010
Libpng 1.2.44beta03 - June 20, 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,36 +9,36 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
libpng-1.2.44beta02.tar.xz (LZMA-compressed, recommended)
libpng-1.2.44beta02.tar.gz
libpng-1.2.44beta02.tar.bz2
libpng-1.2.44beta03.tar.xz (LZMA-compressed, recommended)
libpng-1.2.44beta03.tar.gz
libpng-1.2.44beta03.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
libpng-1.2.44beta02-no-config.tar.xz (LZMA-compressed, recommended)
libpng-1.2.44beta02-no-config.tar.gz
libpng-1.2.44beta02-no-config.tar.bz2
libpng-1.2.44beta03-no-config.tar.xz (LZMA-compressed, recommended)
libpng-1.2.44beta03-no-config.tar.gz
libpng-1.2.44beta03-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lp1244b02.zip
lp1244b02.7z
lp1244b02.tar.bz2
lp1244b03.zip
lp1244b03.7z
lp1244b03.tar.bz2
Project files
libpng-1.2.44beta02-project-netware.zip
libpng-1.2.44beta02-project-wince.zip
libpng-1.2.44beta03-project-netware.zip
libpng-1.2.44beta03-project-wince.zip
Other information:
libpng-1.2.44beta02-README.txt
libpng-1.2.44beta02-KNOWNBUGS.txt
libpng-1.2.44beta02-LICENSE.txt
libpng-1.2.44beta02-Y2K-compliance.txt
libpng-1.2.44beta02-[previous version]-diff.txt
libpng-1.2.44beta03-README.txt
libpng-1.2.44beta03-KNOWNBUGS.txt
libpng-1.2.44beta03-LICENSE.txt
libpng-1.2.44beta03-Y2K-compliance.txt
libpng-1.2.44beta03-[previous version]-diff.txt
Changes since the last public release (1.2.42):
@ -85,6 +85,11 @@ version 1.2.44beta02 [June 19, 2010]
In pngpread.c: png_push_process_row() add check for too many rows.
Removed the now-redundant check for new_row > height in png_push_have_row().
version 1.2.44beta03 [June 20, 2010]
Rewrote png_process_IDAT_data to consistently treat extra data as warnings
and handle end conditions more cleanly.
Removed the new (beta02) check in png_push_process_row().
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

View File

@ -2687,6 +2687,11 @@ version 1.2.44beta02 [June 18, 2010]
In pngpread.c: png_push_process_row() add check for too many rows.
Removed the now-redundant check for new_row > height in png_push_have_row().
version 1.2.44beta03 [June 20, 2010]
Rewrote png_process_IDAT_data to consistently treat extra data as warnings
and handle end conditions more cleanly.
Removed the new (beta02) check in png_push_process_row().
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement

View File

@ -215,7 +215,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/libpng-config.in
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 0.${PNGLIB_RELEASE}.1.2.44beta02
# VERSION 0.${PNGLIB_RELEASE}.1.2.44beta03
VERSION 0.${PNGLIB_RELEASE}.0
SOVERSION 0
CLEAN_DIRECT_OUTPUT 1)

View File

@ -1,5 +1,5 @@
Installing libpng version 1.2.44beta02 - June 19, 2010
Installing libpng version 1.2.44beta03 - June 20, 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.2.44beta02" or "libpng12" and "zlib-1.2.3"
might be called "libpng-1.2.44beta03" or "libpng12" and "zlib-1.2.3"
or "zlib123") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:

View File

@ -1,5 +1,5 @@
Known bugs in libpng version 1.2.44beta02
Known bugs in libpng version 1.2.44beta03
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

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.2.44beta02, June 19, 2010, are
libpng versions 1.2.6, August 15, 2004, through 1.2.44beta03, June 20, 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
June 19, 2010
June 20, 2010

View File

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

View File

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

14
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.2.44beta02 - June 19, 2010 (shared library 12.0)
README for libpng version 1.2.44beta03 - June 20, 2010 (shared library 12.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 libpng12.so.0.1.2.44beta02)
creates libpng12.so.0.1.2.44beta03)
makefile.linux => Linux/ELF makefile (gcc, creates
libpng12.so.0.1.2.44beta02)
libpng12.so.0.1.2.44beta03)
makefile.gcmmx => Linux/ELF makefile (gcc, creates
libpng12.so.0.1.2.44beta02, previously
libpng12.so.0.1.2.44beta03, 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 libpng12.so.0.1.2.44beta02)
(gcc, creates libpng12.so.0.1.2.44beta03)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng12.so.0.1.2.44beta02)
(gcc, creates libpng12.so.0.1.2.44beta03)
makefile.so9 => Solaris 9 makefile
(gcc, creates libpng12.so.0.1.2.44beta02)
(gcc, creates libpng12.so.0.1.2.44beta03)
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

View File

@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
June 19, 2010
June 20, 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.2.44beta02 are Y2K compliant. It is my belief that earlier
upward through 1.2.44beta03 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.2.44beta02.
# Generated by GNU Autoconf 2.65 for libpng 1.2.44beta03.
#
# 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.2.44beta02'
PACKAGE_STRING='libpng 1.2.44beta02'
PACKAGE_VERSION='1.2.44beta03'
PACKAGE_STRING='libpng 1.2.44beta03'
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.2.44beta02 to adapt to many kinds of systems.
\`configure' configures libpng 1.2.44beta03 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.2.44beta02:";;
short | recursive ) echo "Configuration of libpng 1.2.44beta03:";;
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.2.44beta02
libpng configure 1.2.44beta03
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.2.44beta02, which was
It was created by libpng $as_me 1.2.44beta03, 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.2.44beta02'
VERSION='1.2.44beta03'
cat >>confdefs.h <<_ACEOF
@ -2909,7 +2909,7 @@ fi
PNGLIB_VERSION=1.2.44beta02
PNGLIB_VERSION=1.2.44beta03
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=44
@ -12079,7 +12079,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.2.44beta02, which was
This file was extended by libpng $as_me 1.2.44beta03, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -12145,7 +12145,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.2.44beta02
libpng config.status 1.2.44beta03
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"

View File

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

View File

@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
libpng version 1.2.44beta02 - June 19, 2010
libpng version 1.2.44beta03 - June 20, 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.2.44beta02 - June 19, 2010
libpng versions 0.97, January 1998, through 1.2.44beta03 - June 20, 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.2.44beta02, not all possible expansions are supported.
As of libpng version 1.2.44beta03, 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
@ -3179,13 +3179,13 @@ Other rules can be inferred by inspecting the libpng source.
XIII. Y2K Compliance in libpng
June 19, 2010
June 20, 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.2.44beta02 are Y2K compliant. It is my belief that earlier
upward through 1.2.44beta03 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

View File

@ -1,6 +1,6 @@
.TH LIBPNG 3 "June 19, 2010"
.TH LIBPNG 3 "June 20, 2010"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.44beta02
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.44beta03
.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.2.44beta02 - June 19, 2010
libpng version 1.2.44beta03 - June 20, 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.2.44beta02 - June 19, 2010
libpng versions 0.97, January 1998, through 1.2.44beta03 - June 20, 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.2.44beta02, not all possible expansions are supported.
As of libpng version 1.2.44beta03, 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
@ -4000,13 +4000,13 @@ Other rules can be inferred by inspecting the libpng source.
.SH XIII. Y2K Compliance in libpng
June 19, 2010
June 20, 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.2.44beta02 are Y2K compliant. It is my belief that earlier
upward through 1.2.44beta03 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
@ -4304,7 +4304,7 @@ the first widely used release:
1.2.43rc01-02 13 10243 12.so.0.43[.0]
1.0.53 10 10053 10.so.0.53[.0]
1.2.43 13 10243 12.so.0.43[.0]
1.2.44beta01-02 13 10244 12.so.0.44[.0]
1.2.44beta01-03 13 10244 12.so.0.44[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@ -4360,7 +4360,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.2.44beta02 - June 19, 2010:
Libpng version 1.2.44beta03 - June 20, 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).
@ -4383,7 +4383,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.2.44beta02, June 19, 2010, are
libpng versions 1.2.6, August 15, 2004, through 1.2.44beta03, June 20, 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
@ -4482,7 +4482,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
June 19, 2010
June 20, 2010
.\" end of man page

View File

@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "June 19, 2010"
.TH LIBPNGPF 3 "June 20, 2010"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.44beta02
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.44beta03
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "June 19, 2010"
.TH PNG 5 "June 20, 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_2_44beta02 Your_png_h_is_not_version_1_2_44beta02;
typedef version_1_2_44beta03 Your_png_h_is_not_version_1_2_44beta03;
/* Version information for C files. This had better match the version
* string defined in png.h.
@ -724,13 +724,13 @@ png_get_copyright(png_structp png_ptr)
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
"libpng version 1.2.44beta02 - June 19, 2010" PNG_STRING_NEWLINE \
"libpng version 1.2.44beta03 - June 20, 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.2.44beta02 - June 19, 2010\
return ((png_charp) "libpng version 1.2.44beta03 - June 20, 2010\
Copyright (c) 1998-2010 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");

20
png.h
View File

@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.2.44beta02 - June 19, 2010
* libpng version 1.2.44beta03 - June 20, 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.2.44beta02 - June 19, 2010: Glenn
* libpng versions 0.97, January 1998, through 1.2.44beta03 - June 20, 2010: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -259,7 +259,7 @@
* 1.2.43rc01-02 13 10243 12.so.0.43[.0]
* 1.0.53 10 10053 10.so.0.53[.0]
* 1.2.43 13 10243 12.so.0.43[.0]
* 1.2.44beta01-02 13 10244 12.so.0.44[.0]
* 1.2.44beta01-03 13 10244 12.so.0.44[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@ -291,7 +291,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.2.44beta02, June 19, 2010, are
* libpng versions 1.2.6, August 15, 2004, through 1.2.44beta03, June 20, 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:
@ -403,13 +403,13 @@
* Y2K compliance in libpng:
* =========================
*
* June 19, 2010
* June 20, 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.2.44beta02 are Y2K compliant. It is my belief that earlier
* upward through 1.2.44beta03 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
@ -465,9 +465,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.44beta02"
#define PNG_LIBPNG_VER_STRING "1.2.44beta03"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.2.44beta02 - June 19, 2010\n"
" libpng version 1.2.44beta03 - June 20, 2010\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@ -480,7 +480,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
#define PNG_LIBPNG_VER_BUILD 02
#define PNG_LIBPNG_VER_BUILD 03
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@ -1545,7 +1545,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_2_44beta02;
typedef png_structp version_1_2_44beta03;
typedef png_struct FAR * FAR * png_structpp;

View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.2.44beta02 - June 19, 2010
* libpng version 1.2.44beta03 - June 20, 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.)

View File

@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode
*
* Last changed in libpng 1.2.44 [June 19, 2010]
* Last changed in libpng 1.2.44 [June 20, 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.)
@ -783,8 +783,7 @@ png_push_read_IDAT(png_structp png_ptr)
png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);
png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);
png_ptr->idat_size -= save_size;
png_ptr->buffer_size -= save_size;
@ -807,8 +806,8 @@ png_push_read_IDAT(png_structp png_ptr)
save_size = png_ptr->current_buffer_size;
png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);
png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);
png_ptr->idat_size -= save_size;
png_ptr->buffer_size -= save_size;
@ -833,73 +832,106 @@ void /* PRIVATE */
png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
png_size_t buffer_length)
{
int ret;
if ((png_ptr->flags & PNG_FLAG_ZLIB_FINISHED) && buffer_length)
png_error(png_ptr, "Extra compression data");
/* The caller checks for a non-zero buffer length. */
if (!(buffer_length > 0) || buffer == 0)
png_error(png_ptr, "No IDAT data (internal error)");
/* This routine must process all the data it has been given
* before returning, calling the row callback as required to
* handle the uncomrpessed results.
*/
png_ptr->zstream.next_in = buffer;
png_ptr->zstream.avail_in = (uInt)buffer_length;
for (;;)
/* Keep going until the decompressed data is all processed
* or the stream marked as finished.
*/
while (png_ptr->zstream.avail_in > 0 &&
!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
{
ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
if (ret != Z_OK)
int ret;
/* We have data for zlib, but we must check that zlib
* has somewhere to put the results. It doesn't matter
* if we don't expect any results - it may be the input
* data is just the LZ end code.
*/
if (!(png_ptr->zstream.avail_out > 0))
{
if (ret == Z_STREAM_END)
{
if (png_ptr->zstream.avail_in)
png_error(png_ptr, "Extra compressed data");
if (!(png_ptr->zstream.avail_out))
{
png_push_process_row(png_ptr);
}
png_ptr->mode |= PNG_AFTER_IDAT;
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
break;
}
else if (ret == Z_BUF_ERROR)
break;
else
png_error(png_ptr, "Decompression Error");
}
if (!(png_ptr->zstream.avail_out))
{
if ((
#ifdef PNG_READ_INTERLACING_SUPPORTED
png_ptr->interlaced && png_ptr->pass > 6) ||
(!png_ptr->interlaced &&
#endif
png_ptr->row_number == png_ptr->num_rows))
{
if (png_ptr->zstream.avail_in)
png_warning(png_ptr, "Too much data in IDAT chunks");
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
break;
}
png_push_process_row(png_ptr);
png_ptr->zstream.avail_out =
(uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
png_ptr->iwidth) + 1;
png_ptr->zstream.next_out = png_ptr->row_buf;
}
else
break;
/* Using Z_SYNC_FLUSH here means that an unterminated
* LZ stream can still be handled (a stream with a missing
* end code), otherwise (Z_NO_FLUSH) a future zlib
* implementation might defer output and, therefore,
* change the current behavior. (See comments in inflate.c
* for why this doesn't happen at present with zlib 1.2.5.)
*/
ret = inflate(&png_ptr->zstream, Z_SYNC_FLUSH);
/* Check for any failure before proceeding. */
if (ret != Z_OK && ret != Z_STREAM_END)
{
/* Terminate the decompression. */
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
/* This may be a truncated stream (missing or
* damaged end code). Treat that as a warning.
*/
if (png_ptr->row_number >= png_ptr->num_rows ||
png_ptr->pass > 6)
png_warning(png_ptr, "Truncated compressed data");
else
png_error(png_ptr, "Decompression error");
/* Skip the check on unprocessed input */
return;
}
/* Did inflate output any data? */
if (png_ptr->zstream.next_out != png_ptr->row_buf)
{
/* Is this unexpected data after the last row?
* If it is, artificially terminate the LZ output
* here.
*/
if (png_ptr->row_number >= png_ptr->num_rows ||
png_ptr->pass > 6)
{
/* Extra data. */
png_warning(png_ptr, "Extra compressed data");
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
/* Do not more proecessing, skip the unprocessed
* input check below.
*/
return;
}
/* Do we have a complete row? */
if (png_ptr->zstream.avail_out == 0)
png_push_process_row(png_ptr);
/* And check for the end of the stream. */
if (ret == Z_STREAM_END)
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
}
}
/* All the data should have been processed, if anything
* is left at this point we have bytes of IDAT data
* after the zlib end code.
*/
if (png_ptr->zstream.avail_in > 0)
png_warning(png_ptr, "Extra compression data");
}
void /* PRIVATE */
png_push_process_row(png_structp png_ptr)
{
if (png_ptr->row_number >= png_ptr->num_rows)
{
png_error(png_ptr, "Extra row in image");
return;
}
png_ptr->row_info.color_type = png_ptr->color_type;
png_ptr->row_info.width = png_ptr->iwidth;
png_ptr->row_info.channels = png_ptr->channels;
@ -910,8 +942,8 @@ png_push_process_row(png_structp png_ptr)
png_ptr->row_info.width);
png_read_filter_row(png_ptr, &(png_ptr->row_info),
png_ptr->row_buf + 1, png_ptr->prev_row + 1,
(int)(png_ptr->row_buf[0]));
png_ptr->row_buf + 1, png_ptr->prev_row + 1,
(int)(png_ptr->row_buf[0]));
png_memcpy_check(png_ptr, png_ptr->prev_row, png_ptr->row_buf,
png_ptr->rowbytes + 1);
@ -926,7 +958,7 @@ png_push_process_row(png_structp png_ptr)
if (png_ptr->pass < 6)
/* old interface (pre-1.0.9):
png_do_read_interlace(&(png_ptr->row_info),
png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
*/
png_do_read_interlace(png_ptr);
@ -961,7 +993,7 @@ png_push_process_row(png_structp png_ptr)
if (png_ptr->pass == 6 && png_ptr->height <= 4)
{
png_push_have_row(png_ptr, png_bytep_NULL);
png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
@ -1001,7 +1033,7 @@ png_push_process_row(png_structp png_ptr)
for (i = 0; i < 4 && png_ptr->pass == 2; i++)
{
png_push_have_row(png_ptr, png_bytep_NULL);
png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
@ -1051,13 +1083,13 @@ png_push_process_row(png_structp png_ptr)
for (i = 0; i < 2 && png_ptr->pass == 4; i++)
{
png_push_have_row(png_ptr, png_bytep_NULL);
png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
if (png_ptr->pass == 6) /* Pass 5 might be empty */
{
png_push_have_row(png_ptr, png_bytep_NULL);
png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
@ -1076,7 +1108,7 @@ png_push_process_row(png_structp png_ptr)
if (png_ptr->pass == 6) /* Skip top generated row */
{
png_push_have_row(png_ptr, png_bytep_NULL);
png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
@ -1090,7 +1122,7 @@ png_push_process_row(png_structp png_ptr)
if (png_ptr->pass != 6)
break;
png_push_have_row(png_ptr, png_bytep_NULL);
png_push_have_row(png_ptr, png_bytep_NULL);
png_read_push_finish_row(png_ptr);
}
}

View File

@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
* Last changed in libpng 1.2.44 [June 19, 2010]
* Last changed in libpng 1.2.44 [June 20, 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.)

View File

@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
* Last changed in libpng 1.2.44 [June 19, 2010]
* Last changed in libpng 1.2.44 [June 20, 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.)

View File

@ -1702,4 +1702,4 @@ main(int argc, char *argv[])
}
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_2_44beta02 your_png_h_is_not_version_1_2_44beta02;
typedef version_1_2_44beta03 your_png_h_is_not_version_1_2_44beta03;

View File

@ -1,6 +1,6 @@
A set of project files is available for WinCE. Get
libpng-1.2.44beta02-project-wince.zip from a libpng distribution
libpng-1.2.44beta03-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.2.44beta02-project-wince.zip"
"unzip -a libpng-1.2.44beta03-project-wince.zip"

View File

@ -222,7 +222,7 @@
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 3;
DYLIB_CURRENT_VERSION = 3;
FRAMEWORK_VERSION = 1.2.44beta02;
FRAMEWORK_VERSION = 1.2.44beta03;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = Info.plist;
@ -240,7 +240,7 @@
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 3;
DYLIB_CURRENT_VERSION = 3;
FRAMEWORK_VERSION = 1.2.44beta02;
FRAMEWORK_VERSION = 1.2.44beta03;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = Info.plist;

View File

@ -1,8 +1,8 @@
Makefiles for libpng version 1.2.44beta02 - June 19, 2010
Makefiles for libpng version 1.2.44beta03 - June 20, 2010
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.44beta02)
(gcc, creates libpng12.so.0.1.2.44beta03)
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.2.44beta02 - June 19, 2010
makefile.dec => DEC Alpha UNIX makefile
makefile.dj2 => DJGPP 2 makefile
makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng12.so.0.1.2.44beta02)
gcc, creates libpng12.so.0.1.2.44beta03)
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.2.44beta02 - June 19, 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 libpng12.so.0.1.2.44beta02)
creates libpng12.so.0.1.2.44beta03)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng12.so.0.1.2.44beta02)
creates libpng12.so.0.1.2.44beta03)
makefile.solaris-x86 => Solaris 2.X makefile (gcc, no MMX code,
creates libpng12.so.0.1.2.44beta02)
creates libpng12.so.0.1.2.44beta03)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng12.so.0.1.2.44beta02)
creates libpng12.so.0.1.2.44beta03)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile

View File

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

View File

@ -5,6 +5,6 @@ includedir=@includedir@/libpng12
Name: libpng
Description: Loads and saves PNG files
Version: 1.2.44beta02
Version: 1.2.44beta03
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}

View File

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

View File

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

View File

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

View File

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

View File

@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
PNGMIN = 1.2.44beta02
PNGMIN = 1.2.44beta03
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll

View File

@ -22,7 +22,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME = libpng12
PNGMAJ = 12
PNGMIN = 1.2.44beta02
PNGMIN = 1.2.44beta03
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.2.44beta02
PNGMIN = 1.2.44beta03
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -81,7 +81,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
MINGDLL = 12
PNGMIN = 1.2.44beta02
PNGMIN = 1.2.44beta03
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll

View File

@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
LIB= png12
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.44beta02
SHLIB_MINOR= 1.2.44beta03
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

View File

@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB= png
SHLIB_MAJOR= 3
SHLIB_MINOR= 1.2.44beta02
SHLIB_MINOR= 1.2.44beta03
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

View File

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

View File

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

View File

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

View File