Imported from libpng-1.4.0beta10.tar

This commit is contained in:
Glenn Randers-Pehrson 2006-07-12 13:33:47 -05:00
parent e826d7e200
commit 3424ee7354
51 changed files with 180 additions and 146 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.4.0beta9 - July 3, 2006
Libpng 1.4.0beta10 - July 12, 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,27 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
1.4.0beta9.tar.gz
1.4.0beta9.tar.bz2
1.4.0beta10.tar.gz
1.4.0beta10.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
1.4.0beta9-no-config.tar.gz
1.4.0beta9-no-config.tar.bz2
1.4.0beta10-no-config.tar.gz
1.4.0beta10-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lp140b09.zip
lp140b09.tar.bz2
Project files
1.4.0beta9-project-netware.zip
1.4.0beta9-project-wince.zip
lp140b10.zip
lp140b10.tar.bz2
Other information:
1.4.0beta9-README.txt
1.4.0beta9-KNOWNBUGS.txt
1.4.0beta9-LICENSE.txt
1.4.0beta9-Y2K-compliance.txt
1.4.0beta10-README.txt
1.4.0beta10-KNOWNBUGS.txt
1.4.0beta10-LICENSE.txt
1.4.0beta10-Y2K-compliance.txt
Changes since the last public release (1.2.10):
@ -165,6 +160,9 @@ version 1.4.0beta9 [July 3, 2006]
Removed WINCE and Netware projects.
Removed standalone Y2KINFO file.
version 1.4.0beta10 [July 12, 2006]
Added "all: pngconf.h.in pngconf.h" target to 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

View File

@ -1659,6 +1659,13 @@ version 1.4.0beta9 [July 3, 2006]
Removed WINCE and Netware projects.
Removed standalone Y2KINFO file.
version 1.4.0beta10 [July 12, 2006]
Eliminated automatic copy of pngconf.h to pngconf.h.in from configure and
some makefiles, because it was not working reliably. Instead, distribute
pngconf.h.in along with pngconf.h and cause configure and some of the
makefiles to update pngconf.h from pngconf.h.in.
Added pngconf.h to DEPENDENCIES in Makefile.am
version 1.4.0betaN [future]
Cleaned up error and warning messages.
Build shared libraries with -lz and sometimes -lm.

24
INSTALL
View File

@ -1,5 +1,5 @@
Installing libpng version 1.4.0beta9 - July 3, 2006
Installing libpng version 1.4.0beta10 - July 12, 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.4.0beta9" or "lpng109" and "zlib-1.2.1"
might be called "libpng-1.4.0beta10" 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:
@ -76,11 +76,7 @@ If you are building libpng with MSVC, you can enter the
libpng projects\visualc6 directory and follow the instructions in
projects\visualc6\README.txt.
You can build libpng for WindowsCE by downloading and installing
the projects\wince directory as instructed in the projects\wince.txt file, and
then following the instructions in the README* files. Similarly, you can
build libpng for Netware or Beos as instructed in projects\netware.txt
or projects\beos.
You can build libpng for beos as instructed in projects\beos.
Else enter the zlib directory and follow the instructions in zlib/README,
then come back here and run "configure" or choose the appropriate
@ -91,11 +87,11 @@ include
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng14.so.1.1.4.0beta9)
gcc, creates libpng14.so.1.1.4.0beta10)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng14.so.1.1.4.0beta9)
(gcc, creates libpng14.so.1.1.4.0beta10)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng14.so.1.1.4.0beta9,
(gcc, creates libpng14.so.1.1.4.0beta10,
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
@ -118,12 +114,12 @@ include
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.sggcc => Silicon Graphics (gcc,
creates libpng14.so.1.1.4.0beta9)
creates libpng14.so.1.1.4.0beta10)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng14.so.1.1.4.0beta9)
creates libpng14.so.1.1.4.0beta10)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng14.so.1.1.4.0beta9)
creates libpng14.so.1.1.4.0beta10)
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
@ -208,6 +204,6 @@ CFLAGS="-Wall -O3 -funroll-loops \
--with-pkgconfigdir=/usr/lib/pkgconfig --includedir=/usr/include
You can alternatively specify --includedir=/usr/include, /usr/local/include,
/usr/include/png12, or whatever.
/usr/include/png%N%, or whatever.

20
INSTALL1 Normal file
View File

@ -0,0 +1,20 @@
Using the ./configure script -- 16 December 2002.
=================================================
The ./configure script should work compatibly with what scripts/makefile.*
did, however there are some options you need to add to configure explicitly,
which previously was done semi-automatically (if you didn't edit
scripts/makefile.* yourself, that is)
CFLAGS="-Wall -O3 -funroll-loops \
-malign-loops=2 -malign-functions=2" ./configure --prefix=/usr/include \
--with-pkgconfigdir=/usr/lib/pkgconfig --includedir=/usr/include
You can alternatively specify --includedir=/usr/include, /usr/local/include,
/usr/include/png14, or whatever.

View File

@ -1,5 +1,5 @@
Known bugs in libpng version 1.4.0beta9
Known bugs in libpng version 1.4.0beta10
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.4.0beta9, July 3, 2006, are
libpng versions 1.2.6, August 15, 2004, through 1.4.0beta10, July 12, 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
July 3, 2006
July 12, 2006

View File

@ -90,13 +90,15 @@ CLEANFILES= pngout.png libpng14.pc libpng14-config libpng.vers libpng.sym
pngconf.h.in:
cat pngconf.h > pngconf.h.in
pngconf.h: pngconf.h.in
pngconf.h: pngconf.h.in
sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
@if test -n "@LIBPNG_NO_MMX@"; then \
echo "#define PNG_NO_MMX_CODE" >> pngconf.h; \
fi
sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h
all: pngconf.h.in pngconf.h
$(PNGLIB_BASENAME).pc: libpng.pc
cp libpng.pc $@

View File

@ -1233,13 +1233,15 @@ uninstall-man: uninstall-man3 uninstall-man5
pngconf.h.in:
cat pngconf.h > pngconf.h.in
pngconf.h: pngconf.h.in
pngconf.h: pngconf.h.in
sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
@if test -n "@LIBPNG_NO_MMX@"; then \
echo "#define PNG_NO_MMX_CODE" >> pngconf.h; \
fi
sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h
all: pngconf.h.in pngconf.h
$(PNGLIB_BASENAME).pc: libpng.pc
cp libpng.pc $@

20
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.4.0beta9 - July 3, 2006 (shared library 14.0)
README for libpng version 1.4.0beta10 - July 12, 2006 (shared library 14.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@ -180,21 +180,15 @@ Files in this distribution:
and zlib
visualc6 => Contains a Microsoft Visual C++ (MSVC) workspace
for building libpng and zlib
netware.txt => Contains instructions for downloading a set of
project files for building libpng and zlib on
Netware.
wince.txt => Contains instructions for downloading a Microsoft
Visual C++ (Windows CD Toolkit) workspace for
building libpng and zlib on WindowsCE
scripts => Directory containing scripts for building libpng:
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 libpng14.so.1.1.4.0beta9)
gcc, creates libpng14.so.1.1.4.0beta10)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng14.so.1.1.4.0beta9)
(gcc, creates libpng14.so.1.1.4.0beta10)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng14.so.1.1.4.0beta9,
(gcc, creates libpng14.so.1.1.4.0beta10,
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 +210,12 @@ Files in this distribution:
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
(gcc, creates libpng14.so.1.1.4.0beta9)
(gcc, creates libpng14.so.1.1.4.0beta10)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng14.so.1.1.4.0beta9)
(gcc, creates libpng14.so.1.1.4.0beta10)
makefile.so9 => Solaris 9 makefile
(gcc, creates libpng14.so.1.1.4.0beta9)
(gcc, creates libpng14.so.1.1.4.0beta10)
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

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.4.0beta9.
# Generated by GNU Autoconf 2.59 for libpng 1.4.0beta10.
#
# 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.4.0beta9'
PACKAGE_STRING='libpng 1.4.0beta9'
PACKAGE_VERSION='1.4.0beta10'
PACKAGE_STRING='libpng 1.4.0beta10'
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.4.0beta9 to adapt to many kinds of systems.
\`configure' configures libpng 1.4.0beta10 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.4.0beta9:";;
short | recursive ) echo "Configuration of libpng 1.4.0beta10:";;
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.4.0beta9
libpng configure 1.4.0beta10
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.4.0beta9, which was
It was created by libpng $as_me 1.4.0beta10, 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.4.0beta9'
VERSION='1.4.0beta10'
cat >>confdefs.h <<_ACEOF
@ -1979,7 +1979,7 @@ fi
PNGLIB_VERSION=1.4.0beta9
PNGLIB_VERSION=1.4.0beta10
PNGLIB_MAJOR=14
PNGLIB_MINOR=0
@ -20683,7 +20683,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by libpng $as_me 1.4.0beta9, which was
This file was extended by libpng $as_me 1.4.0beta10, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -20746,7 +20746,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
libpng config.status 1.4.0beta9
libpng config.status 1.4.0beta10
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.4.0beta9], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.4.0beta10], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
PNGLIB_VERSION=1.4.0beta9
PNGLIB_VERSION=1.4.0beta10
PNGLIB_MAJOR=14
PNGLIB_MINOR=0

View File

@ -1,6 +1,6 @@
.TH LIBPNG 3 "July 3, 2006"
.TH LIBPNG 3 "July 12, 2006"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta9
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta10
.SH SYNOPSIS
\fI\fB
@ -833,7 +833,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.4.0beta9 - July 3, 2006
libpng version 1.4.0beta10 - July 12, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@ -3748,13 +3748,13 @@ application:
.SH IX. Y2K Compliance in libpng
July 3, 2006
July 12, 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.4.0beta9 are Y2K compliant. It is my belief that earlier
upward through 1.4.0beta10 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
@ -3916,7 +3916,10 @@ the first widely used release:
1.2.10 13 10210 12.so.0.10[.0]
1.4.0beta1-6 14 10400 14.so.0.0[.0]
1.2.11beta1-4 13 10210 12.so.0.10[.0]
1.4.0beta7-9 14 10400 14.so.0.0[.0]
1.4.0beta7-8 14 10400 14.so.0.0[.0]
1.2.11 13 10211 12.so.0.10[.0]
1.2.12 13 10212 12.so.0.10[.0]
1.4.0beta9-10 14 10400 14.so.0.0[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@ -3972,7 +3975,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.4.0beta9 - July 3, 2006:
Libpng version 1.4.0beta10 - July 12, 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).
@ -3993,7 +3996,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.4.0beta9, July 3, 2006, are
libpng versions 1.2.6, August 15, 2004, through 1.4.0beta10, July 12, 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
@ -4092,7 +4095,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
July 3, 2006
July 12, 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.4.0beta9 - July 3, 2006
libpng version 1.4.0beta10 - July 12, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@ -2915,13 +2915,13 @@ application:
IX. Y2K Compliance in libpng
July 3, 2006
July 12, 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.4.0beta9 are Y2K compliant. It is my belief that earlier
upward through 1.4.0beta10 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 "July 3, 2006"
.TH LIBPNGPF 3 "July 12, 2006"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta9
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta10
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "July 3, 2006"
.TH PNG 5 "July 12, 2006"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION

4
png.c
View File

@ -13,7 +13,7 @@
#include "pngintrn.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_4_0beta9 Your_png_h_is_not_version_1_4_0beta9;
typedef version_1_4_0beta10 Your_png_h_is_not_version_1_4_0beta10;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@ -637,7 +637,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.4.0beta9 - July 3, 2006\n\
return ((png_charp) "\n libpng version 1.4.0beta10 - July 12, 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");

23
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.4.0beta9 - July 3, 2006
* libpng version 1.4.0beta10 - July 12, 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.4.0beta9 - July 3, 2006: Glenn
* libpng versions 0.97, January 1998, through 1.4.0beta10 - July 12, 2006: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -121,7 +121,10 @@
* 1.2.10 13 10210 12.so.0.10[.0]
* 1.4.0beta1-5 14 10400 14.so.0.0[.0]
* 1.2.11beta1-4 13 10210 12.so.0.10[.0]
* 1.4.0beta7-9 14 10400 14.so.0.0[.0]
* 1.4.0beta7-8 14 10400 14.so.0.0[.0]
* 1.2.11 13 10211 12.so.0.10[.0]
* 1.2.12 13 10212 12.so.0.10[.0]
* 1.4.0beta9-10 14 10400 14.so.0.0[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@ -151,7 +154,7 @@
* If you modify libpng you may insert additional notices immediately following
* this sentence.
*
* libpng versions 1.2.6, August 15, 2004, through 1.4.0beta9, July 3, 2006, are
* libpng versions 1.2.6, August 15, 2004, through 1.4.0beta10, July 12, 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 +266,13 @@
* Y2K compliance in libpng:
* =========================
*
* July 3, 2006
* July 12, 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.4.0beta9 are Y2K compliant. It is my belief that earlier
* upward through 1.4.0beta10 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 +328,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.4.0beta9"
#define PNG_LIBPNG_VER_STRING "1.4.0beta10"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.4.0beta9 - July 3, 2006 (header)\n"
" libpng version 1.4.0beta10 - July 12, 2006 (header)\n"
#define PNG_LIBPNG_VER_SONUM 1
#define PNG_LIBPNG_VER_DLLNUM 14
@ -339,7 +342,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 9
#define PNG_LIBPNG_VER_BUILD 10
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@ -1363,7 +1366,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_4_0beta9;
typedef png_structp version_1_4_0beta10;
typedef png_struct FAR * FAR * png_structpp;

View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.4.0beta9 - July 3, 2006
* libpng version 1.4.0beta10 - July 12, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1,7 +1,7 @@
/* pngintrn.h - internal header file for libpng
*
* libpng version 1.4.0beta9 - July 3, 2006
* libpng version 1.4.0beta10 - July 12, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1609,4 +1609,4 @@ main(int argc, char *argv[])
}
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_4_0beta9 your_png_h_is_not_version_1_4_0beta9;
typedef version_1_4_0beta10 your_png_h_is_not_version_1_4_0beta10;

View File

@ -8,7 +8,7 @@
# Modeled after libxml-config.
version=1.4.0beta9
version=1.4.0beta10
prefix=""
libdir=""
libs=""

View File

@ -5,6 +5,6 @@ includedir=@includedir@/libpng14
Name: libpng
Description: Loads and saves PNG files
Version: 1.4.0beta9
Version: 1.4.0beta10
Libs: -L${libdir} -lpng14
Cflags: -I${includedir}

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -10,7 +10,6 @@ CMHGflags =
LibFileflags = -c -l -o $@
Squeezeflags = -o $@
# Final targets:
@.libpng-lib: @.o.png @.o.pngerror @.o.pngrio @.o.pngwio @.o.pngmem \
@.o.pngpread @.o.pngset @.o.pngget @.o.pngread @.o.pngrtran \

View File

@ -20,7 +20,7 @@ LN_SF = ln -f -s
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -65,7 +65,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng14
PNGMAJ = 1
CYGDLL = 14
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
@ -112,12 +112,13 @@ OBJSDLL = $(OBJS:.o=.pic.o)
%.pic.o : %.c
$(CC) -c $(CFLAGS) -o $@ $<
all: all-static all-shared libpng.pc libpng-config libpng.pc libpng-config
all: all-static all-shared libpng.pc libpng-config libpng.pc libpng-config \
pngconf.h
pngconf.h.in:
pngconf.h.in: pngconf.h
cat pngconf.h > pngconf.h.in
pngconf.h: pngconf.h.in
pngconf.h: pngconf.h.in
sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
/* if you don't want to use the intel MMX code, uncomment this */

View File

@ -19,7 +19,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14

View File

@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -24,7 +24,9 @@ SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \
LDADD+= -lm -lz
DPADD+= ${LIBM} ${LIBZ}
pngconf.h.in:
all: pngconf.h
pngconf.h.in: pngconf.h
cat pngconf.h > pngconf.h.in
pngconf.h: pngconf.h.in

View File

@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -103,9 +103,10 @@ OBJSDLL = $(OBJS:.o=.pic.o)
.c.pic.o:
$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config
all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config \
pngconf.h
pngconf.h.in:
pngconf.h.in: pngconf.h
cat pngconf.h > pngconf.h.in
# Remove the line with #define PNG_THREAD_UNSAFE_OK if you need thread safety

View File

@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -46,9 +46,9 @@ pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O) \
pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O) pngvcrd$(O)
all: test
all: test pngconf.h
pngconf.h.in:
pngconf.h.in: pngconf.h
cat pngconf.h > pngconf.h.in
# Remove the line with #define PNG_THREAD_UNSAFE_OK if you need thread safety

View File

@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -66,7 +66,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng14
PNGMAJ = 1
MINGDLL = 14
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
@ -113,9 +113,10 @@ OBJSDLL = $(OBJS:.o=.pic.o)
%.pic.o : %.c
$(CC) -c $(CFLAGS) -o $@ $<
all: all-static all-shared libpng.pc libpng-config libpng.pc libpng-config
all: all-static all-shared libpng.pc libpng-config libpng.pc libpng-config \
pngconf.h
pngconf.h.in:
pngconf.h.in: pngconf.h
cat pngconf.h > pngconf.h.in
pngconf.h: pngconf.h.in

View File

@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng14
LIB= png12
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.4.0beta9
SHLIB_MINOR= 1.4.0beta10
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
@ -25,7 +25,9 @@ CPPFLAGS+=-I${.CURDIR}
CLEANFILES+=pngtest.o pngtest
pngconf.h.in:
all: pngconf.h
pngconf.h.in: pngconf.h
cat pngconf.h > pngconf.h.in
pngconf.h: pngconf.h.in

View File

@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng
LIB= png
SHLIB_MAJOR= 3
SHLIB_MINOR= 1.4.0beta9
SHLIB_MINOR= 1.4.0beta10
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
@ -24,10 +24,12 @@ CPPFLAGS+=-I${.CURDIR}
CLEANFILES+=pngtest.o pngtest
pngconf.h.in:
all: pngconf.h
pngconf.h.in: pngconf.h
cat pngconf.h > pngconf.h.in
pngconf.h: pngconf.h.in
pngconf.h: pngconf.h.in
sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
/* if you don't want to use the intel MMX code, uncomment this */

View File

@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.4.0beta9
SHLIB_MINOR= 1.4.0beta10
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
@ -20,10 +20,12 @@ HDRS= png.h pngconf.h
CFLAGS+= -Wall
CPPFLAGS+= -I${.CURDIR}
pngconf.h.in:
all: pngconf.h
pngconf.h.in: pngconf.h
cat pngconf.h > pngconf.h.in
pngconf.h: pngconf.h.in
pngconf.h: pngconf.h.in
sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
/* if you want to use the intel assembler code, remove this */

View File

@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -76,12 +76,12 @@ OBJS = pnggccrd.o png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
pngwtran.o pngmem.o pngerror.o pngpread.o
all: libpng.a pngtest shared libpng.pc libpng-config
all: libpng.a pngtest shared libpng.pc libpng-config pngconf.h
pngconf.h.in:
pngconf.h.in: pngconf.h
cat pngconf.h > pngconf.h.in
pngconf.h: pngconf.h.in
pngconf.h: pngconf.h.in
sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
/* if you don't want to use the intel MMX code, uncomment this */
@ -238,5 +238,4 @@ pngwrite.o: png.h pngconf.h pngintrn.h
pngwtran.o: png.h pngconf.h pngintrn.h
pngwutil.o: png.h pngconf.h pngintrn.h
pngpread.o: png.h pngconf.h pngintrn.h
pnggccrd.o: png.h pngconf.h pngintrn.h

View File

@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 1
PNGMIN = 1.4.0beta9
PNGMIN = 1.4.0beta10
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -76,12 +76,12 @@ OBJSDLL = $(OBJS:.o=.pic.o)
.c.pic.o:
$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config pngconf.h
pngconf.h.in:
pngconf.h.in: pngconf.h
cat pngconf.h > pngconf.h.in
pngconf.h: pngconf.h.in
pngconf.h: pngconf.h.in
sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
echo "#define PNG_NO_MMX_CODE" >> pngconf.h
sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h

View File

@ -31,12 +31,12 @@ OBJS4 = pngvcrd$(O)
OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4)
# Targets
all: libpng.lib
all: libpng.lib pngconf.h
pngconf.h.in:
pngconf.h.in: pngconf.h
cat pngconf.h > pngconf.h.in
pngconf.h: pngconf.h.in
pngconf.h: pngconf.h.in
sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
echo "#define PNG_USE_PNGVCRD" >> pngconf.h
sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h

View File

@ -30,12 +30,12 @@ OBJS3 = pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
OBJS = $(OBJS1) $(OBJS2) $(OBJS3)
# Targets
all: libpng.lib
all: libpng.lib pngconf.h
pngconf.h.in:
pngconf.h.in: pngconf.h
cat pngconf.h > pngconf.h.in
pngconf.h: pngconf.h.in
pngconf.h: pngconf.h.in
sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
echo "#define PNG_NO_MMX_CODE" >> pngconf.h
sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h

View File

@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
; Version 1.4.0beta9
; Version 1.4.0beta10
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"

View File

@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.4.0beta9
;Version 1.4.0beta10
png_build_grayscale_palette
png_chunk_error
png_chunk_warning