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

[devel] Imported from libpng-1.5.0beta31.tar

上级 ef3831a1
Libpng 1.5.0beta30 - June 22, 2010
Libpng 1.5.0beta31 - June 24, 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,20 +9,20 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
1.5.0beta30.tar.xz (LZMA-compressed, recommended)
1.5.0beta30.tar.gz
1.5.0beta30.tar.bz2
1.5.0beta31.tar.xz (LZMA-compressed, recommended)
1.5.0beta31.tar.gz
1.5.0beta31.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lp150b30.zip
lp150b30.7z
lp150b31.zip
lp150b31.7z
Other information:
1.5.0beta30-README.txt
1.5.0beta30-LICENSE.txt
1.5.0beta31-README.txt
1.5.0beta31-LICENSE.txt
Changes since the last public release (1.4.1):
......@@ -225,7 +225,7 @@ version 1.5.0beta24 [May 7, 2010]
offset of the png_ptr->rowbuf pointer into png_ptr->big_row_buf.
Added more blank lines for readability.
version 1.5.0beta25 [June 22, 2010]
version 1.5.0beta25 [June 24, 2010]
In pngpread.c: png_push_have_row() add check for new_row > height
Removed the now-redundant check for out-of-bounds new_row from example.c
......@@ -247,6 +247,10 @@ version 1.5.0beta29 [June 21, 2010]
version 1.5.0beta30 [June 22, 2010]
Stop memory leak when reading a malformed sCAL chunk.
version 1.5.0beta31 [June 24, 2010]
Revised pngpread.c patch of beta28 to avoid an endless loop.
Removed some trailing blanks.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
......
......@@ -2729,6 +2729,10 @@ version 1.5.0beta29 [June 21, 2010]
version 1.5.0beta30 [June 22, 2010]
Stop memory leak when reading a malformed sCAL chunk.
version 1.5.0beta31 [June 24, 2010]
Revised pngpread.c patch of beta28 to avoid an endless loop.
Removed some trailing blanks.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
......
......@@ -207,7 +207,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 15.${PNGLIB_RELEASE}.1.5.0beta30
# VERSION 15.${PNGLIB_RELEASE}.1.5.0beta31
VERSION 15.${PNGLIB_RELEASE}.0
SOVERSION 15
CLEAN_DIRECT_OUTPUT 1)
......
Installing libpng version 1.5.0beta30 - June 22, 2010
Installing libpng version 1.5.0beta31 - June 24, 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.5.0beta30" or "libpng15" and "zlib-1.2.3"
might be called "libpng-1.5.0beta31" or "libpng15" and "zlib-1.2.3"
or "zlib123") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:
......
......@@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.5.0beta30, June 22, 2010, are
libpng versions 1.2.6, August 15, 2004, through 1.5.0beta31, June 24, 2010, 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
......@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
June 22, 2010
June 24, 2010
README for libpng version 1.5.0beta30 - June 22, 2010 (shared library 15.0)
README for libpng version 1.5.0beta31 - June 24, 2010 (shared library 15.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for libpng 1.5.0beta30.
# Generated by GNU Autoconf 2.65 for libpng 1.5.0beta31.
#
# 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.5.0beta30'
PACKAGE_STRING='libpng 1.5.0beta30'
PACKAGE_VERSION='1.5.0beta31'
PACKAGE_STRING='libpng 1.5.0beta31'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''
......@@ -1432,7 +1432,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.5.0beta30 to adapt to many kinds of systems.
\`configure' configures libpng 1.5.0beta31 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1502,7 +1502,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.5.0beta30:";;
short | recursive ) echo "Configuration of libpng 1.5.0beta31:";;
esac
cat <<\_ACEOF
......@@ -1607,7 +1607,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.5.0beta30
libpng configure 1.5.0beta31
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
......@@ -2032,7 +2032,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.5.0beta30, which was
It was created by libpng $as_me 1.5.0beta31, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
......@@ -2840,7 +2840,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.5.0beta30'
VERSION='1.5.0beta31'
cat >>confdefs.h <<_ACEOF
......@@ -2904,7 +2904,7 @@ fi
PNGLIB_VERSION=1.5.0beta30
PNGLIB_VERSION=1.5.0beta31
PNGLIB_MAJOR=1
PNGLIB_MINOR=5
PNGLIB_RELEASE=0
......@@ -12119,7 +12119,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.5.0beta30, which was
This file was extended by libpng $as_me 1.5.0beta31, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -12185,7 +12185,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.5.0beta30
libpng config.status 1.5.0beta31
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
......
......@@ -18,12 +18,12 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
AC_INIT([libpng], [1.5.0beta30], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.5.0beta31], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
PNGLIB_VERSION=1.5.0beta30
PNGLIB_VERSION=1.5.0beta31
PNGLIB_MAJOR=1
PNGLIB_MINOR=5
PNGLIB_RELEASE=0
......
......@@ -2,7 +2,7 @@
#if 0 /* in case someone actually tries to compile this */
/* example.c - an example of using libpng
* Last changed in libpng 1.5.0 [June 22, 2010]
* Last changed in libpng 1.5.0 [June 24, 2010]
* This file has been placed in the public domain by the authors.
* Maintained 1998-2010 Glenn Randers-Pehrson
* Maintained 1996, 1997 Andreas Dilger)
......
libpng.txt - A description on how to use and modify libpng
libpng version 1.5.0beta30 - June 22, 2010
libpng version 1.5.0beta31 - June 24, 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.5.0beta30 - June 22, 2010
libpng versions 0.97, January 1998, through 1.5.0beta31 - June 24, 2010
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
......@@ -906,7 +906,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.5.0beta30, not all possible expansions are supported.
As of libpng version 1.5.0beta31, 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
......@@ -3301,13 +3301,13 @@ Other rules can be inferred by inspecting the libpng source.
XIII. Y2K Compliance in libpng
June 22, 2010
June 24, 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.5.0beta30 are Y2K compliant. It is my belief that earlier
upward through 1.5.0beta31 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 "June 22, 2010"
.TH LIBPNG 3 "June 24, 2010"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta30
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta31
.SH SYNOPSIS
\fI\fB
......@@ -789,7 +789,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.5.0beta30 - June 22, 2010
libpng version 1.5.0beta31 - June 24, 2010
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
......@@ -800,7 +800,7 @@ libpng.txt - A description on how to use and modify libpng
Based on:
libpng versions 0.97, January 1998, through 1.5.0beta30 - June 22, 2010
libpng versions 0.97, January 1998, through 1.5.0beta31 - June 24, 2010
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
......@@ -1695,7 +1695,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.5.0beta30, not all possible expansions are supported.
As of libpng version 1.5.0beta31, 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
......@@ -4090,13 +4090,13 @@ Other rules can be inferred by inspecting the libpng source.
.SH XIII. Y2K Compliance in libpng
June 22, 2010
June 24, 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.5.0beta30 are Y2K compliant. It is my belief that earlier
upward through 1.5.0beta31 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
......@@ -4275,7 +4275,7 @@ the first widely used release:
1.4.1 14 10401 14.so.14.1[.0]
1.4.2 14 10402 14.so.14.2[.0]
1.4.3 14 10403 14.so.14.3[.0]
1.5.0beta01-30 15 10500 15.so.15.0[.0]
1.5.0beta01-31 15 10500 15.so.15.0[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
......@@ -4332,7 +4332,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.5.0beta30 - June 22, 2010:
Libpng version 1.5.0beta31 - June 24, 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).
......@@ -4355,7 +4355,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.5.0beta30, June 22, 2010, are
libpng versions 1.2.6, August 15, 2004, through 1.5.0beta31, June 24, 2010, 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
......@@ -4454,7 +4454,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
June 22, 2010
June 24, 2010
.\" end of man page
.TH LIBPNGPF 3 "June 22, 2010"
.TH LIBPNGPF 3 "June 24, 2010"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta30
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta31
(private functions)
.SH SYNOPSIS
\fB#include \fI"pngpriv.h"
......
.TH PNG 5 "June 22, 2010"
.TH PNG 5 "June 24, 2010"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
......
/* png.c - location for general purpose libpng functions
*
* Last changed in libpng 1.5.0 [June 22, 2010]
* Last changed in libpng 1.5.0 [June 24, 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.)
......@@ -14,7 +14,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_5_0beta30 Your_png_h_is_not_version_1_5_0beta30;
typedef version_1_5_0beta31 Your_png_h_is_not_version_1_5_0beta31;
/* Version information for C files. This had better match the version
* string defined in png.h.
......@@ -560,13 +560,13 @@ png_get_copyright(png_structp png_ptr)
#else
# ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
"libpng version 1.5.0beta30 - June 22, 2010" PNG_STRING_NEWLINE \
"libpng version 1.5.0beta31 - June 24, 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.5.0beta30 - June 22, 2010\
return ((png_charp) "libpng version 1.5.0beta31 - June 24, 2010\
Copyright (c) 1998-2010 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");
......
/* png.h - header file for PNG reference library
*
* libpng version 1.5.0beta30 - June 22, 2010
* libpng version 1.5.0beta31 - June 24, 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.)
......@@ -11,7 +11,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.5.0beta30 - June 22, 2010: Glenn
* libpng versions 0.97, January 1998, through 1.5.0beta31 - June 24, 2010: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
......@@ -140,7 +140,7 @@
* 1.4.1 14 10401 14.so.14.1[.0]
* 1.4.2 14 10402 14.so.14.2[.0]
* 1.4.3 14 10403 14.so.14.3[.0]
* 1.5.0beta01-30 15 10500 15.so.15.0[.0]
* 1.5.0beta01-31 15 10500 15.so.15.0[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
......@@ -172,7 +172,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.5.0beta30, June 22, 2010, are
* libpng versions 1.2.6, August 15, 2004, through 1.5.0beta31, June 24, 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:
......@@ -284,13 +284,13 @@
* Y2K compliance in libpng:
* =========================
*
* June 22, 2010
* June 24, 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.5.0beta30 are Y2K compliant. It is my belief that earlier
* upward through 1.5.0beta31 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
......@@ -346,9 +346,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.5.0beta30"
#define PNG_LIBPNG_VER_STRING "1.5.0beta31"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.5.0beta30 - June 22, 2010\n"
" libpng version 1.5.0beta31 - June 24, 2010\n"
#define PNG_LIBPNG_VER_SONUM 15
#define PNG_LIBPNG_VER_DLLNUM 15
......@@ -361,7 +361,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
#define PNG_LIBPNG_VER_BUILD 30
#define PNG_LIBPNG_VER_BUILD 31
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
......@@ -836,7 +836,7 @@ typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp),);
/* 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_5_0beta30;
typedef png_structp version_1_5_0beta31;
typedef png_struct FAR * FAR * png_structpp;
......@@ -1104,7 +1104,7 @@ extern PNG_EXPORT(void,png_set_quantize,(png_structp png_ptr,
#ifdef PNG_READ_GAMMA_SUPPORTED
/* Handle gamma correction. Screen_gamma=(display_exponent) */
# ifdef PNG_FLOATING_POINT_SUPPORTED
extern PNG_EXPORT(void,png_set_gamma,(png_structp png_ptr,
extern PNG_EXPORT(void,png_set_gamma,(png_structp png_ptr,
double screen_gamma, double default_file_gamma),,50);
# endif
#endif
......
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.5.0beta30 - June 22, 2010
* libpng version 1.5.0beta31 - June 24, 2010
*
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......@@ -141,7 +141,7 @@
* linked one. For this reason the application must tell us by setting
* the magic flag PNG_USE_DLL to turn on the special processing before
* it includes png.h.
*
*
* Four additional macros are used to make this happen:
*
* PNG_IMPEXP The magic (if any) to cause a symbol to be exported from
......
......@@ -5,7 +5,7 @@
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* Last changed in libpng version 1.5.0 - June 22, 2010
* Last changed in libpng version 1.5.0 - June 24, 2010
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
......@@ -26,7 +26,7 @@
*
* level: level of detail of message, starting at 0. A level 'n'
* message is preceded by 'n' tab characters (not implemented
* on Microsoft compilers unless PNG_DEBUG_FILE is also
* on Microsoft compilers unless PNG_DEBUG_FILE is also
* defined, to allow debug DLL compilation with no standard IO).
* message: a printf(3) style text string. A trailing '\n' is added
* to the message.
......
/* pngerror.c - stub functions for i/o and memory allocation
*
* Last changed in libpng 1.5.0 [June 22, 2010]
* Last changed in libpng 1.5.0 [June 24, 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.)
......
/* pngget.c - retrieval of values from info struct
*
* Last changed in libpng 1.4.1 [June 22, 2010]
* Last changed in libpng 1.4.1 [June 24, 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.)
......
......@@ -5,7 +5,7 @@
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* Last changed in libpng version 1.5.0 - June 22, 2010
* Last changed in libpng version 1.5.0 - June 24, 2010
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
......
/* pngmem.c - stub functions for memory allocation
*
* Last changed in libpng 1.5.0 [June 22, 2010]
* Last changed in libpng 1.5.0 [June 24, 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.)
......
/* pngpread.c - read a png file in push mode
*
* Last changed in libpng 1.5.0 [June 22, 2010]
* Last changed in libpng 1.5.0 [June 24, 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.)
......@@ -921,11 +921,11 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
/* 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;
}
/* 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
......@@ -1440,7 +1440,7 @@ png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)
tmp = text;
text = (png_charp)png_malloc(png_ptr, text_size +
(png_ptr->zbuf_size
(png_ptr->zbuf_size
- png_ptr->zstream.avail_out + 1));
png_memcpy(text, tmp, text_size);
......@@ -1663,7 +1663,7 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
}
#endif
png_memcpy((png_charp)png_ptr->unknown_chunk.name,
(png_charp)png_ptr->chunk_name,
(png_charp)png_ptr->chunk_name,
png_sizeof(png_ptr->unknown_chunk.name));
png_ptr->unknown_chunk.name[png_sizeof(png_ptr->unknown_chunk.name) - 1]
= '\0';
......
/* pngpriv.h - private declarations for use inside libpng
*
* libpng version 1.5.0beta30 - June 22, 2010
* libpng version 1.5.0beta31 - June 24, 2010
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
/* pngread.c - read a PNG file
*
* Last changed in libpng 1.5.0 [June 22, 2010]
* Last changed in libpng 1.5.0 [June 24, 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.)
......@@ -228,10 +228,10 @@ void PNGAPI
png_read_info(png_structp png_ptr, png_infop info_ptr)
{
png_debug(1, "in png_read_info");
if (png_ptr == NULL || info_ptr == NULL)
return;
/* If we haven't checked all of the PNG signature bytes, do so now. */
if (png_ptr->sig_bytes < 8)
{
......@@ -469,7 +469,7 @@ void PNGAPI
png_read_update_info(png_structp png_ptr, png_infop info_ptr)
{
png_debug(1, "in png_read_update_info");
if (png_ptr == NULL)
return;
......@@ -494,7 +494,7 @@ void PNGAPI
png_start_read_image(png_structp png_ptr)
{
png_debug(1, "in png_start_read_image");
if (png_ptr == NULL)
return;
......@@ -512,10 +512,10 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
0xff};
PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
int ret;
if (png_ptr == NULL)
return;
png_debug2(1, "in png_read_row (row %lu, pass %d)",
(unsigned long) png_ptr->row_number, png_ptr->pass);
......@@ -793,7 +793,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row,
png_bytepp dp;
png_debug(1, "in png_read_rows");
if (png_ptr == NULL)
return;
......@@ -847,7 +847,7 @@ png_read_image(png_structp png_ptr, png_bytepp image)
png_bytepp rp;
png_debug(1, "in png_read_image");
if (png_ptr == NULL)
return;
......@@ -886,7 +886,7 @@ void PNGAPI
png_read_end(png_structp png_ptr, png_infop info_ptr)
{
png_debug(1, "in png_read_end");
if (png_ptr == NULL)
return;
......@@ -1089,7 +1089,7 @@ png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,
#endif
png_debug(1, "in png_destroy_read_struct");
if (png_ptr_ptr != NULL)
png_ptr = *png_ptr_ptr;
if (png_ptr == NULL)
......@@ -1165,7 +1165,7 @@ png_read_destroy(png_structp png_ptr, png_infop info_ptr,
#endif
png_debug(1, "in png_read_destroy");
if (info_ptr != NULL)
png_info_destroy(png_ptr, info_ptr);
......
/* pngrio.c - functions for data input
*
* Last changed in libpng 1.5.0 [June 22, 2010]
* Last changed in libpng 1.5.0 [June 24, 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.)
......@@ -32,7 +32,7 @@ void /* PRIVATE */
png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
{
png_debug1(4, "reading %d bytes", (int)length);
if (png_ptr->read_data_fn != NULL)
(*(png_ptr->read_data_fn))(png_ptr, data, length);
......
/* pngrtran.c - transforms the data in a row for PNG readers
*
* Last changed in libpng 1.5.0 [June 22, 2010]
* Last changed in libpng 1.5.0 [June 24, 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.)
......@@ -25,7 +25,7 @@ void PNGAPI
png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action)
{
png_debug(1, "in png_set_crc_action");
if (png_ptr == NULL)
return;
......@@ -97,7 +97,7 @@ png_set_background(png_structp png_ptr,
int need_expand, double background_gamma)
{
png_debug(1, "in png_set_background");
if (png_ptr == NULL)
return;
......
/* pngrutil.c - utilities to read a PNG file
*
* Last changed in libpng 1.4.1 [June 22, 2010]
* Last changed in libpng 1.4.1 [June 24, 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.)
......@@ -383,7 +383,7 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
*newlength = prefix_size + expanded_size;
return; /* The success return! */
}
png_warning(png_ptr, "png_inflate logic error");
png_free(png_ptr, text);
}
......
/* pngset.c - storage of image information into info struct
*
* Last changed in libpng 1.5.0 [June 22, 2010]
* Last changed in libpng 1.5.0 [June 24, 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.)
......
......@@ -5,7 +5,7 @@
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* Last changed in libpng version 1.5.0 - June 22, 2010
* Last changed in libpng version 1.5.0 - June 24, 2010
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
......
/* pngtest.c - a simple test program to test libpng
*
* Last changed in libpng 1.5.0 [June 22, 2010]
* Last changed in libpng 1.5.0 [June 24, 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.)
......@@ -1716,4 +1716,4 @@ main(int argc, char *argv[])
}
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_5_0beta30 your_png_h_is_not_version_1_5_0beta30;
typedef version_1_5_0beta31 your_png_h_is_not_version_1_5_0beta31;
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
*
* Last changed in libpng 1.5.0 [June 22, 2010]
* Last changed in libpng 1.5.0 [June 24, 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.)
......
/* pngwio.c - functions for data output
*
* Last changed in libpng 1.5.0 [June 22, 2010]
* Last changed in libpng 1.5.0 [June 24, 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.)
......
/* pngwrite.c - general routines to write a PNG file
*
* Last changed in libpng 1.5.0 [June 22, 2010]
* Last changed in libpng 1.5.0 [June 24, 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.)
......
/* pngwtran.c - transforms the data in a row for PNG writers
*
* Last changed in libpng 1.5.0 [June 22, 2010]
* Last changed in libpng 1.5.0 [June 24, 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.)
......
/* pngwutil.c - utilities to write a PNG file
*
* Last changed in libpng 1.5.0 [June 22, 2010]
* Last changed in libpng 1.5.0 [June 24, 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.)
......@@ -2216,7 +2216,7 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
png_uint_32 row_bytes = row_info->rowbytes;
#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
int num_p_filters = (int)png_ptr->num_prev_filters;
#endif
#endif
png_debug(1, "in png_write_find_filter");
......@@ -2226,7 +2226,7 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
/* These will never be selected so we need not test them. */
filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_PAETH);
}
#endif
#endif
/* Find out how many bytes offset each pixel is */
bpp = (row_info->pixel_depth + 7) >> 3;
......
VisualStudio instructions
libpng version 1.5.0beta30 - June 22, 2010
libpng version 1.5.0beta31 - June 24, 2010
Copyright (c) 1998-2010 Glenn Randers-Pehrson
......
......@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source and build
*
* libpng version 1.5.0beta30 - June 22, 2010
* libpng version 1.5.0beta31 - June 24, 2010
*
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
......
Makefiles for libpng version 1.5.0beta30 - June 22, 2010
Makefiles for libpng version 1.5.0beta31 - June 24, 2010
pnglibconf.h => Stores configuration settings
makefile.linux => Linux/ELF makefile
(gcc, creates libpng15.so.15.1.5.0beta30)
(gcc, creates libpng15.so.15.1.5.0beta31)
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 @@ pnglibconf.h => Stores configuration settings
makefile.dec => DEC Alpha UNIX makefile
makefile.dj2 => DJGPP 2 makefile
makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng15.so.15.1.5.0beta30)
gcc, creates libpng15.so.15.1.5.0beta31)
makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile
makefile.hpgcc => HPUX makefile using gcc
......@@ -35,12 +35,12 @@ pnglibconf.h => Stores configuration settings
makefile.os2 => OS/2 Makefile (gcc and emx, requires libpng.def)
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
makefile.sggcc => Silicon Graphics (gcc,
creates libpng15.so.15.1.5.0beta30)
creates libpng15.so.15.1.5.0beta31)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng15.so.15.1.5.0beta30)
creates libpng15.so.15.1.5.0beta31)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng15.so.15.1.5.0beta30)
creates libpng15.so.15.1.5.0beta31)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile
......
......@@ -11,7 +11,7 @@
# Modeled after libxml-config.
version=1.5.0beta30
version=1.5.0beta31
prefix=""
libdir=""
libs=""
......
......@@ -5,6 +5,6 @@ includedir=@includedir@/libpng15
Name: libpng
Description: Loads and saves PNG files
Version: 1.5.0beta30
Version: 1.5.0beta31
Libs: -L${libdir} -lpng15
Cflags: -I${includedir}
......@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng15
LIB= png15
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.5.0beta30
SHLIB_MINOR= 1.5.0beta31
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
......
......@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB= png
SHLIB_MAJOR= 3
SHLIB_MINOR= 1.5.0beta30
SHLIB_MINOR= 1.5.0beta31
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
......
......@@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.5.0beta30
SHLIB_MINOR= 1.5.0beta31
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
......
#!/bin/awk -f
# scripts/options.awk - library build configuration control
#
# last changed in libpng version 1.5.0 - June 22, 2010
# last changed in libpng version 1.5.0 - June 24, 2010
#
# Copyright (c) 1998-2010 Glenn Randers-Pehrson
#
......
......@@ -6,7 +6,7 @@
#
com pnglibconf.h - library build configuration
com
com libpng version PNGLIB_VERSION - last changed on June 22, 2010
com libpng version PNGLIB_VERSION - last changed on June 24, 2010
com
com Copyright (c) 1998-2010 Glenn Randers-Pehrson
com
......
/* libpng-1.5.0beta30 STANDARD API DEFINITION */
/* libpng-1.5.0beta31 STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
/* last changed in libpng version 1.5.0 - June 22, 2010 */
/* last changed in libpng version 1.5.0 - June 24, 2010 */
/* Copyright (c) 1998-2010 Glenn Randers-Pehrson */
......
......@@ -11,7 +11,7 @@ LIBRARY
;OS2 CODE PRELOAD MOVEABLE DISCARDABLE
EXPORTS
;Version 1.5.0beta30
;Version 1.5.0beta31
png_access_version_number @1
png_set_sig_bytes @2
png_sig_cmp @3
......
/* pngwin.dfn - define format of pngwin.def
*
* Last changed in libpng version 1.5.0 [June 22, 2010]
* Last changed in libpng version 1.5.0 [June 24, 2010]
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
* This code is released under the libpng license.
......
/* sym.dfn - define format of libpng.sym
*
* Last changed in libpng version 1.5.0 [June 22, 2010]
* Last changed in libpng version 1.5.0 [June 24, 2010]
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
* This code is released under the libpng license.
......
......@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.5.0beta30
;Version 1.5.0beta31
png_access_version_number @1
png_set_sig_bytes @2
png_sig_cmp @3
......
/* symbols.dfn - find all exported symbols
*
* Last changed in libpng version 1.5.0 [June 22, 2010]
* Last changed in libpng version 1.5.0 [June 24, 2010]
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
* This code is released under the libpng license.
......
/* vers.dfn - define format of libpng.vers
*
* Last changed in libpng version 1.5.0 [June 22, 2010]
* Last changed in libpng version 1.5.0 [June 24, 2010]
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
* This code is released under the libpng license.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册