Imported from libpng-1.2.11rc2.tar

This commit is contained in:
Glenn Randers-Pehrson 2006-06-14 13:59:43 -05:00
parent 4118fcdd14
commit 52ef3586b9
45 changed files with 163 additions and 113 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.2.11rc1 - June 13, 2006
Libpng 1.2.11rc2 - June 14, 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.11rc1.tar.gz
libpng-1.2.11rc1.tar.bz2
libpng-1.2.11rc2.tar.gz
libpng-1.2.11rc2.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
libpng-1.2.11rc1-no-config.tar.gz
libpng-1.2.11rc1-no-config.tar.bz2
libpng-1.2.11rc2-no-config.tar.gz
libpng-1.2.11rc2-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lp1211r01.zip
lp1211r01.tar.bz2
lp1211r02.zip
lp1211r02.tar.bz2
Project files
libpng-1.2.11rc1-project-netware.zip
libpng-1.2.11rc1-project-wince.zip
libpng-1.2.11rc2-project-netware.zip
libpng-1.2.11rc2-project-wince.zip
Other information:
libpng-1.2.11rc1-README.txt
libpng-1.2.11rc1-KNOWNBUGS.txt
libpng-1.2.11rc1-LICENSE.txt
libpng-1.2.11rc1-Y2K-compliance.txt
libpng-1.2.11rc2-README.txt
libpng-1.2.11rc2-KNOWNBUGS.txt
libpng-1.2.11rc2-LICENSE.txt
libpng-1.2.11rc2-Y2K-compliance.txt
Changes since the last public release (1.2.10):
@ -61,9 +61,15 @@ version 1.2.11beta4 [June 6, 2006]
Allow zero-length IDAT chunks after the entire zlib datastream, but not
after another intervening chunk type.
version 1.2.11rc1 [June 13, 2006]
version 1.2.11rc1 [June 14, 2006]
Deleted extraneous square brackets from [config.h] in configure.ac
version 1.2.11rc2 [June 14, 2006]
Added prototypes for PNG_INCH_CONVERSIONS functions to png.h
Revised INSTALL and autogen.sh
Fixed typo in several makefiles (-W1 should be -Wl)
Added typedef for png_int_32 and png_uint_32 on 64-bit systems.
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

@ -1591,6 +1591,12 @@ version 1.2.11beta4 [June 6, 2006]
version 1.2.11rc1 [June 13, 2006]
Deleted extraneous square brackets from [config.h] in configure.ac
version 1.2.11rc2 [June 14, 2006]
Added prototypes for PNG_INCH_CONVERSIONS functions to png.h
Revised INSTALL and autogen.sh
Fixed typo in several makefiles (-W1 should be -Wl)
Added typedef for png_int_32 and png_uint_32 on 64-bit systems.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement

28
INSTALL
View File

@ -1,16 +1,24 @@
Installing libpng version 1.2.11rc1 - June 13, 2006
Installing libpng version 1.2.11rc2 - June 14, 2006
On Unix/Linux and similar systems, you can simply type
./autogen.sh
./configure [--prefix=$HOME]
make check
make install
and ignore the rest of this document.
Or you can use one of the custom-built makefiles in the
If configure does not work on your system and you have a reasonably
up-to-date set of tools, running ./autogen.sh before running ./configure
may fix the problem. You can also run the individual commands in
autogen.sh with the --force option, if supported by your version of
the tools. If you run 'libtoolize --force', though, this will replace
the distributed, patched, version of ltmain.sh with an unpatched version
and your shared library builds may fail to produce libraries with the
correct version numbers.
Instead, you can use one of the custom-built makefiles in the
"scripts" directory
cp scripts/makefile.system makefile
@ -29,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.11rc1" or "lpng109" and "zlib-1.2.1"
might be called "libpng-1.2.11rc2" 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:
@ -85,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.11rc1)
gcc, creates libpng12.so.0.1.2.11rc2)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.11rc1)
(gcc, creates libpng12.so.0.1.2.11rc2)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.11rc1,
(gcc, creates libpng12.so.0.1.2.11rc2,
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
@ -112,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.11rc1)
creates libpng12.so.0.1.2.11rc2)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng12.so.0.1.2.11rc1)
creates libpng12.so.0.1.2.11rc2)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng12.so.0.1.2.11rc1)
creates libpng12.so.0.1.2.11rc2)
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.11rc1
Known bugs in libpng version 1.2.11rc2
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.11rc1, June 13, 2006, are
libpng versions 1.2.6, August 15, 2004, through 1.2.11rc2, June 14, 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
June 13, 2006
June 14, 2006

View File

@ -85,7 +85,8 @@ EXTRA_DIST= \
$(TESTS) \
example.c libpng.txt pngvcrd.c
CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers libpng.sym
CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \
libpng.sym
$(PNGLIB_BASENAME).pc: libpng.pc
cp libpng.pc $@
@ -95,7 +96,7 @@ $(PNGLIB_BASENAME)-config: libpng-config
libpng.sym: png.h pngconf.h
rm -f $@ $@.new
$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \
$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS png.h | \
$(SED) -n -e 's|^.*PNG_FUNCTION_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \
-e 's|^.*PNG_DATA_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \
>$@.new

14
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.2.11rc1 - June 13, 2006 (shared library 12.0)
README for libpng version 1.2.11rc2 - June 14, 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.11rc1)
gcc, creates libpng12.so.0.1.2.11rc2)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.11rc1)
(gcc, creates libpng12.so.0.1.2.11rc2)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.11rc1,
(gcc, creates libpng12.so.0.1.2.11rc2,
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.11rc1)
(gcc, creates libpng12.so.0.1.2.11rc2)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng12.so.0.1.2.11rc1)
(gcc, creates libpng12.so.0.1.2.11rc2)
makefile.so9 => Solaris 9 makefile
(gcc, creates libpng12.so.0.1.2.11rc1)
(gcc, creates libpng12.so.0.1.2.11rc2)
makefile.32sunu => Sun Ultra 32-bit makefile
makefile.64sunu => Sun Ultra 64-bit makefile
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc

View File

@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
June 13, 2006
June 14, 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.11rc1 are Y2K compliant. It is my belief that earlier
upward through 1.2.11rc2 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

View File

@ -4,6 +4,7 @@
#
# WARNING: if you run this you will change the versions
# of the tools which are used and, maybe, required!
touch Makefile.am configure.ac
{
echo "running libtoolize" >&2
libtoolize --copy --automake

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.59 for libpng 1.2.11rc1.
# Generated by GNU Autoconf 2.59 for libpng 1.2.11rc2.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.2.11rc1'
PACKAGE_STRING='libpng 1.2.11rc1'
PACKAGE_VERSION='1.2.11rc2'
PACKAGE_STRING='libpng 1.2.11rc2'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
@ -954,7 +954,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.11rc1 to adapt to many kinds of systems.
\`configure' configures libpng 1.2.11rc2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1020,7 +1020,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.2.11rc1:";;
short | recursive ) echo "Configuration of libpng 1.2.11rc2:";;
esac
cat <<\_ACEOF
@ -1167,7 +1167,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.2.11rc1
libpng configure 1.2.11rc2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@ -1181,7 +1181,7 @@ cat >&5 <<_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.11rc1, which was
It was created by libpng $as_me 1.2.11rc2, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@ -1824,7 +1824,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.2.11rc1'
VERSION='1.2.11rc2'
cat >>confdefs.h <<_ACEOF
@ -1979,7 +1979,7 @@ fi
PNGLIB_VERSION=1.2.11rc1
PNGLIB_VERSION=1.2.11rc2
PNGLIB_MAJOR=12
PNGLIB_MINOR=11
@ -20681,7 +20681,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by libpng $as_me 1.2.11rc1, which was
This file was extended by libpng $as_me 1.2.11rc2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -20744,7 +20744,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
libpng config.status 1.2.11rc1
libpng config.status 1.2.11rc2
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

View File

@ -18,12 +18,12 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
AC_INIT([libpng], [1.2.11rc1], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.2.11rc2], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
PNGLIB_VERSION=1.2.11rc1
PNGLIB_VERSION=1.2.11rc2
PNGLIB_MAJOR=12
PNGLIB_MINOR=11

View File

@ -1,6 +1,6 @@
.TH LIBPNG 3 "June 13, 2006"
.TH LIBPNG 3 "June 14, 2006"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11rc1
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11rc2
.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.11rc1 - June 13, 2006
libpng version 1.2.11rc2 - June 14, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@ -3738,13 +3738,13 @@ application:
.SH IX. Y2K Compliance in libpng
June 13, 2006
June 14, 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.11rc1 are Y2K compliant. It is my belief that earlier
upward through 1.2.11rc2 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
@ -3905,8 +3905,8 @@ the first widely used release:
1.2.10rc1-3 13 10210 12.so.0.10[.0]
1.2.10 13 10210 12.so.0.10[.0]
1.2.11beta1-4 13 10211 12.so.0.11[.0]
1.0.19rc1 10 10019 10.so.0.19[.0]
1.2.11rc1 13 10211 12.so.0.11[.0]
1.0.19rc1-2 10 10019 10.so.0.19[.0]
1.2.11rc1-2 13 10211 12.so.0.11[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@ -3962,7 +3962,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.2.11rc1 - June 13, 2006:
Libpng version 1.2.11rc2 - June 14, 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).
@ -3983,7 +3983,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.11rc1, June 13, 2006, are
libpng versions 1.2.6, August 15, 2004, through 1.2.11rc2, June 14, 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
@ -4082,7 +4082,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
June 13, 2006
June 14, 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.11rc1 - June 13, 2006
libpng version 1.2.11rc2 - June 14, 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
June 13, 2006
June 14, 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.11rc1 are Y2K compliant. It is my belief that earlier
upward through 1.2.11rc2 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 "June 13, 2006"
.TH LIBPNGPF 3 "June 14, 2006"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11rc1
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11rc2
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "June 13, 2006"
.TH PNG 5 "June 14, 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_11rc1 Your_png_h_is_not_version_1_2_11rc1;
typedef version_1_2_11rc2 Your_png_h_is_not_version_1_2_11rc2;
/* 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)
{
if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */
return ((png_charp) "\n libpng version 1.2.11rc1 - June 13, 2006\n\
return ((png_charp) "\n libpng version 1.2.11rc2 - June 14, 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");

45
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.2.11rc1 - June 13, 2006
* libpng version 1.2.11rc2 - June 14, 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.11rc1 - June 13, 2006: Glenn
* libpng versions 0.97, January 1998, through 1.2.11rc2 - June 14, 2006: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -120,8 +120,8 @@
* 1.2.10rc1-3 13 10210 12.so.0.10[.0]
* 1.2.10 13 10210 12.so.0.10[.0]
* 1.2.11beta1-4 13 10211 12.so.0.11[.0]
* 1.0.19rc1 10 10019 10.so.0.19[.0]
* 1.2.11rc1 13 10211 12.so.0.11[.0]
* 1.0.19rc1-2 10 10019 10.so.0.19[.0]
* 1.2.11rc1-2 13 10211 12.so.0.11[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@ -151,7 +151,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.11rc1, June 13, 2006, are
* libpng versions 1.2.6, August 15, 2004, through 1.2.11rc2, June 14, 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:
@ -263,13 +263,13 @@
* Y2K compliance in libpng:
* =========================
*
* June 13, 2006
* June 14, 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.11rc1 are Y2K compliant. It is my belief that earlier
* upward through 1.2.11rc2 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
@ -325,9 +325,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.11rc1"
#define PNG_LIBPNG_VER_STRING "1.2.11rc2"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.2.11rc1 - June 13, 2006 (header)\n"
" libpng version 1.2.11rc2 - June 14, 2006 (header)\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@ -339,7 +339,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 1
#define PNG_LIBPNG_VER_BUILD 2
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@ -1369,7 +1369,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_11rc1;
typedef png_structp version_1_2_11rc2;
typedef png_struct FAR * FAR * png_structpp;
@ -3441,6 +3441,29 @@ PNG_EXTERN void png_do_write_intrapixel PNGARG((png_row_infop row_info,
/* png.c */ /* PRIVATE */
PNG_EXTERN void png_init_mmx_flags PNGARG((png_structp png_ptr));
#endif
#if defined(PNG_INCH_CONVERSIONS) && defined(PNG_FLOATING_POINT_SUPPORTED)
PNG_EXTERN png_uint_32 png_get_pixels_per_inch PNGARG((png_structp png_ptr,
png_infop info_ptr));
PNG_EXTERN png_uint_32 png_get_x_pixels_per_inch PNGARG((png_structp png_ptr,
png_infop info_ptr));
PNG_EXTERN png_uint_32 png_get_y_pixels_per_inch PNGARG((png_structp png_ptr,
png_infop info_ptr));
PNG_EXTERN float png_get_x_offset_inches PNGARG((png_structp png_ptr,
png_infop info_ptr));
PNG_EXTERN float png_get_y_offset_inches PNGARG((png_structp png_ptr,
png_infop info_ptr));
#if defined(PNG_pHYs_SUPPORTED)
PNG_EXTERN png_uint_32 png_get_pHYs_dpi PNGARG((png_structp png_ptr,
png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
#endif /* PNG_pHYs_SUPPORTED */
#endif /* PNG_INCH_CONVERSIONS && PNG_FLOATING_POINT_SUPPORTED */
/* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */
#endif /* PNG_INTERNAL */

View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.2.11rc1 - June 13, 2006
* libpng version 1.2.11rc2 - June 14, 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)
@ -1082,8 +1082,13 @@
* want to have unsigned int for png_uint_32 instead of unsigned long.
*/
#if (__WORDSIZE == 64) || defined(_LP64) || (_MIPS_SZLONG == 64)
typedef unsigned int png_uint_32;
typedef int png_int_32;
#else
typedef unsigned long png_uint_32;
typedef long png_int_32;
#endif
typedef unsigned short png_uint_16;
typedef short png_int_16;
typedef unsigned char png_byte;

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_11rc1 your_png_h_is_not_version_1_2_11rc1;
typedef version_1_2_11rc2 your_png_h_is_not_version_1_2_11rc2;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.11rc1
PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -185,7 +185,7 @@ test-dd:
echo Testing installed dynamic shared library in $(DL).
$(CC) -I$(DI) $(CFLAGS) \
`$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
-L$(DL) -L$(ZLIBLIB) -W1,-rpath $(ZLIBLIB):$(DL) \
-L$(DL) -L$(ZLIBLIB) -Wl,-rpath $(ZLIBLIB):$(DL) \
-o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
./pngtestd pngtest.png

View File

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

View File

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

View File

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

View File

@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.11rc1
PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -229,7 +229,7 @@ test-dd:
echo Testing installed dynamic shared library in $(DL).
$(CC) -I$(DI) -I$(ZLIBINC) \
`$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
-L$(DL) -L$(ZLIBLIB) -W1, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
-L$(DL) -L$(ZLIBLIB) -Wl, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
-o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
./pngtestd pngtest.png

View File

@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.11rc1
PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -235,7 +235,7 @@ test-dd:
echo Testing installed dynamic shared library in $(DL).
$(CC) -I$(DI) -I$(ZLIBINC) \
`$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
-L$(DL) -L$(ZLIBLIB) -W1, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
-L$(DL) -L$(ZLIBLIB) -Wl, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
-o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
./pngtestd pngtest.png

View File

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

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.11rc1
PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -197,7 +197,7 @@ test-dd:
echo Testing installed dynamic shared library in $(DL).
$(CC) -I$(DI) -I$(ZLIBINC) \
`$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
-L$(DL) -L$(ZLIBLIB) -W1,-rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
-L$(DL) -L$(ZLIBLIB) -Wl,-rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
-o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
./pngtestd pngtest.png

View File

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

View File

@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.11rc1
PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -203,7 +203,7 @@ test-dd:
echo Testing installed dynamic shared library in $(DL).
$(CC) -I$(DI) -I$(ZLIBINC) \
`$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
-L$(DL) -L$(ZLIBLIB) -W1, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
-L$(DL) -L$(ZLIBLIB) -Wl, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
-o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
./pngtestd pngtest.png

View File

@ -76,7 +76,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
MINGDLL = 12
PNGMIN = 1.2.11rc1
PNGMIN = 1.2.11rc2
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.11rc1
SHLIB_MINOR= 1.2.11rc2
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.11rc1
SHLIB_MINOR= 1.2.11rc2
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.11rc1
SHLIB_MINOR= 1.2.11rc2
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.11rc1
PNGMIN = 1.2.11rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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