Imported from libpng-1.2.14rc1.tar

This commit is contained in:
Glenn Randers-Pehrson 2006-11-20 07:55:23 -06:00
parent 11a89964b9
commit b8e76b586e
44 changed files with 124 additions and 112 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.2.14beta2 - November 17, 2006
Libpng 1.2.14rc1 - November 20, 2006
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.14beta2.tar.gz
libpng-1.2.14beta2.tar.bz2
libpng-1.2.14rc1.tar.gz
libpng-1.2.14rc1.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
libpng-1.2.14beta2-no-config.tar.gz
libpng-1.2.14beta2-no-config.tar.bz2
libpng-1.2.14rc1-no-config.tar.gz
libpng-1.2.14rc1-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lp1214b02.zip
lp1214b02.tar.bz2
lp1214r01.zip
lp1214r01.tar.bz2
Project files
libpng-1.2.14beta2-project-netware.zip
libpng-1.2.14beta2-project-wince.zip
libpng-1.2.14rc1-project-netware.zip
libpng-1.2.14rc1-project-wince.zip
Other information:
libpng-1.2.14beta2-README.txt
libpng-1.2.14beta2-KNOWNBUGS.txt
libpng-1.2.14beta2-LICENSE.txt
libpng-1.2.14beta2-Y2K-compliance.txt
libpng-1.2.14rc1-README.txt
libpng-1.2.14rc1-KNOWNBUGS.txt
libpng-1.2.14rc1-LICENSE.txt
libpng-1.2.14rc1-Y2K-compliance.txt
Changes since the last public release (1.2.12):
@ -55,14 +55,17 @@ version 1.0.21rc2, 1.2.13rc2 [November 13, 2006]
version 1.0.21, 1.2.13 [November 15, 2006]
No changes.
version 1.2.14beta1 [November 17, 2006]
version 1.2.14beta1 [November 20, 2006]
Relocated three misplaced tests for NULL png_ptr.
Built Makefile.in with automake-1.9.6 instead of 1.9.2.
Build configure with autoconf-2.60 instead of 2.59
version 1.2.14beta2 [November 17, 2006]
version 1.2.14beta2 [November 20, 2006]
Added some typecasts in png_zalloc().
version 1.2.14beta3 [November 20, 2006]
Changed "strtod" to "png_strtod" in pngrutil.c
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement

View File

@ -1634,6 +1634,9 @@ version 1.2.14beta1 [November 17, 2006]
version 1.2.14beta2 [November 17, 2006]
Added some typecasts in png_zalloc().
version 1.2.14beta3 [November 20, 2006]
Changed "strtod" to "png_strtod" in pngrutil.c
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.14beta2 - November 17, 2006
Installing libpng version 1.2.14rc1 - November 20, 2006
On Unix/Linux and similar systems, you can simply type
@ -37,7 +37,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.14beta2" or "lpng109" and "zlib-1.2.1"
might be called "libpng-1.2.14rc1" 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:
@ -93,11 +93,11 @@ include
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng12.so.0.1.2.14beta2)
gcc, creates libpng12.so.0.1.2.14rc1)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.14beta2)
(gcc, creates libpng12.so.0.1.2.14rc1)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.14beta2,
(gcc, creates libpng12.so.0.1.2.14rc1,
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
@ -120,12 +120,12 @@ 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.14beta2)
creates libpng12.so.0.1.2.14rc1)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng12.so.0.1.2.14beta2)
creates libpng12.so.0.1.2.14rc1)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng12.so.0.1.2.14beta2)
creates libpng12.so.0.1.2.14rc1)
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.14beta2
Known bugs in libpng version 1.2.14rc1
1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when
reading interlaced PNG files, when assembler code is enabled but running

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.14beta2, November 17, 2006, are
libpng versions 1.2.6, August 15, 2004, through 1.2.14rc1, November 20, 2006, are
Copyright (c) 2004, 2006 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
November 17, 2006
November 20, 2006

14
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.2.14beta2 - November 17, 2006 (shared library 12.0)
README for libpng version 1.2.14rc1 - November 20, 2006 (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.14beta2)
gcc, creates libpng12.so.0.1.2.14rc1)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.14beta2)
(gcc, creates libpng12.so.0.1.2.14rc1)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.14beta2,
(gcc, creates libpng12.so.0.1.2.14rc1,
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.14beta2)
(gcc, creates libpng12.so.0.1.2.14rc1)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng12.so.0.1.2.14beta2)
(gcc, creates libpng12.so.0.1.2.14rc1)
makefile.so9 => Solaris 9 makefile
(gcc, creates libpng12.so.0.1.2.14beta2)
(gcc, creates libpng12.so.0.1.2.14rc1)
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:
=========================
November 17, 2006
November 20, 2006
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.14beta2 are Y2K compliant. It is my belief that earlier
upward through 1.2.14rc1 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.60 for libpng 1.2.14beta2.
# Generated by GNU Autoconf 2.60 for libpng 1.2.14rc1.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.2.14beta2'
PACKAGE_STRING='libpng 1.2.14beta2'
PACKAGE_VERSION='1.2.14rc1'
PACKAGE_STRING='libpng 1.2.14rc1'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
@ -1387,7 +1387,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.14beta2 to adapt to many kinds of systems.
\`configure' configures libpng 1.2.14rc1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1457,7 +1457,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.2.14beta2:";;
short | recursive ) echo "Configuration of libpng 1.2.14rc1:";;
esac
cat <<\_ACEOF
@ -1566,7 +1566,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.2.14beta2
libpng configure 1.2.14rc1
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1580,7 +1580,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.14beta2, which was
It was created by libpng $as_me 1.2.14rc1, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@ -2250,7 +2250,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.2.14beta2'
VERSION='1.2.14rc1'
cat >>confdefs.h <<_ACEOF
@ -2421,7 +2421,7 @@ fi
PNGLIB_VERSION=1.2.14beta2
PNGLIB_VERSION=1.2.14rc1
PNGLIB_MAJOR=12
PNGLIB_MINOR=14
@ -21842,7 +21842,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.14beta2, which was
This file was extended by libpng $as_me 1.2.14rc1, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -21895,7 +21895,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
libpng config.status 1.2.14beta2
libpng config.status 1.2.14rc1
configured by $0, generated by GNU Autoconf 2.60,
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.14beta2], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.2.14rc1], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
PNGLIB_VERSION=1.2.14beta2
PNGLIB_VERSION=1.2.14rc1
PNGLIB_MAJOR=12
PNGLIB_MINOR=14

View File

@ -1,6 +1,6 @@
.TH LIBPNG 3 "November 17, 2006"
.TH LIBPNG 3 "November 20, 2006"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.14beta2
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.14rc1
.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.14beta2 - November 17, 2006
libpng version 1.2.14rc1 - November 20, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@ -3327,13 +3327,13 @@ application:
.SH IX. Y2K Compliance in libpng
November 17, 2006
November 20, 2006
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.14beta2 are Y2K compliant. It is my belief that earlier
upward through 1.2.14rc1 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
@ -3500,10 +3500,12 @@ the first widely used release:
1.2.11 13 10211 12.so.0.11[.0]
1.0.20 10 10020 10.so.0.20[.0]
1.2.12 13 10212 12.so.0.12[.0]
1.2.13beta1 13 10213 12.so.0.11[.0]
1.2.13beta1 13 10213 12.so.0.13[.0]
1.0.21 10 10021 10.so.0.21[.0]
1.2.13 13 10213 12.so.0.13[.0]
1.2.14beta1-2 13 10214 12.so.0.14[.0]
1.0.22rc1 10 10022 10.so.0.22[.0]
1.2.14rc1 13 10214 12.so.0.14[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@ -3559,7 +3561,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.2.14beta2 - November 17, 2006:
Libpng version 1.2.14rc1 - November 20, 2006:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@ -3580,7 +3582,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.14beta2, November 17, 2006, are
libpng versions 1.2.6, August 15, 2004, through 1.2.14rc1, November 20, 2006, are
Copyright (c) 2004-2006 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
@ -3679,7 +3681,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
November 17, 2006
November 20, 2006
.\" end of man page

View File

@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
libpng version 1.2.14beta2 - November 17, 2006
libpng version 1.2.14rc1 - November 20, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@ -2917,13 +2917,13 @@ application:
IX. Y2K Compliance in libpng
November 17, 2006
November 20, 2006
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.14beta2 are Y2K compliant. It is my belief that earlier
upward through 1.2.14rc1 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 LIBPNGPF 3 "November 17, 2006"
.TH LIBPNGPF 3 "November 20, 2006"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.14beta2
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.14rc1
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "November 17, 2006"
.TH PNG 5 "November 20, 2006"
.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_14beta2 Your_png_h_is_not_version_1_2_14beta2;
typedef version_1_2_14rc1 Your_png_h_is_not_version_1_2_14rc1;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@ -701,7 +701,7 @@ png_charp PNGAPI
png_get_copyright(png_structp png_ptr)
{
if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */
return ((png_charp) "\n libpng version 1.2.14beta2 - November 17, 2006\n\
return ((png_charp) "\n libpng version 1.2.14rc1 - November 20, 2006\n\
Copyright (c) 1998-2006 Glenn Randers-Pehrson\n\
Copyright (c) 1996-1997 Andreas Dilger\n\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");

26
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.2.14beta2 - November 17, 2006
* libpng version 1.2.14rc1 - November 20, 2006
* Copyright (c) 1998-2006 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.14beta2 - November 17, 2006: Glenn
* libpng versions 0.97, January 1998, through 1.2.14rc1 - November 20, 2006: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -126,10 +126,12 @@
* 1.2.11 13 10211 12.so.0.11[.0]
* 1.0.20 10 10020 10.so.0.20[.0]
* 1.2.12 13 10212 12.so.0.12[.0]
* 1.2.13beta1 13 10213 12.so.0.11[.0]
* 1.2.13beta1 13 10213 12.so.0.13[.0]
* 1.0.21 10 10021 10.so.0.21[.0]
* 1.2.13 13 10213 12.so.0.13[.0]
* 1.2.14beta1-2 13 10214 12.so.0.11[.0]
* 1.2.14beta1-2 13 10214 12.so.0.14[.0]
* 1.0.22rc1 10 10022 10.so.0.22[.0]
* 1.2.14rc1 13 10214 12.so.0.14[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@ -159,7 +161,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.14beta2, November 17, 2006, are
* libpng versions 1.2.6, August 15, 2004, through 1.2.14rc1, November 20, 2006, are
* Copyright (c) 2004, 2006 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:
@ -271,13 +273,13 @@
* Y2K compliance in libpng:
* =========================
*
* November 17, 2006
* November 20, 2006
*
* 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.14beta2 are Y2K compliant. It is my belief that earlier
* upward through 1.2.14rc1 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
@ -333,9 +335,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.14beta2"
#define PNG_LIBPNG_VER_STRING "1.2.14rc1"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.2.14beta2 - November 17, 2006 (header)\n"
" libpng version 1.2.14rc1 - November 20, 2006 (header)\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@ -347,7 +349,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 2
#define PNG_LIBPNG_VER_BUILD 1
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@ -364,7 +366,7 @@
#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
PNG_LIBPNG_BUILD_PRIVATE */
#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA
#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC
/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
* We must not include leading zeros.
@ -1377,7 +1379,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_14beta2;
typedef png_structp version_1_2_14rc1;
typedef png_struct FAR * FAR * png_structpp;

View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.2.14beta2 - November 17, 2006
* libpng version 1.2.14rc1 - November 20, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2005 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -16,27 +16,29 @@
#if defined(PNG_READ_SUPPORTED)
#if defined(_WIN32_WCE)
#ifdef PNG_FLOATING_POINT_SUPPORTED
# if defined(_WIN32_WCE)
/* strtod() function is not supported on WindowsCE */
# ifdef PNG_FLOATING_POINT_SUPPORTED
__inline double strtod(const char *nptr, char **endptr)
__inline double png_strtod(png_structp png_ptr, const char *nptr, char **endptr)
{
double result = 0;
int len;
wchar_t *str, *end;
len = MultiByteToWideChar(CP_ACP, 0, nptr, -1, NULL, 0);
str = (wchar_t *)malloc(len * sizeof(wchar_t));
str = (wchar_t *)png_malloc(png_ptr, len * sizeof(wchar_t));
if ( NULL != str )
{
MultiByteToWideChar(CP_ACP, 0, nptr, -1, str, len);
result = wcstod(str, &end);
len = WideCharToMultiByte(CP_ACP, 0, end, -1, NULL, 0, NULL, NULL);
*endptr = (char *)nptr + (png_strlen(nptr) - len + 1);
free(str);
png_free(str);
}
return result;
}
# else
# define png_strtod(p,a,b) strtod(a,b)
# endif
#endif
@ -1731,7 +1733,7 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
ep = buffer + 1; /* skip unit byte */
#ifdef PNG_FLOATING_POINT_SUPPORTED
width = strtod(ep, &vp);
width = png_strtod(png_ptr, ep, &vp);
if (*vp)
{
png_warning(png_ptr, "malformed width string in sCAL chunk");
@ -1754,7 +1756,7 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
ep++;
#ifdef PNG_FLOATING_POINT_SUPPORTED
height = strtod(ep, &vp);
height = png_strtod(png_ptr, ep, &vp);
if (*vp)
{
png_warning(png_ptr, "malformed height string in sCAL chunk");

View File

@ -1549,4 +1549,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_14beta2 your_png_h_is_not_version_1_2_14beta2;
typedef version_1_2_14rc1 your_png_h_is_not_version_1_2_14rc1;

View File

@ -8,7 +8,7 @@
# Modeled after libxml-config.
version=1.2.14beta2
version=1.2.14rc1
prefix=""
libdir=""
libs=""

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -80,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
PNGMIN = 1.2.14beta2
PNGMIN = 1.2.14rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll

View File

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

View File

@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.2.14beta2
PNGMIN = 1.2.14rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12

View File

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

View File

@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.14beta2
PNGMIN = 1.2.14rc1
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.14beta2
PNGMIN = 1.2.14rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.14beta2
PNGMIN = 1.2.14rc1
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.14beta2
PNGMIN = 1.2.14rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

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

View File

@ -76,7 +76,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
MINGDLL = 12
PNGMIN = 1.2.14beta2
PNGMIN = 1.2.14rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll

View File

@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
LIB= png12
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.14beta2
SHLIB_MINOR= 1.2.14rc1
SRCS= pnggccrd.c 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

@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng
LIB= png
SHLIB_MAJOR= 3
SHLIB_MINOR= 1.2.14beta2
SHLIB_MINOR= 1.2.14rc1
SRCS= pnggccrd.c 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 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.14beta2
SHLIB_MINOR= 1.2.14rc1
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \

View File

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

View File

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

View File

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

View File

@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.2.14beta2
PNGMIN = 1.2.14rc1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12

View File

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

View File

@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
; Version 1.2.14beta2
; Version 1.2.14rc1
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"

View File

@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.2.14beta2
;Version 1.2.14rc1
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3