Imported from libpng-1.2.26beta06.tar

This commit is contained in:
Glenn Randers-Pehrson 2008-03-19 19:26:22 -05:00
parent fc15b2e479
commit 35d97eb5c5
51 changed files with 137 additions and 119 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.2.26beta05 - March 19, 2008
Libpng 1.2.26beta06 - March 20, 2008
This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version.
@ -9,37 +9,37 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
libpng-1.2.26beta05.tar.gz
libpng-1.2.26beta05.tar.lzma
libpng-1.2.26beta06.tar.gz
libpng-1.2.26beta06.tar.lzma
(Get the lzma codec from <http://tukaani.org/lzma>).
libpng-1.2.26beta05.tar.bz2
libpng-1.2.26beta06.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
libpng-1.2.26beta05-no-config.tar.gz
libpng-1.2.26beta05-no-config.tar.lzma
libpng-1.2.26beta05-no-config.tar.bz2
libpng-1.2.26beta06-no-config.tar.gz
libpng-1.2.26beta06-no-config.tar.lzma
libpng-1.2.26beta06-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lp1226b05.zip
lp1226b05.7z
lp1226b05.tar.bz2
lp1226b06.zip
lp1226b06.7z
lp1226b06.tar.bz2
Project files
libpng-1.2.26beta05-project-netware.zip
libpng-1.2.26beta05-project-wince.zip
libpng-1.2.26beta06-project-netware.zip
libpng-1.2.26beta06-project-wince.zip
Other information:
libpng-1.2.26beta05-README.txt
libpng-1.2.26beta05-KNOWNBUGS.txt
libpng-1.2.26beta05-LICENSE.txt
libpng-1.2.26beta05-Y2K-compliance.txt
libpng-1.2.26beta05-[previous version]-diff.txt
libpng-1.2.26beta06-README.txt
libpng-1.2.26beta06-KNOWNBUGS.txt
libpng-1.2.26beta06-LICENSE.txt
libpng-1.2.26beta06-Y2K-compliance.txt
libpng-1.2.26beta06-[previous version]-diff.txt
Changes since the last public release (1.2.25):
@ -61,6 +61,9 @@ version 1.2.26beta04 [March 18, 2008]
version 1.2.26beta05 [March 19, 2008]
Removed extra png_free() added in libpng-1.2.26beta04.
version 1.2.26beta06 [March 20, 2008]
Avoid reallocating big_row_buf and prev_row when the size does not increase.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

View File

@ -2094,6 +2094,9 @@ version 1.2.26beta04 [March 18, 2008]
version 1.2.26beta05 [March 19, 2008]
Removed extra png_free() added in libpng-1.2.26beta04.
version 1.2.26beta06 [March 20, 2008]
Avoid reallocating big_row_buf and prev_row when the size does not increase.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement

16
INSTALL
View File

@ -1,5 +1,5 @@
Installing libpng version 1.2.26beta05 - March 19, 2008
Installing libpng version 1.2.26beta06 - March 20, 2008
On Unix/Linux and similar systems, you can simply type
@ -44,7 +44,7 @@ to have access to the zlib.h and zconf.h include files that
correspond to the version of zlib that's installed.
You can rename the directories that you downloaded (they
might be called "libpng-1.2.26beta05" or "lpng109" and "zlib-1.2.1"
might be called "libpng-1.2.26beta06" or "lpng109" and "zlib-1.2.1"
or "zlib121") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:
@ -101,9 +101,9 @@ include
CMakeLists.txt => "cmake" script
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng12.so.0.1.2.26beta05)
gcc, creates libpng12.so.0.1.2.26beta06)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.26beta05)
(gcc, creates libpng12.so.0.1.2.26beta06)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@ -125,14 +125,14 @@ include
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.sggcc => Silicon Graphics (gcc,
creates libpng12.so.0.1.2.26beta05)
creates libpng12.so.0.1.2.26beta06)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng12.so.0.1.2.26beta05)
creates libpng12.so.0.1.2.26beta06)
makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc,
creates libpng12.so.0.1.2.26beta05)
creates libpng12.so.0.1.2.26beta06)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng12.so.0.1.2.26beta05)
creates libpng12.so.0.1.2.26beta06)
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,5 +1,5 @@
Known bugs in libpng version 1.2.26beta05
Known bugs in libpng version 1.2.26beta06
1. February 23, 2006: The custom makefiles don't build libpng with -lz.

View File

@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
If you modify libpng you may insert additional notices immediately following
this sentence.
libpng versions 1.2.6, August 15, 2004, through 1.2.26beta05, March 19, 2008, are
libpng versions 1.2.6, August 15, 2004, through 1.2.26beta06, March 20, 2008, 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
@ -106,4 +106,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
March 19, 2008
March 20, 2008

14
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.2.26beta05 - March 19, 2008 (shared library 12.0)
README for libpng version 1.2.26beta06 - March 20, 2008 (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.
@ -191,11 +191,11 @@ Files in this distribution:
descrip.mms => VMS makefile for MMS or MMK
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng12.so.0.1.2.26beta05)
gcc, creates libpng12.so.0.1.2.26beta06)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.26beta05)
(gcc, creates libpng12.so.0.1.2.26beta06)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.26beta05,
(gcc, creates libpng12.so.0.1.2.26beta06,
uses assembler code tuned for Intel MMX platform)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
@ -217,12 +217,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.26beta05)
(gcc, creates libpng12.so.0.1.2.26beta06)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng12.so.0.1.2.26beta05)
(gcc, creates libpng12.so.0.1.2.26beta06)
makefile.so9 => Solaris 9 makefile
(gcc, creates libpng12.so.0.1.2.26beta05)
(gcc, creates libpng12.so.0.1.2.26beta06)
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:
=========================
March 19, 2008
March 20, 2008
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
upward through 1.2.26beta05 are Y2K compliant. It is my belief that earlier
upward through 1.2.26beta06 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.61 for libpng 1.2.26beta05.
# Generated by GNU Autoconf 2.61 for libpng 1.2.26beta06.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.2.26beta05'
PACKAGE_STRING='libpng 1.2.26beta05'
PACKAGE_VERSION='1.2.26beta06'
PACKAGE_STRING='libpng 1.2.26beta06'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
@ -1406,7 +1406,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.26beta05 to adapt to many kinds of systems.
\`configure' configures libpng 1.2.26beta06 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1476,7 +1476,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.2.26beta05:";;
short | recursive ) echo "Configuration of libpng 1.2.26beta06:";;
esac
cat <<\_ACEOF
@ -1586,7 +1586,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.2.26beta05
libpng configure 1.2.26beta06
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1600,7 +1600,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.26beta05, which was
It was created by libpng $as_me 1.2.26beta06, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@ -2270,7 +2270,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.2.26beta05'
VERSION='1.2.26beta06'
cat >>confdefs.h <<_ACEOF
@ -2441,7 +2441,7 @@ fi
PNGLIB_VERSION=1.2.26beta05
PNGLIB_VERSION=1.2.26beta06
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=26
@ -21295,7 +21295,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libpng $as_me 1.2.26beta05, which was
This file was extended by libpng $as_me 1.2.26beta06, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -21348,7 +21348,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
libpng config.status 1.2.26beta05
libpng config.status 1.2.26beta06
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

View File

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

View File

@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
libpng version 1.2.26beta05 - March 19, 2008
libpng version 1.2.26beta06 - March 20, 2008
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2008 Glenn Randers-Pehrson
@ -2796,13 +2796,13 @@ application:
IX. Y2K Compliance in libpng
March 19, 2008
March 20, 2008
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
upward through 1.2.26beta05 are Y2K compliant. It is my belief that earlier
upward through 1.2.26beta06 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 "March 19, 2008"
.TH LIBPNG 3 "March 20, 2008"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.26beta05
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.26beta06
.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.26beta05 - March 19, 2008
libpng version 1.2.26beta06 - March 20, 2008
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2008 Glenn Randers-Pehrson
@ -3617,13 +3617,13 @@ application:
.SH IX. Y2K Compliance in libpng
March 19, 2008
March 20, 2008
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
upward through 1.2.26beta05 are Y2K compliant. It is my belief that earlier
upward through 1.2.26beta06 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
@ -3897,7 +3897,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.2.26beta05 - March 19, 2008:
Libpng version 1.2.26beta06 - March 20, 2008:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@ -3918,7 +3918,7 @@ included in the libpng distribution, the latter shall prevail.)
If you modify libpng you may insert additional notices immediately following
this sentence.
libpng versions 1.2.6, August 15, 2004, through 1.2.26beta05, March 19, 2008, are
libpng versions 1.2.6, August 15, 2004, through 1.2.26beta06, March 20, 2008, 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
@ -4017,7 +4017,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
March 19, 2008
March 20, 2008
.\" end of man page

View File

@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "March 19, 2008"
.TH LIBPNGPF 3 "March 20, 2008"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.26beta05
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.26beta06
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "March 19, 2008"
.TH PNG 5 "March 20, 2008"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION

4
png.c
View File

@ -13,7 +13,7 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_2_26beta05 Your_png_h_is_not_version_1_2_26beta05;
typedef version_1_2_26beta06 Your_png_h_is_not_version_1_2_26beta06;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@ -693,7 +693,7 @@ png_charp PNGAPI
png_get_copyright(png_structp png_ptr)
{
png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */
return ((png_charp) "\n libpng version 1.2.26beta05 - March 19, 2008\n\
return ((png_charp) "\n libpng version 1.2.26beta06 - March 20, 2008\n\
Copyright (c) 1998-2008 Glenn Randers-Pehrson\n\
Copyright (c) 1996-1997 Andreas Dilger\n\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");

21
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.2.26beta05 - March 19, 2008
* libpng version 1.2.26beta06 - March 20, 2008
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@ -9,7 +9,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.2.26beta05 - March 19, 2008: Glenn
* libpng versions 0.97, January 1998, through 1.2.26beta06 - March 20, 2008: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -209,7 +209,7 @@
* If you modify libpng you may insert additional notices immediately following
* this sentence.
*
* libpng versions 1.2.6, August 15, 2004, through 1.2.26beta05, March 19, 2008, are
* libpng versions 1.2.6, August 15, 2004, through 1.2.26beta06, March 20, 2008, 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:
@ -321,13 +321,13 @@
* Y2K compliance in libpng:
* =========================
*
* March 19, 2008
* March 20, 2008
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
* upward through 1.2.26beta05 are Y2K compliant. It is my belief that earlier
* upward through 1.2.26beta06 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
@ -383,9 +383,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.26beta05"
#define PNG_LIBPNG_VER_STRING "1.2.26beta06"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.2.26beta05 - March 19, 2008\n"
" libpng version 1.2.26beta06 - March 20, 2008\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@ -397,7 +397,7 @@
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero: */
#define PNG_LIBPNG_VER_BUILD 05
#define PNG_LIBPNG_VER_BUILD 06
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@ -1429,13 +1429,16 @@ struct png_struct_def
/* storage for unknown chunk that the library doesn't recognize. */
png_unknown_chunk unknown_chunk;
#endif
/* New members added in libpng-1.2.26 */
png_uint_32 old_big_row_buf_size, old_prev_row_size;
};
/* 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_26beta05;
typedef png_structp version_1_2_26beta06;
typedef png_struct FAR * FAR * png_structpp;

View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.2.26beta05 - March 19, 2008
* libpng version 1.2.26beta06 - March 20, 2008
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1,7 +1,7 @@
/* pngmem.c - stub functions for memory allocation
*
* Last changed in libpng 1.2.26 [March 19, 2008]
* Last changed in libpng 1.2.26 [March 20, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode
*
* Last changed in libpng 1.2.26 [March 19, 2008]
* Last changed in libpng 1.2.26 [March 20, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
* Last changed in libpng 1.2.26 [March 19, 2008]
* Last changed in libpng 1.2.26 [March 20, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -3139,10 +3139,14 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
png_error(png_ptr, "This image requires a row greater than 64KB");
#endif
if (png_ptr->big_row_buf)
png_free(png_ptr,png_ptr->big_row_buf);
png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes+64);
png_ptr->row_buf = png_ptr->big_row_buf+32;
if(row_bytes + 64 > png_ptr->old_big_row_buf_size)
{
if (png_ptr->big_row_buf)
png_free(png_ptr,png_ptr->big_row_buf);
png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes+64);
png_ptr->row_buf = png_ptr->big_row_buf+32;
png_ptr->old_big_row_buf_size = row_bytes+64;
}
#ifdef PNG_MAX_MALLOC_64K
if ((png_uint_32)png_ptr->rowbytes + 1 > (png_uint_32)65536L)
@ -3150,10 +3154,15 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
#endif
if ((png_uint_32)png_ptr->rowbytes > (png_uint_32)(PNG_SIZE_MAX - 1))
png_error(png_ptr, "Row has too many bytes to allocate in memory.");
if (png_ptr->prev_row)
png_free(png_ptr,png_ptr->prev_row);
png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, (png_uint_32)(
png_ptr->rowbytes + 1));
if(png_ptr->rowbytes+1 > png_ptr->old_prev_row_size)
{
if (png_ptr->prev_row)
png_free(png_ptr,png_ptr->prev_row);
png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, (png_uint_32)(
png_ptr->rowbytes + 1));
png_ptr->old_prev_row_size = png_ptr->rowbytes+1;
}
png_memset_check(png_ptr, png_ptr->prev_row, 0, png_ptr->rowbytes + 1);

View File

@ -1553,4 +1553,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_26beta05 your_png_h_is_not_version_1_2_26beta05;
typedef version_1_2_26beta06 your_png_h_is_not_version_1_2_26beta06;

View File

@ -1,7 +1,7 @@
/* pngwutil.c - utilities to write a PNG file
*
* Last changed in libpng 1.2.26 [March 19, 2008]
* Last changed in libpng 1.2.26 [March 20, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -169,7 +169,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in
# SET UP LINKS
set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 0.${PNGLIB_RELEASE}.1.2.26beta05
# VERSION 0.${PNGLIB_RELEASE}.1.2.26beta06
VERSION 0.${PNGLIB_RELEASE}.0
SOVERSION 0
CLEAN_DIRECT_OUTPUT 1)

View File

@ -8,7 +8,7 @@
# Modeled after libxml-config.
version=1.2.26beta05
version=1.2.26beta06
prefix=""
libdir=""
libs=""

View File

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

View File

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

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -20,7 +20,7 @@ LN_SF = ln -f -s
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll

View File

@ -19,7 +19,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12

View File

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

View File

@ -14,7 +14,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
MINGDLL = 12
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll

View File

@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
LIB= png12
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.26beta05
SHLIB_MINOR= 1.2.26beta06
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

@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng
LIB= png
SHLIB_MAJOR= 3
SHLIB_MINOR= 1.2.26beta05
SHLIB_MINOR= 1.2.26beta06
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

@ -7,7 +7,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.26beta05
SHLIB_MINOR= 1.2.26beta06
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \

View File

@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.26beta05
PNGMIN = 1.2.26beta06
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
; Version 1.2.26beta05
; Version 1.2.26beta06
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"

View File

@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.2.26beta05
;Version 1.2.26beta06
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3