Imported from libpng-1.2.23beta02.tar

This commit is contained in:
Glenn Randers-Pehrson 2007-10-16 14:27:46 -05:00
parent 6328671ef8
commit 28e3cb3e93
54 changed files with 157 additions and 148 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.2.23beta01 - October 15, 2007
Libpng 1.2.23beta02 - October 16, 2007
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,32 +9,32 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
libpng-1.2.23beta01.tar.gz
libpng-1.2.23beta01.tar.bz2
libpng-1.2.23beta02.tar.gz
libpng-1.2.23beta02.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
libpng-1.2.23beta01-no-config.tar.gz
libpng-1.2.23beta01-no-config.tar.bz2
libpng-1.2.23beta02-no-config.tar.gz
libpng-1.2.23beta02-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lp1223b01.zip
lp1223b01.tar.bz2
lp1223b02.zip
lp1223b02.tar.bz2
Project files
libpng-1.2.23beta01-project-netware.zip
libpng-1.2.23beta01-project-wince.zip
libpng-1.2.23beta02-project-netware.zip
libpng-1.2.23beta02-project-wince.zip
Other information:
libpng-1.2.23beta01-README.txt
libpng-1.2.23beta01-KNOWNBUGS.txt
libpng-1.2.23beta01-LICENSE.txt
libpng-1.2.23beta01-Y2K-compliance.txt
libpng-1.2.23beta02-README.txt
libpng-1.2.23beta02-KNOWNBUGS.txt
libpng-1.2.23beta02-LICENSE.txt
libpng-1.2.23beta02-Y2K-compliance.txt
Changes since the last public release (1.2.19):
@ -62,7 +62,7 @@ version 1.2.20rc2 [August 27, 2007]
Revised #ifdefs to ensure one and only one of pnggccrd.c, pngvcrd.c,
or part of pngrutil.c is selected.
version 1.2.20rc3 [October 15, 2007]
version 1.2.20rc3 [October 16, 2007]
Remove a little more code in pngwutil.c when PNG_NO_WRITE_FILTER is selected.
Added /D _CRT_SECURE_NO_WARNINGS to visual6c and visualc71 projects.
Compile png_mmx_support() in png.c even when PNG_NO_MMX_CODE is defined.
@ -129,10 +129,14 @@ version 1.0.30rc1 and 1.2.22rc1 [October 8, 2007]
version 1.0.30 and 1.2.22 [October 13, 2007]
No changes.
version 1.2.23 [October 15, 2007]
version 1.2.23beta01 [October 15, 2007]
Reduced number of invocations of png_strlen() in pngset.c.
Changed [azAZ09_] to [_abcde...89] in Makefile.am for better localization.
version 1.2.23beta02 [October 16, 2007]
Eliminated png_strncpy() and png_strcpy() (Pierre Poissinger)
Changed $AN to $(AN) in Makefile.am.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

View File

@ -1986,10 +1986,14 @@ version 1.0.30rc1 and 1.2.22rc1 [October 8, 2007]
version 1.0.30 and 1.2.22 [October 13, 2007]
No changes.
version 1.2.23 [October 15, 2007]
version 1.2.23beta01 [October 15, 2007]
Reduced number of invocations of png_strlen() in pngset.c.
Changed [azAZ09_] to [_abcde...89] in Makefile.am for better localization.
version 1.2.23beta02 [October 16, 2007]
Eliminated png_strncpy() and png_strcpy() (Pierre Poissinger)
Changed $AN to $(AN) in Makefile.am.
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.23beta01 - October 15, 2007
Installing libpng version 1.2.23beta02 - October 16, 2007
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.23beta01" or "lpng109" and "zlib-1.2.1"
might be called "libpng-1.2.23beta02" 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.23beta01)
gcc, creates libpng12.so.0.1.2.23beta02)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.23beta01)
(gcc, creates libpng12.so.0.1.2.23beta02)
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.23beta01)
creates libpng12.so.0.1.2.23beta02)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng12.so.0.1.2.23beta01)
creates libpng12.so.0.1.2.23beta02)
makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc,
creates libpng12.so.0.1.2.23beta01)
creates libpng12.so.0.1.2.23beta02)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng12.so.0.1.2.23beta01)
creates libpng12.so.0.1.2.23beta02)
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.23beta01
Known bugs in libpng version 1.2.23beta02
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.23beta01, October 15, 2007, are
libpng versions 1.2.6, August 15, 2004, through 1.2.23beta02, October 16, 2007, are
Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
@ -106,4 +106,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
October 15, 2007
October 16, 2007

View File

@ -101,8 +101,8 @@ libpng.sym: png.h pngconf.h
rm -f $@ $@.new
$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \
$(SED) -n -e \
's|^.*PNG_FUNCTION_EXPORT[ ]*\([$AN]*\).*$$|\1|p' \
-e 's|^.*PNG_DATA_EXPORT[ ]*\([$AN]*\).*$$|\1|p' \
's|^.*PNG_FUNCTION_EXPORT[ ]*\([$(AN)]*\).*$$|\1|p' \
-e 's|^.*PNG_DATA_EXPORT[ ]*\([$(AN)]*\).*$$|\1|p' \
>$@.new
mv $@.new $@

View File

@ -1234,8 +1234,8 @@ libpng.sym: png.h pngconf.h
rm -f $@ $@.new
$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \
$(SED) -n -e \
's|^.*PNG_FUNCTION_EXPORT[ ]*\([$AN]*\).*$$|\1|p' \
-e 's|^.*PNG_DATA_EXPORT[ ]*\([$AN]*\).*$$|\1|p' \
's|^.*PNG_FUNCTION_EXPORT[ ]*\([$(AN)]*\).*$$|\1|p' \
-e 's|^.*PNG_DATA_EXPORT[ ]*\([$(AN)]*\).*$$|\1|p' \
>$@.new
mv $@.new $@

14
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.2.23beta01 - October 15, 2007 (shared library 12.0)
README for libpng version 1.2.23beta02 - October 16, 2007 (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.
@ -190,11 +190,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.23beta01)
gcc, creates libpng12.so.0.1.2.23beta02)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.23beta01)
(gcc, creates libpng12.so.0.1.2.23beta02)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.23beta01,
(gcc, creates libpng12.so.0.1.2.23beta02,
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
@ -216,12 +216,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.23beta01)
(gcc, creates libpng12.so.0.1.2.23beta02)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng12.so.0.1.2.23beta01)
(gcc, creates libpng12.so.0.1.2.23beta02)
makefile.so9 => Solaris 9 makefile
(gcc, creates libpng12.so.0.1.2.23beta01)
(gcc, creates libpng12.so.0.1.2.23beta02)
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:
=========================
October 15, 2007
October 16, 2007
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.23beta01 are Y2K compliant. It is my belief that earlier
upward through 1.2.23beta02 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.23beta01.
# Generated by GNU Autoconf 2.61 for libpng 1.2.23beta02.
#
# 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.23beta01'
PACKAGE_STRING='libpng 1.2.23beta01'
PACKAGE_VERSION='1.2.23beta02'
PACKAGE_STRING='libpng 1.2.23beta02'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
@ -1405,7 +1405,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.23beta01 to adapt to many kinds of systems.
\`configure' configures libpng 1.2.23beta02 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1475,7 +1475,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.2.23beta01:";;
short | recursive ) echo "Configuration of libpng 1.2.23beta02:";;
esac
cat <<\_ACEOF
@ -1585,7 +1585,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.2.23beta01
libpng configure 1.2.23beta02
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1599,7 +1599,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.23beta01, which was
It was created by libpng $as_me 1.2.23beta02, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@ -2269,7 +2269,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.2.23beta01'
VERSION='1.2.23beta02'
cat >>confdefs.h <<_ACEOF
@ -2440,7 +2440,7 @@ fi
PNGLIB_VERSION=1.2.23beta01
PNGLIB_VERSION=1.2.23beta02
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=23
@ -21282,7 +21282,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.23beta01, which was
This file was extended by libpng $as_me 1.2.23beta02, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -21335,7 +21335,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
libpng config.status 1.2.23beta01
libpng config.status 1.2.23beta02
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.23beta01], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.2.23beta02], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
PNGLIB_VERSION=1.2.23beta01
PNGLIB_VERSION=1.2.23beta02
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=23

View File

@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
libpng version 1.2.23beta01 - October 15, 2007
libpng version 1.2.23beta02 - October 16, 2007
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2007 Glenn Randers-Pehrson
@ -2796,13 +2796,13 @@ application:
IX. Y2K Compliance in libpng
October 15, 2007
October 16, 2007
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.23beta01 are Y2K compliant. It is my belief that earlier
upward through 1.2.23beta02 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 "October 15, 2007"
.TH LIBPNG 3 "October 16, 2007"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.23beta01
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.23beta02
.SH SYNOPSIS
\fB
#include <png.h>\fP
@ -410,7 +410,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.23beta01 - October 15, 2007
libpng version 1.2.23beta02 - October 16, 2007
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2007 Glenn Randers-Pehrson
@ -3206,13 +3206,13 @@ application:
.SH IX. Y2K Compliance in libpng
October 15, 2007
October 16, 2007
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.23beta01 are Y2K compliant. It is my belief that earlier
upward through 1.2.23beta02 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
@ -3476,7 +3476,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.2.23beta01 - October 15, 2007:
Libpng version 1.2.23beta02 - October 16, 2007:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@ -3497,7 +3497,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.23beta01, October 15, 2007, are
libpng versions 1.2.6, August 15, 2004, through 1.2.23beta02, October 16, 2007, 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
@ -3596,7 +3596,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
October 15, 2007
October 16, 2007
.\" end of man page

View File

@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "October 15, 2007"
.TH LIBPNGPF 3 "October 16, 2007"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.23beta01
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.23beta02
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "October 15, 2007"
.TH PNG 5 "October 16, 2007"
.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_23beta01 Your_png_h_is_not_version_1_2_23beta01;
typedef version_1_2_23beta02 Your_png_h_is_not_version_1_2_23beta02;
/* 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.23beta01 - October 15, 2007\n\
return ((png_charp) "\n libpng version 1.2.23beta02 - October 16, 2007\n\
Copyright (c) 1998-2007 Glenn Randers-Pehrson\n\
Copyright (c) 1996-1997 Andreas Dilger\n\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");

22
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.2.23beta01 - October 15, 2007
* libpng version 1.2.23beta02 - October 16, 2007
* Copyright (c) 1998-2007 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.23beta01 - October 15, 2007: Glenn
* libpng versions 0.97, January 1998, through 1.2.23beta02 - October 16, 2007: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -199,7 +199,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.23beta01, October 15, 2007, are
* libpng versions 1.2.6, August 15, 2004, through 1.2.23beta02, October 16, 2007, 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:
@ -311,13 +311,13 @@
* Y2K compliance in libpng:
* =========================
*
* October 15, 2007
* October 16, 2007
*
* 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.23beta01 are Y2K compliant. It is my belief that earlier
* upward through 1.2.23beta02 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
@ -373,9 +373,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.23beta01"
#define PNG_LIBPNG_VER_STRING "1.2.23beta02"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.2.23beta01 - October 15, 2007\n"
" libpng version 1.2.23beta02 - October 16, 2007\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@ -387,7 +387,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 01
#define PNG_LIBPNG_VER_BUILD 02
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@ -652,10 +652,10 @@ typedef png_time FAR * FAR * png_timepp;
* up private chunks for output even though the library doesn't actually
* know about their semantics.
*/
#define PNG_CHUNK_NAME_LENGTH 4
#define PNG_CHUNK_NAME_LENGTH 5
typedef struct png_unknown_chunk_t
{
png_byte name[PNG_CHUNK_NAME_LENGTH+1];
png_byte name[PNG_CHUNK_NAME_LENGTH];
png_byte *data;
png_size_t size;
@ -1423,7 +1423,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_23beta01;
typedef png_structp version_1_2_23beta02;
typedef png_struct FAR * FAR * png_structpp;

View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.2.23beta01 - October 15, 2007
* libpng version 1.2.23beta02 - October 16, 2007
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -1430,8 +1430,6 @@ typedef z_stream FAR * png_zstreamp;
# define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
# define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
# define png_snprintf _fsnprintf /* Added to v 1.2.19 */
# define png_strcpy _fstrcpy
# define png_strncpy _fstrncpy /* Added to v 1.2.6 */
# define png_strlen _fstrlen
# define png_memcmp _fmemcmp /* SJT: added */
# define png_memcpy _fmemcpy
@ -1460,8 +1458,6 @@ typedef z_stream FAR * png_zstreamp;
# define png_snprintf6(s1,n,fmt,x1,x2,x3,x4,x5,x6) \
sprintf(s1,fmt,x1,x2,x3,x4,x5,x6)
# endif
# define png_strcpy strcpy
# define png_strncpy strncpy /* Added to v 1.2.6 */
# define png_strlen strlen
# define png_memcmp memcmp /* SJT: added */
# define png_memcpy memcpy

View File

@ -1,7 +1,7 @@
/* pngerror.c - stub functions for i/o and memory allocation
*
* Last changed in libpng 1.2.22 [October 15, 2007]
* Last changed in libpng 1.2.22 [October 16, 2007]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -136,7 +136,7 @@ static PNG_CONST char png_digit[16] = {
'A', 'B', 'C', 'D', 'E', 'F'
};
#define PNG_MAX_ERROR_TEXT 63
#define PNG_MAX_ERROR_TEXT 64
#if !defined(PNG_NO_WARNINGS) || !defined(PNG_NO_ERROR_TEXT)
static void /* PRIVATE */
@ -167,8 +167,7 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
{
buffer[iout++] = ':';
buffer[iout++] = ' ';
png_strncpy(buffer+iout, error_message, PNG_MAX_ERROR_TEXT);
buffer[iout+PNG_MAX_ERROR_TEXT] = '\0';
png_memcpy(buffer+iout, error_message, PNG_MAX_ERROR_TEXT);
}
}
@ -176,7 +175,7 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
void PNGAPI
png_chunk_error(png_structp png_ptr, png_const_charp error_message)
{
char msg[18+64];
char msg[18+PNG_MAX_ERROR_TEXT];
if (png_ptr == NULL)
png_error(png_ptr, error_message);
else
@ -192,7 +191,7 @@ png_chunk_error(png_structp png_ptr, png_const_charp error_message)
void PNGAPI
png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)
{
char msg[18+64];
char msg[18+PNG_MAX_ERROR_TEXT];
if (png_ptr == NULL)
png_warning(png_ptr, warning_message);
else

View File

@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode
*
* Last changed in libpng 1.2.22 [October 15, 2007]
* Last changed in libpng 1.2.22 [October 16, 2007]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -1490,9 +1490,11 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
length = (png_uint_32)65535L;
}
#endif
png_strncpy((png_charp)png_ptr->unknown_chunk.name,
(png_charp)png_ptr->chunk_name, 4);
png_ptr->unknown_chunk.name[4] = '\0';
png_memcpy((png_charp)png_ptr->unknown_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';
png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
png_ptr->unknown_chunk.size = (png_size_t)length;
png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);

View File

@ -1,7 +1,7 @@
/* pngrtran.c - transforms the data in a row for PNG readers
*
* Last changed in libpng 1.2.22 [October 15, 2007]
* Last changed in libpng 1.2.22 [October 16, 2007]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
* Last changed in libpng 1.2.22 [October 15, 2007]
* Last changed in libpng 1.2.22 [October 16, 2007]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -2223,9 +2223,10 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
length = (png_uint_32)65535L;
}
#endif
png_strncpy((png_charp)png_ptr->unknown_chunk.name,
(png_charp)png_ptr->chunk_name, PNG_CHUNK_NAME_LENGTH);
png_ptr->unknown_chunk.name[PNG_CHUNK_NAME_LENGTH] = '\0';
png_memcpy((png_charp)png_ptr->unknown_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';
png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
png_ptr->unknown_chunk.size = (png_size_t)length;
png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);

View File

@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
* Last changed in libpng 1.2.22 [October 15, 2007]
* Last changed in libpng 1.2.22 [October 16, 2007]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -692,7 +692,7 @@ png_set_iCCP(png_structp png_ptr, png_infop info_ptr,
png_warning(png_ptr, "Insufficient memory to process iCCP chunk.");
return;
}
png_strncpy(new_iccp_name, name, length);
png_memcpy(new_iccp_name, name, length);
new_iccp_profile = (png_charp)png_malloc_warn(png_ptr, proflen);
if (new_iccp_profile == NULL)
{
@ -983,7 +983,7 @@ png_set_sPLT(png_structp png_ptr,
"Out of memory while processing sPLT chunk");
}
/* TODO: use png_malloc_warn */
png_strncpy(to->name, from->name, length);
png_memcpy(to->name, from->name, length);
to->entries = (png_sPLT_entryp)png_malloc_warn(png_ptr,
from->nentries * png_sizeof(png_sPLT_entry));
/* TODO: use png_malloc_warn */
@ -1040,9 +1040,10 @@ png_set_unknown_chunks(png_structp png_ptr,
png_unknown_chunkp to = np + info_ptr->unknown_chunks_num + i;
png_unknown_chunkp from = unknowns + i;
png_strncpy((png_charp)to->name, (png_charp)from->name,
PNG_CHUNK_NAME_LENGTH);
to->name[PNG_CHUNK_NAME_LENGTH] = '\0';
png_memcpy((png_charp)to->name,
(png_charp)from->name,
png_sizeof(from->name));
to->name[png_sizeof(to->name)] = '\0';
to->data = (png_bytep)png_malloc_warn(png_ptr, from->size);
if (to->data == NULL)

View File

@ -1,7 +1,7 @@
/* pngtest.c - a simple test program to test libpng
*
* Last changed in libpng 1.2.22 - [October 15, 2007]
* Last changed in libpng 1.2.22 - [October 16, 2007]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2004 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -82,9 +82,9 @@ static float t_start, t_stop, t_decode, t_encode, t_misc;
#endif
#if defined(PNG_TIME_RFC1123_SUPPORTED)
#define PNG_tIME_STRING_LENGTH 29
#define PNG_tIME_STRING_LENGTH 30
static int tIME_chunk_present=0;
static char tIME_string[30] = "no tIME chunk present in file";
static char tIME_string[PNG_tIME_STRING_LENGTH] = "no tIME chunk present in file";
#endif
static int verbose = 0;
@ -1003,12 +1003,13 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
{
png_set_tIME(write_ptr, write_info_ptr, mod_time);
#if defined(PNG_TIME_RFC1123_SUPPORTED)
/* we have to use png_strncpy instead of "=" because the string
/* we have to use png_memcpy instead of "=" because the string
pointed to by png_convert_to_rfc1123() gets free'ed before
we use it */
png_strncpy(tIME_string,png_convert_to_rfc1123(read_ptr,
mod_time), PNG_tIME_STRING_LENGTH);
tIME_string[PNG_tIME_STRING_LENGTH] = '\0';
png_memcpy(tIME_string,
png_convert_to_rfc1123(read_ptr, mod_time),
png_sizeof(tIME_string));
tIME_string[png_sizeof(tIME_string)-1] = '\0';
tIME_chunk_present++;
#endif /* PNG_TIME_RFC1123_SUPPORTED */
}
@ -1145,12 +1146,13 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
{
png_set_tIME(write_ptr, write_end_info_ptr, mod_time);
#if defined(PNG_TIME_RFC1123_SUPPORTED)
/* we have to use png_strncpy instead of "=" because the string
/* we have to use png_memcpy instead of "=" because the string
pointed to by png_convert_to_rfc1123() gets free'ed before
we use it */
png_strncpy(tIME_string,png_convert_to_rfc1123(read_ptr,
mod_time),PNG_tIME_STRING_LENGTH);
tIME_string[PNG_tIME_STRING_LENGTH] = '\0';
png_memcpy(tIME_string,
png_convert_to_rfc1123(read_ptr, mod_time),
png_sizeof(tIME_string));
tIME_string[png_sizeof(tIME_string)-1] = '\0';
tIME_chunk_present++;
#endif /* PNG_TIME_RFC1123_SUPPORTED */
}
@ -1551,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_23beta01 your_png_h_is_not_version_1_2_23beta01;
typedef version_1_2_23beta02 your_png_h_is_not_version_1_2_23beta02;

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.23beta01
# VERSION 0.${PNGLIB_RELEASE}.1.2.23beta02
VERSION 0.${PNGLIB_RELEASE}.0
SOVERSION 0
CLEAN_DIRECT_OUTPUT 1)

View File

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

View File

@ -5,6 +5,6 @@ includedir=@includedir@/libpng12
Name: libpng
Description: Loads and saves PNG files
Version: 1.2.23beta01
Version: 1.2.23beta02
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.23beta01
Version: 1.2.23beta02
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}

View File

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

View File

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

View File

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

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.23beta01
PNGMIN = 1.2.23beta02
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.23beta01
PNGMIN = 1.2.23beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll

View File

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

View File

@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.2.23beta01
PNGMIN = 1.2.23beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12

View File

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

View File

@ -14,7 +14,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.23beta01
PNGMIN = 1.2.23beta02
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.23beta01
PNGMIN = 1.2.23beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.23beta01
PNGMIN = 1.2.23beta02
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.23beta01
PNGMIN = 1.2.23beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.23beta01
PNGMIN = 1.2.23beta02
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.23beta01
PNGMIN = 1.2.23beta02
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.23beta01
SHLIB_MINOR= 1.2.23beta02
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.23beta01
SHLIB_MINOR= 1.2.23beta02
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.23beta01
PNGMIN = 1.2.23beta02
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.23beta01
SHLIB_MINOR= 1.2.23beta02
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.23beta01
PNGMIN = 1.2.23beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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