minecraft-pi-reborn/libpng
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Imported from libpng-1.2.15beta5.tar

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2006-12-07 19:21:29 -06:00
parent 05db10fda3
commit a0113ee049
47 changed files with 198 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.2.15beta4 - December 7, 2006 Libpng 1.2.15beta5 - December 8, 2006
This is not intended to be a public release. It will be replaced 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. 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 Source files with LF line endings (for Unix/Linux) and with a
"configure" script "configure" script
libpng-1.2.15beta4.tar.gz libpng-1.2.15beta5.tar.gz
libpng-1.2.15beta4.tar.bz2 libpng-1.2.15beta5.tar.bz2
Source files with LF line endings (for Unix/Linux) without the Source files with LF line endings (for Unix/Linux) without the
"configure" script "configure" script
libpng-1.2.15beta4-no-config.tar.gz libpng-1.2.15beta5-no-config.tar.gz
libpng-1.2.15beta4-no-config.tar.bz2 libpng-1.2.15beta5-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the Source files with CRLF line endings (for Windows), without the
"configure" script "configure" script
lp1215b04.zip lp1215b05.zip
lp1215b04.tar.bz2 lp1215b05.tar.bz2
Project files Project files
libpng-1.2.15beta4-project-netware.zip libpng-1.2.15beta5-project-netware.zip
libpng-1.2.15beta4-project-wince.zip libpng-1.2.15beta5-project-wince.zip
Other information: Other information:
libpng-1.2.15beta4-README.txt libpng-1.2.15beta5-README.txt
libpng-1.2.15beta4-KNOWNBUGS.txt libpng-1.2.15beta5-KNOWNBUGS.txt
libpng-1.2.15beta4-LICENSE.txt libpng-1.2.15beta5-LICENSE.txt
libpng-1.2.15beta4-Y2K-compliance.txt libpng-1.2.15beta5-Y2K-compliance.txt
Changes since the last public release (1.2.14): Changes since the last public release (1.2.14):
@ -48,10 +48,14 @@ version 1.2.15beta2 [December 3, 2006]
version 1.2.15beta3 [December 4, 2006] version 1.2.15beta3 [December 4, 2006]
Add "png_bytep" typecast to profile while calculating length in pngwutil.c Add "png_bytep" typecast to profile while calculating length in pngwutil.c
version 1.2.15beta4 [December 7, 2006] version 1.2.15beta4 [November 7, 2006]
Added scripts/CMakeLists.txt Added scripts/CMakeLists.txt
Changed PNG_NO_ASSEMBLER_CODE to PNG_NO_MMX_CODE in scripts, like 1.4.0beta Changed PNG_NO_ASSEMBLER_CODE to PNG_NO_MMX_CODE in scripts, like 1.4.0beta
version 1.2.15beta5 [December 8, 2006]
Changed some instances of PNG_ASSEMBER_* to PNG_MMX_* in pnggccrd.c
Revised scripts/CMakeLists.txt
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

4
CHANGES
View File

@ -1654,6 +1654,10 @@ version 1.2.15beta4 [December 7, 2006]
Added scripts/CMakeLists.txt Added scripts/CMakeLists.txt
Changed PNG_NO_ASSEMBLER_CODE to PNG_NO_MMX_CODE in scripts, like 1.4.0beta Changed PNG_NO_ASSEMBLER_CODE to PNG_NO_MMX_CODE in scripts, like 1.4.0beta
version 1.2.15beta5 [December 8, 2006]
Changed some instances of PNG_ASSEMBER_* to PNG_MMX_* in pnggccrd.c
Revised scripts/CMakeLists.txt
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

26
INSTALL
View File

@ -1,9 +1,9 @@
Installing libpng version 1.2.15beta4 - December 7, 2006 Installing libpng version 1.2.15beta5 - December 8, 2006
On Unix/Linux and similar systems, you can simply type On Unix/Linux and similar systems, you can simply type
./configure [--prefix=$HOME] ./configure [--prefix=/path]
make check make check
make install make install
@ -27,6 +27,13 @@ Instead, you can use one of the custom-built makefiles in the
Or you can use one of the "projects" in the "projects" directory. Or you can use one of the "projects" in the "projects" directory.
If you want to use "cmake" (see www.cmake.org), copy CMakeLists.txt
from the "scripts" directory to this directory and type
cmake . -DCMAKE_INSTALL_PREFIX=/path
make
make install
Before installing libpng, you must first install zlib, if it Before installing libpng, you must first install zlib, if it
is not already on your system. zlib can usually be found is not already on your system. zlib can usually be found
wherever you got libpng. zlib can be placed in another directory, wherever you got libpng. zlib can be placed in another directory,
@ -37,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. correspond to the version of zlib that's installed.
You can rename the directories that you downloaded (they You can rename the directories that you downloaded (they
might be called "libpng-1.2.15beta4" or "lpng109" and "zlib-1.2.1" might be called "libpng-1.2.15beta5" or "lpng109" and "zlib-1.2.1"
or "zlib121") so that you have directories called "zlib" and "libpng". or "zlib121") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this: Your directory structure should look like this:
@ -91,13 +98,14 @@ makefile.sys in the scripts directory.
The files that are presently available in the scripts directory The files that are presently available in the scripts directory
include include
CMakeLists.txt => "cmake" script
makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning, makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng12.so.0.1.2.15beta4) gcc, creates libpng12.so.0.1.2.15beta5)
makefile.linux => Linux/ELF makefile makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.15beta4) (gcc, creates libpng12.so.0.1.2.15beta5)
makefile.gcmmx => Linux/ELF makefile makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.15beta4, (gcc, creates libpng12.so.0.1.2.15beta5,
uses assembler code tuned for Intel MMX platform) uses assembler code tuned for Intel MMX platform)
makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with makefile.knr => Archaic UNIX Makefile that converts files with
@ -120,12 +128,12 @@ include
makefile.openbsd => OpenBSD makefile makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.sggcc => Silicon Graphics (gcc, makefile.sggcc => Silicon Graphics (gcc,
creates libpng12.so.0.1.2.15beta4) creates libpng12.so.0.1.2.15beta5)
makefile.sunos => Sun makefile makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc, makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng12.so.0.1.2.15beta4) creates libpng12.so.0.1.2.15beta5)
makefile.so9 => Solaris 9 makefile (gcc, makefile.so9 => Solaris 9 makefile (gcc,
creates libpng12.so.0.1.2.15beta4) creates libpng12.so.0.1.2.15beta5)
makefile.32sunu => Sun Ultra 32-bit makefile makefile.32sunu => Sun Ultra 32-bit makefile
makefile.64sunu => Sun Ultra 64-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc

7
KNOWNBUG
View File

@ -1,5 +1,5 @@
Known bugs in libpng version 1.2.15beta4 Known bugs in libpng version 1.2.15beta5
1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when 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 reading interlaced PNG files, when assembler code is enabled but running
@ -21,8 +21,3 @@ Known bugs in libpng version 1.2.15beta4
STATUS: For now, system library builders should use the custom makefiles. STATUS: For now, system library builders should use the custom makefiles.
4. November 15, 2006: On some platforms (e.g. x86_64), there are unsatisfied
references to some MMX functions.
STATUS: This is fixed in libpng-1.4.0, but in libpng-1.0.x and 1.2.x
you have to put PNG_NO_MMX_CODE manually into pngconf.h.

4
LICENSE
View File

@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
If you modify libpng you may insert additional notices immediately following If you modify libpng you may insert additional notices immediately following
this sentence. this sentence.
libpng versions 1.2.6, August 15, 2004, through 1.2.15beta4, December 7, 2006, are libpng versions 1.2.6, August 15, 2004, through 1.2.15beta5, December 8, 2006, are
Copyright (c) 2004, 2006 Glenn Randers-Pehrson, and are Copyright (c) 2004, 2006 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5 distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors 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 Glenn Randers-Pehrson
glennrp at users.sourceforge.net glennrp at users.sourceforge.net
December 7, 2006 December 8, 2006

14
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.2.15beta4 - December 7, 2006 (shared library 12.0) README for libpng version 1.2.15beta5 - December 8, 2006 (shared library 12.0)
See the note about version numbers near the top of png.h See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng. 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 descrip.mms => VMS makefile for MMS or MMK
makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning, makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng12.so.0.1.2.15beta4) gcc, creates libpng12.so.0.1.2.15beta5)
makefile.linux => Linux/ELF makefile makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.15beta4) (gcc, creates libpng12.so.0.1.2.15beta5)
makefile.gcmmx => Linux/ELF makefile makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.15beta4, (gcc, creates libpng12.so.0.1.2.15beta5,
uses assembler code tuned for Intel MMX platform) uses assembler code tuned for Intel MMX platform)
makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with makefile.knr => Archaic UNIX Makefile that converts files with
@ -216,12 +216,12 @@ Files in this distribution:
makefile.openbsd => OpenBSD makefile makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics makefile.sggcc => Silicon Graphics
(gcc, creates libpng12.so.0.1.2.15beta4) (gcc, creates libpng12.so.0.1.2.15beta5)
makefile.sunos => Sun makefile makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng12.so.0.1.2.15beta4) (gcc, creates libpng12.so.0.1.2.15beta5)
makefile.so9 => Solaris 9 makefile makefile.so9 => Solaris 9 makefile
(gcc, creates libpng12.so.0.1.2.15beta4) (gcc, creates libpng12.so.0.1.2.15beta5)
makefile.32sunu => Sun Ultra 32-bit makefile makefile.32sunu => Sun Ultra 32-bit makefile
makefile.64sunu => Sun Ultra 64-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc

4
Y2KINFO
View File

@ -1,13 +1,13 @@
Y2K compliance in libpng: Y2K compliance in libpng:
========================= =========================
December 7, 2006 December 8, 2006
Since the PNG Development group is an ad-hoc body, we can't make Since the PNG Development group is an ad-hoc body, we can't make
an official declaration. an official declaration.
This is your unofficial assurance that libpng from version 0.71 and This is your unofficial assurance that libpng from version 0.71 and
upward through 1.2.15beta4 are Y2K compliant. It is my belief that earlier upward through 1.2.15beta5 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant. versions were also Y2K compliant.
Libpng only has three year fields. One is a 2-byte unsigned integer Libpng only has three year fields. One is a 2-byte unsigned integer

22
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for libpng 1.2.15beta4. # Generated by GNU Autoconf 2.61 for libpng 1.2.15beta5.
# #
# Report bugs to <png-mng-implement@lists.sourceforge.net>. # Report bugs to <png-mng-implement@lists.sourceforge.net>.
# #
@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package. # Identity of this package.
PACKAGE_NAME='libpng' PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng' PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.2.15beta4' PACKAGE_VERSION='1.2.15beta5'
PACKAGE_STRING='libpng 1.2.15beta4' PACKAGE_STRING='libpng 1.2.15beta5'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c" ac_unique_file="pngget.c"
@ -1404,7 +1404,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures libpng 1.2.15beta4 to adapt to many kinds of systems. \`configure' configures libpng 1.2.15beta5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1474,7 +1474,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.2.15beta4:";; short | recursive ) echo "Configuration of libpng 1.2.15beta5:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1584,7 +1584,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
libpng configure 1.2.15beta4 libpng configure 1.2.15beta5
generated by GNU Autoconf 2.61 generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1598,7 +1598,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by libpng $as_me 1.2.15beta4, which was It was created by libpng $as_me 1.2.15beta5, which was
generated by GNU Autoconf 2.61. Invocation command line was generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@ $ $0 $@
@ -2268,7 +2268,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='libpng' PACKAGE='libpng'
VERSION='1.2.15beta4' VERSION='1.2.15beta5'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -2439,7 +2439,7 @@ fi
PNGLIB_VERSION=1.2.15beta4 PNGLIB_VERSION=1.2.15beta5
PNGLIB_MAJOR=12 PNGLIB_MAJOR=12
PNGLIB_MINOR=15 PNGLIB_MINOR=15
@ -21116,7 +21116,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by libpng $as_me 1.2.15beta4, which was This file was extended by libpng $as_me 1.2.15beta5, which was
generated by GNU Autoconf 2.61. Invocation command line was generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -21169,7 +21169,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\ ac_cs_version="\\
libpng config.status 1.2.15beta4 libpng config.status 1.2.15beta5
configured by $0, generated by GNU Autoconf 2.61, configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

4
configure.ac
View File

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

18
libpng.3
View File

@ -1,6 +1,6 @@
.TH LIBPNG 3 "December 7, 2006" .TH LIBPNG 3 "December 8, 2006"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.15beta4 libpng \- Portable Network Graphics (PNG) Reference Library 1.2.15beta5
.SH SYNOPSIS .SH SYNOPSIS
\fB \fB
#include <png.h>\fP #include <png.h>\fP
@ -410,7 +410,7 @@ Following is a copy of the libpng.txt file that accompanies libpng.
.SH LIBPNG.TXT .SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng libpng.txt - A description on how to use and modify libpng
libpng version 1.2.15beta4 - December 7, 2006 libpng version 1.2.15beta5 - December 8, 2006
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net> <glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson Copyright (c) 1998-2005 Glenn Randers-Pehrson
@ -3327,13 +3327,13 @@ application:
.SH IX. Y2K Compliance in libpng .SH IX. Y2K Compliance in libpng
December 7, 2006 December 8, 2006
Since the PNG Development group is an ad-hoc body, we can't make Since the PNG Development group is an ad-hoc body, we can't make
an official declaration. an official declaration.
This is your unofficial assurance that libpng from version 0.71 and This is your unofficial assurance that libpng from version 0.71 and
upward through 1.2.15beta4 are Y2K compliant. It is my belief that earlier upward through 1.2.15beta5 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant. versions were also Y2K compliant.
Libpng only has three year fields. One is a 2-byte unsigned integer that Libpng only has three year fields. One is a 2-byte unsigned integer that
@ -3506,7 +3506,7 @@ the first widely used release:
1.2.14beta1-2 13 10214 12.so.0.14[.0] 1.2.14beta1-2 13 10214 12.so.0.14[.0]
1.0.22rc1 10 10022 10.so.0.22[.0] 1.0.22rc1 10 10022 10.so.0.22[.0]
1.2.14rc1 13 10214 12.so.0.14[.0] 1.2.14rc1 13 10214 12.so.0.14[.0]
1.2.15beta1-4 13 10215 12.so.0.15[.0] 1.2.15beta1-5 13 10215 12.so.0.15[.0]
Henceforth the source version will match the shared-library minor Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be and patch numbers; the shared-library major version number will be
@ -3562,7 +3562,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation. Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.2.15beta4 - December 7, 2006: Libpng version 1.2.15beta5 - December 8, 2006:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@ -3583,7 +3583,7 @@ included in the libpng distribution, the latter shall prevail.)
If you modify libpng you may insert additional notices immediately following If you modify libpng you may insert additional notices immediately following
this sentence. this sentence.
libpng versions 1.2.6, August 15, 2004, through 1.2.15beta4, December 7, 2006, are libpng versions 1.2.6, August 15, 2004, through 1.2.15beta5, December 8, 2006, are
Copyright (c) 2004-2006 Glenn Randers-Pehrson, and are Copyright (c) 2004-2006 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5 distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors with the following individual added to the list of Contributing Authors
@ -3682,7 +3682,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson Glenn Randers-Pehrson
glennrp at users.sourceforge.net glennrp at users.sourceforge.net
December 7, 2006 December 8, 2006
.\" end of man page .\" end of man page

6
libpng.txt
View File

@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng libpng.txt - A description on how to use and modify libpng
libpng version 1.2.15beta4 - December 7, 2006 libpng version 1.2.15beta5 - December 8, 2006
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net> <glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson Copyright (c) 1998-2005 Glenn Randers-Pehrson
@ -2917,13 +2917,13 @@ application:
IX. Y2K Compliance in libpng IX. Y2K Compliance in libpng
December 7, 2006 December 8, 2006
Since the PNG Development group is an ad-hoc body, we can't make Since the PNG Development group is an ad-hoc body, we can't make
an official declaration. an official declaration.
This is your unofficial assurance that libpng from version 0.71 and This is your unofficial assurance that libpng from version 0.71 and
upward through 1.2.15beta4 are Y2K compliant. It is my belief that earlier upward through 1.2.15beta5 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant. versions were also Y2K compliant.
Libpng only has three year fields. One is a 2-byte unsigned integer that Libpng only has three year fields. One is a 2-byte unsigned integer that

4
libpngpf.3
View File

@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "December 7, 2006" .TH LIBPNGPF 3 "December 8, 2006"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.15beta4 libpng \- Portable Network Graphics (PNG) Reference Library 1.2.15beta5
(private functions) (private functions)
.SH SYNOPSIS .SH SYNOPSIS
\fB#include <png.h>\fP \fB#include <png.h>\fP

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "December 7, 2006" .TH PNG 5 "December 8, 2006"
.SH NAME .SH NAME
png \- Portable Network Graphics (PNG) format png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION .SH DESCRIPTION

4
png.c
View File

@ -13,7 +13,7 @@
#include "png.h" #include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */ /* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_2_15beta4 Your_png_h_is_not_version_1_2_15beta4; typedef version_1_2_15beta5 Your_png_h_is_not_version_1_2_15beta5;
/* Version information for C files. This had better match the version /* Version information for C files. This had better match the version
* string defined in png.h. */ * string defined in png.h. */
@ -701,7 +701,7 @@ png_charp PNGAPI
png_get_copyright(png_structp png_ptr) png_get_copyright(png_structp png_ptr)
{ {
if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */ if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */
return ((png_charp) "\n libpng version 1.2.15beta4 - December 7, 2006\n\ return ((png_charp) "\n libpng version 1.2.15beta5 - December 8, 2006\n\
Copyright (c) 1998-2006 Glenn Randers-Pehrson\n\ Copyright (c) 1998-2006 Glenn Randers-Pehrson\n\
Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1996-1997 Andreas Dilger\n\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");

20
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library /* png.h - header file for PNG reference library
* *
* libpng version 1.2.15beta4 - December 7, 2006 * libpng version 1.2.15beta5 - December 8, 2006
* Copyright (c) 1998-2006 Glenn Randers-Pehrson * Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@ -9,7 +9,7 @@
* Authors and maintainers: * Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * 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.89c, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.2.15beta4 - December 7, 2006: Glenn * libpng versions 0.97, January 1998, through 1.2.15beta5 - December 8, 2006: Glenn
* See also "Contributing Authors", below. * See also "Contributing Authors", below.
* *
* Note about libpng version numbers: * Note about libpng version numbers:
@ -134,7 +134,7 @@
* 1.2.14rc1 13 10214 12.so.0.14[.0] * 1.2.14rc1 13 10214 12.so.0.14[.0]
* 1.0.22 10 10022 10.so.0.22[.0] * 1.0.22 10 10022 10.so.0.22[.0]
* 1.2.14 13 10214 12.so.0.14[.0] * 1.2.14 13 10214 12.so.0.14[.0]
* 1.2.15beta1-4 13 10215 12.so.0.15[.0] * 1.2.15beta1-5 13 10215 12.so.0.15[.0]
* *
* Henceforth the source version will match the shared-library major * Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be * and minor numbers; the shared-library major version number will be
@ -164,7 +164,7 @@
* If you modify libpng you may insert additional notices immediately following * If you modify libpng you may insert additional notices immediately following
* this sentence. * this sentence.
* *
* libpng versions 1.2.6, August 15, 2004, through 1.2.15beta4, December 7, 2006, are * libpng versions 1.2.6, August 15, 2004, through 1.2.15beta5, December 8, 2006, are
* Copyright (c) 2004, 2006 Glenn Randers-Pehrson, and are * Copyright (c) 2004, 2006 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.2.5 * distributed according to the same disclaimer and license as libpng-1.2.5
* with the following individual added to the list of Contributing Authors: * with the following individual added to the list of Contributing Authors:
@ -276,13 +276,13 @@
* Y2K compliance in libpng: * Y2K compliance in libpng:
* ========================= * =========================
* *
* December 7, 2006 * December 8, 2006
* *
* Since the PNG Development group is an ad-hoc body, we can't make * Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration. * an official declaration.
* *
* This is your unofficial assurance that libpng from version 0.71 and * This is your unofficial assurance that libpng from version 0.71 and
* upward through 1.2.15beta4 are Y2K compliant. It is my belief that earlier * upward through 1.2.15beta5 are Y2K compliant. It is my belief that earlier
* versions were also Y2K compliant. * versions were also Y2K compliant.
* *
* Libpng only has three year fields. One is a 2-byte unsigned integer * Libpng only has three year fields. One is a 2-byte unsigned integer
@ -338,9 +338,9 @@
*/ */
/* Version information for png.h - this should match the version in png.c */ /* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.15beta4" #define PNG_LIBPNG_VER_STRING "1.2.15beta5"
#define PNG_HEADER_VERSION_STRING \ #define PNG_HEADER_VERSION_STRING \
" libpng version 1.2.15beta4 - December 7, 2006 (header)\n" " libpng version 1.2.15beta5 - December 8, 2006 (header)\n"
#define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13 #define PNG_LIBPNG_VER_DLLNUM 13
@ -352,7 +352,7 @@
/* This should match the numeric part of the final component of /* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero: */ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */
#define PNG_LIBPNG_VER_BUILD 4 #define PNG_LIBPNG_VER_BUILD 5
/* Release Status */ /* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_ALPHA 1
@ -1386,7 +1386,7 @@ struct png_struct_def
/* This triggers a compiler error in png.c, if png.c and png.h /* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number. * do not agree upon the version number.
*/ */
typedef png_structp version_1_2_15beta4; typedef png_structp version_1_2_15beta5;
typedef png_struct FAR * FAR * png_structpp; typedef png_struct FAR * FAR * png_structpp;

2
pngconf.h
View File

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

78
pnggccrd.c
View File

@ -245,7 +245,7 @@
#define PNG_INTERNAL #define PNG_INTERNAL
#include "png.h" #include "png.h"
#if defined(PNG_USE_PNGGCCRD) #if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_USE_PNGGCCRD)
int PNGAPI png_mmx_support(void); int PNGAPI png_mmx_support(void);
@ -255,7 +255,7 @@ static const int FARDATA png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
static const int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1}; static const int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1};
#endif #endif
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) #if defined(PNG_MMX_CODE_SUPPORTED)
/* djgpp, Win32, Cygwin, and OS2 add their own underscores to global variables, /* djgpp, Win32, Cygwin, and OS2 add their own underscores to global variables,
* so define them without: */ * so define them without: */
#if defined(__DJGPP__) || defined(WIN32) || defined(__CYGWIN__) || \ #if defined(__DJGPP__) || defined(WIN32) || defined(__CYGWIN__) || \
@ -378,7 +378,7 @@ png_squelch_warnings(void)
_mask48_1 = _mask48_1; _mask48_1 = _mask48_1;
_mask48_0 = _mask48_0; _mask48_0 = _mask48_0;
} }
#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ #endif /* PNG_MMX_CODE_SUPPORTED */
static int _mmx_supported = 2; static int _mmx_supported = 2;
@ -389,7 +389,7 @@ static int _mmx_supported = 2;
/* */ /* */
/*===========================================================================*/ /*===========================================================================*/
#if defined(PNG_HAVE_ASSEMBLER_COMBINE_ROW) #if defined(PNG_HAVE_MMX_COMBINE_ROW)
#define BPP2 2 #define BPP2 2
#define BPP3 3 /* bytes per pixel (a.k.a. pixel_bytes) */ #define BPP3 3 /* bytes per pixel (a.k.a. pixel_bytes) */
@ -416,7 +416,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
{ {
png_debug(1, "in png_combine_row (pnggccrd.c)\n"); png_debug(1, "in png_combine_row (pnggccrd.c)\n");
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) #if defined(PNG_MMX_CODE_SUPPORTED)
if (_mmx_supported == 2) { if (_mmx_supported == 2) {
#if !defined(PNG_1_0_X) #if !defined(PNG_1_0_X)
/* this should have happened in png_init_mmx_flags() already */ /* this should have happened in png_init_mmx_flags() already */
@ -607,7 +607,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
png_bytep srcptr; png_bytep srcptr;
png_bytep dstptr; png_bytep dstptr;
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) #if defined(PNG_MMX_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
#if !defined(PNG_1_0_X) #if !defined(PNG_1_0_X)
if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW)
/* && _mmx_supported */ ) /* && _mmx_supported */ )
@ -700,7 +700,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
); );
} }
else /* mmx _not supported - Use modified C routine */ else /* mmx _not supported - Use modified C routine */
#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ #endif /* PNG_MMX_CODE_SUPPORTED */
{ {
register png_uint_32 i; register png_uint_32 i;
png_uint_32 initial_val = png_pass_start[png_ptr->pass]; png_uint_32 initial_val = png_pass_start[png_ptr->pass];
@ -745,7 +745,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
png_bytep srcptr; png_bytep srcptr;
png_bytep dstptr; png_bytep dstptr;
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) #if defined(PNG_MMX_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
#if !defined(PNG_1_0_X) #if !defined(PNG_1_0_X)
if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW)
/* && _mmx_supported */ ) /* && _mmx_supported */ )
@ -854,7 +854,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
); );
} }
else /* mmx _not supported - Use modified C routine */ else /* mmx _not supported - Use modified C routine */
#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ #endif /* PNG_MMX_CODE_SUPPORTED */
{ {
register png_uint_32 i; register png_uint_32 i;
png_uint_32 initial_val = BPP2 * png_pass_start[png_ptr->pass]; png_uint_32 initial_val = BPP2 * png_pass_start[png_ptr->pass];
@ -898,7 +898,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
png_bytep srcptr; png_bytep srcptr;
png_bytep dstptr; png_bytep dstptr;
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) #if defined(PNG_MMX_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
#if !defined(PNG_1_0_X) #if !defined(PNG_1_0_X)
if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW)
/* && _mmx_supported */ ) /* && _mmx_supported */ )
@ -1022,7 +1022,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
); );
} }
else /* mmx _not supported - Use modified C routine */ else /* mmx _not supported - Use modified C routine */
#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ #endif /* PNG_MMX_CODE_SUPPORTED */
{ {
register png_uint_32 i; register png_uint_32 i;
png_uint_32 initial_val = BPP3 * png_pass_start[png_ptr->pass]; png_uint_32 initial_val = BPP3 * png_pass_start[png_ptr->pass];
@ -1066,7 +1066,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
png_bytep srcptr; png_bytep srcptr;
png_bytep dstptr; png_bytep dstptr;
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) #if defined(PNG_MMX_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
#if !defined(PNG_1_0_X) #if !defined(PNG_1_0_X)
if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW)
/* && _mmx_supported */ ) /* && _mmx_supported */ )
@ -1197,7 +1197,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
); );
} }
else /* mmx _not supported - Use modified C routine */ else /* mmx _not supported - Use modified C routine */
#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ #endif /* PNG_MMX_CODE_SUPPORTED */
{ {
register png_uint_32 i; register png_uint_32 i;
png_uint_32 initial_val = BPP4 * png_pass_start[png_ptr->pass]; png_uint_32 initial_val = BPP4 * png_pass_start[png_ptr->pass];
@ -1241,7 +1241,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
png_bytep srcptr; png_bytep srcptr;
png_bytep dstptr; png_bytep dstptr;
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) #if defined(PNG_MMX_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
#if !defined(PNG_1_0_X) #if !defined(PNG_1_0_X)
if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW)
/* && _mmx_supported */ ) /* && _mmx_supported */ )
@ -1389,7 +1389,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
); );
} }
else /* mmx _not supported - Use modified C routine */ else /* mmx _not supported - Use modified C routine */
#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ #endif /* PNG_MMX_CODE_SUPPORTED */
{ {
register png_uint_32 i; register png_uint_32 i;
png_uint_32 initial_val = BPP6 * png_pass_start[png_ptr->pass]; png_uint_32 initial_val = BPP6 * png_pass_start[png_ptr->pass];
@ -1480,7 +1480,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
} /* end png_combine_row() */ } /* end png_combine_row() */
#endif /* PNG_HAVE_ASSEMBLER_COMBINE_ROW */ #endif /* PNG_HAVE_MMX_COMBINE_ROW */
@ -1492,7 +1492,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
/*===========================================================================*/ /*===========================================================================*/
#if defined(PNG_READ_INTERLACING_SUPPORTED) #if defined(PNG_READ_INTERLACING_SUPPORTED)
#if defined(PNG_HAVE_ASSEMBLER_READ_INTERLACE) #if defined(PNG_HAVE_MMX_READ_INTERLACE)
/* png_do_read_interlace() is called after any 16-bit to 8-bit conversion /* png_do_read_interlace() is called after any 16-bit to 8-bit conversion
* has taken place. [GRR: what other steps come before and/or after?] * has taken place. [GRR: what other steps come before and/or after?]
@ -1510,7 +1510,7 @@ png_do_read_interlace(png_structp png_ptr)
png_debug(1, "in png_do_read_interlace (pnggccrd.c)\n"); png_debug(1, "in png_do_read_interlace (pnggccrd.c)\n");
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) #if defined(PNG_MMX_CODE_SUPPORTED)
if (_mmx_supported == 2) { if (_mmx_supported == 2) {
#if !defined(PNG_1_0_X) #if !defined(PNG_1_0_X)
/* this should have happened in png_init_mmx_flags() already */ /* this should have happened in png_init_mmx_flags() already */
@ -1723,7 +1723,7 @@ png_do_read_interlace(png_structp png_ptr)
/* New code by Nirav Chhatrapati - Intel Corporation */ /* New code by Nirav Chhatrapati - Intel Corporation */
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) #if defined(PNG_MMX_CODE_SUPPORTED)
#if !defined(PNG_1_0_X) #if !defined(PNG_1_0_X)
if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_INTERLACE) if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_INTERLACE)
/* && _mmx_supported */ ) /* && _mmx_supported */ )
@ -2628,7 +2628,7 @@ png_do_read_interlace(png_structp png_ptr)
/* GRR 19991007: does it? or should pixel_bytes in each /* GRR 19991007: does it? or should pixel_bytes in each
* block be replaced with immediate value (e.g., 1)? */ * block be replaced with immediate value (e.g., 1)? */
/* GRR 19991017: replaced with constants in each case */ /* GRR 19991017: replaced with constants in each case */
#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ #endif /* PNG_MMX_CODE_SUPPORTED */
{ {
if (pixel_bytes == 1) if (pixel_bytes == 1)
{ {
@ -2753,13 +2753,13 @@ png_do_read_interlace(png_structp png_ptr)
} /* end png_do_read_interlace() */ } /* end png_do_read_interlace() */
#endif /* PNG_HAVE_ASSEMBLER_READ_INTERLACE */ #endif /* PNG_HAVE_MMX_READ_INTERLACE */
#endif /* PNG_READ_INTERLACING_SUPPORTED */ #endif /* PNG_READ_INTERLACING_SUPPORTED */
#if defined(PNG_HAVE_ASSEMBLER_READ_FILTER_ROW) #if defined(PNG_HAVE_MMX_READ_FILTER_ROW)
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) #if defined(PNG_MMX_CODE_SUPPORTED)
// These variables are utilized in the functions below. They are declared // These variables are utilized in the functions below. They are declared
// globally here to ensure alignment on 8-byte boundaries. // globally here to ensure alignment on 8-byte boundaries.
@ -5066,7 +5066,7 @@ png_read_filter_row_mmx_up(png_row_infop row_info, png_bytep row,
} // end of png_read_filter_row_mmx_up() } // end of png_read_filter_row_mmx_up()
#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ #endif /* PNG_MMX_CODE_SUPPORTED */
@ -5088,7 +5088,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
char filnm[10]; char filnm[10];
#endif #endif
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) #if defined(PNG_MMX_CODE_SUPPORTED)
/* GRR: these are superseded by png_ptr->asm_flags: */ /* GRR: these are superseded by png_ptr->asm_flags: */
#define UseMMX_sub 1 // GRR: converted 20000730 #define UseMMX_sub 1 // GRR: converted 20000730
#define UseMMX_up 1 // GRR: converted 20000729 #define UseMMX_up 1 // GRR: converted 20000729
@ -5102,7 +5102,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
#endif #endif
png_mmx_support(); png_mmx_support();
} }
#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ #endif /* PNG_MMX_CODE_SUPPORTED */
#ifdef PNG_DEBUG #ifdef PNG_DEBUG
png_debug(1, "in png_read_filter_row (pnggccrd.c)\n"); png_debug(1, "in png_read_filter_row (pnggccrd.c)\n");
@ -5111,7 +5111,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
case 0: sprintf(filnm, "none"); case 0: sprintf(filnm, "none");
break; break;
case 1: sprintf(filnm, "sub-%s", case 1: sprintf(filnm, "sub-%s",
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) #if defined(PNG_MMX_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
#if !defined(PNG_1_0_X) #if !defined(PNG_1_0_X)
(png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_SUB)? "MMX" : (png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_SUB)? "MMX" :
#endif #endif
@ -5119,7 +5119,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
"x86"); "x86");
break; break;
case 2: sprintf(filnm, "up-%s", case 2: sprintf(filnm, "up-%s",
#ifdef PNG_ASSEMBLER_CODE_SUPPORTED #ifdef PNG_MMX_CODE_SUPPORTED
#if !defined(PNG_1_0_X) #if !defined(PNG_1_0_X)
(png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_UP)? "MMX" : (png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_UP)? "MMX" :
#endif #endif
@ -5127,7 +5127,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
"x86"); "x86");
break; break;
case 3: sprintf(filnm, "avg-%s", case 3: sprintf(filnm, "avg-%s",
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) #if defined(PNG_MMX_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
#if !defined(PNG_1_0_X) #if !defined(PNG_1_0_X)
(png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_AVG)? "MMX" : (png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_AVG)? "MMX" :
#endif #endif
@ -5135,7 +5135,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
"x86"); "x86");
break; break;
case 4: sprintf(filnm, "Paeth-%s", case 4: sprintf(filnm, "Paeth-%s",
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) #if defined(PNG_MMX_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
#if !defined(PNG_1_0_X) #if !defined(PNG_1_0_X)
(png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_PAETH)? "MMX": (png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_PAETH)? "MMX":
#endif #endif
@ -5158,7 +5158,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
break; break;
case PNG_FILTER_VALUE_SUB: case PNG_FILTER_VALUE_SUB:
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) #if defined(PNG_MMX_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
#if !defined(PNG_1_0_X) #if !defined(PNG_1_0_X)
if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_SUB) && if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_SUB) &&
(row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) && (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) &&
@ -5170,7 +5170,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
png_read_filter_row_mmx_sub(row_info, row); png_read_filter_row_mmx_sub(row_info, row);
} }
else else
#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ #endif /* PNG_MMX_CODE_SUPPORTED */
{ {
png_uint_32 i; png_uint_32 i;
png_uint_32 istop = row_info->rowbytes; png_uint_32 istop = row_info->rowbytes;
@ -5187,7 +5187,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
break; break;
case PNG_FILTER_VALUE_UP: case PNG_FILTER_VALUE_UP:
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) #if defined(PNG_MMX_CODE_SUPPORTED)
#if !defined(PNG_1_0_X) #if !defined(PNG_1_0_X)
if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_UP) && if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_UP) &&
(row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) && (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) &&
@ -5199,7 +5199,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
png_read_filter_row_mmx_up(row_info, row, prev_row); png_read_filter_row_mmx_up(row_info, row, prev_row);
} }
else else
#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ #endif /* PNG_MMX_CODE_SUPPORTED */
{ {
png_uint_32 i; png_uint_32 i;
png_uint_32 istop = row_info->rowbytes; png_uint_32 istop = row_info->rowbytes;
@ -5215,7 +5215,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
break; break;
case PNG_FILTER_VALUE_AVG: case PNG_FILTER_VALUE_AVG:
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) #if defined(PNG_MMX_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
#if !defined(PNG_1_0_X) #if !defined(PNG_1_0_X)
if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_AVG) && if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_AVG) &&
(row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) && (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) &&
@ -5227,7 +5227,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
png_read_filter_row_mmx_avg(row_info, row, prev_row); png_read_filter_row_mmx_avg(row_info, row, prev_row);
} }
else else
#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ #endif /* PNG_MMX_CODE_SUPPORTED */
{ {
png_uint_32 i; png_uint_32 i;
png_bytep rp = row; png_bytep rp = row;
@ -5253,7 +5253,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
break; break;
case PNG_FILTER_VALUE_PAETH: case PNG_FILTER_VALUE_PAETH:
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) #if defined(PNG_MMX_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
#if !defined(PNG_1_0_X) #if !defined(PNG_1_0_X)
if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_PAETH) && if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_PAETH) &&
(row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) && (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) &&
@ -5265,7 +5265,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
png_read_filter_row_mmx_paeth(row_info, row, prev_row); png_read_filter_row_mmx_paeth(row_info, row, prev_row);
} }
else else
#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ #endif /* PNG_MMX_CODE_SUPPORTED */
{ {
png_uint_32 i; png_uint_32 i;
png_bytep rp = row; png_bytep rp = row;
@ -5326,7 +5326,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
} }
} }
#endif /* PNG_HAVE_ASSEMBLER_READ_FILTER_ROW */ #endif /* PNG_HAVE_MMX_READ_FILTER_ROW */
/*===========================================================================*/ /*===========================================================================*/

12
pngrutil.c
View File

@ -2249,7 +2249,7 @@ png_check_chunk_name(png_structp png_ptr, png_bytep chunk_name)
a zero indicates the pixel is to be skipped. This is in addition a zero indicates the pixel is to be skipped. This is in addition
to any alpha or transparency value associated with the pixel. If to any alpha or transparency value associated with the pixel. If
you want all pixels to be combined, pass 0xff (255) in mask. */ you want all pixels to be combined, pass 0xff (255) in mask. */
#ifndef PNG_HAVE_ASSEMBLER_COMBINE_ROW #ifndef PNG_HAVE_MMX_COMBINE_ROW
void /* PRIVATE */ void /* PRIVATE */
png_combine_row(png_structp png_ptr, png_bytep row, int mask) png_combine_row(png_structp png_ptr, png_bytep row, int mask)
{ {
@ -2450,10 +2450,10 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
} }
} }
} }
#endif /* !PNG_HAVE_ASSEMBLER_COMBINE_ROW */ #endif /* !PNG_HAVE_MMX_COMBINE_ROW */
#ifdef PNG_READ_INTERLACING_SUPPORTED #ifdef PNG_READ_INTERLACING_SUPPORTED
#ifndef PNG_HAVE_ASSEMBLER_READ_INTERLACE /* else in pngvcrd.c, pnggccrd.c */ #ifndef PNG_HAVE_MMX_READ_INTERLACE /* else in pngvcrd.c, pnggccrd.c */
/* OLD pre-1.0.9 interface: /* OLD pre-1.0.9 interface:
void png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass, void png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
png_uint_32 transformations) png_uint_32 transformations)
@ -2679,10 +2679,10 @@ png_do_read_interlace(png_structp png_ptr)
return; return;
#endif #endif
} }
#endif /* !PNG_HAVE_ASSEMBLER_READ_INTERLACE */ #endif /* !PNG_HAVE_MMX_READ_INTERLACE */
#endif /* PNG_READ_INTERLACING_SUPPORTED */ #endif /* PNG_READ_INTERLACING_SUPPORTED */
#ifndef PNG_HAVE_ASSEMBLER_READ_FILTER_ROW #ifndef PNG_HAVE_MMX_READ_FILTER_ROW
void /* PRIVATE */ void /* PRIVATE */
png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row, png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,
png_bytep prev_row, int filter) png_bytep prev_row, int filter)
@ -2805,7 +2805,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,
break; break;
} }
} }
#endif /* !PNG_HAVE_ASSEMBLER_READ_FILTER_ROW */ #endif /* !PNG_HAVE_MMX_READ_FILTER_ROW */
void /* PRIVATE */ void /* PRIVATE */
png_read_finish_row(png_structp png_ptr) png_read_finish_row(png_structp png_ptr)

2
pngtest.c
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. */ /* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_2_15beta4 your_png_h_is_not_version_1_2_15beta4; typedef version_1_2_15beta5 your_png_h_is_not_version_1_2_15beta5;

41
scripts/CMakeLists.txt
View File

@ -1,5 +1,3 @@
# CMakeLists.txt, for use with cmake. See www.cmake.org
project(libpng) project(libpng)
SET(PNG_VER_MAJOR 1) SET(PNG_VER_MAJOR 1)
@ -11,8 +9,8 @@ find_package(ZLIB REQUIRED)
# command line options # command line options
OPTION(PNG_SHARED "Build shared lib" YES) option(PNG_SHARED "Build shared lib" YES)
OPTION(PNG_TESTS "Build pngtest" YES) option(PNG_TESTS "Build pngtest" YES)
#TODO: #TODO:
# PNG_NO_CONSOLE_IO # PNG_NO_CONSOLE_IO
# PNG_NO_STDIO # PNG_NO_STDIO
@ -20,6 +18,21 @@ OPTION(PNG_TESTS "Build pngtest" YES)
# PNGARG # PNGARG
# some others :) # some others :)
set(png_asm_tmp "OFF")
if(NOT WIN32)
find_program(uname_executable NAMES uname PATHS /bin /usr/bin /usr/local/bin)
if(uname_executable)
EXEC_PROGRAM(${uname_executable} ARGS --machine OUTPUT_VARIABLE uname_output)
if("uname_output" MATCHES "^.*i[1-9]86.*$")
set(png_asm_tmp "ON")
else("uname_output" MATCHES "^.*i[1-9]86.*$")
set(png_asm_tmp "OFF")
endif("uname_output" MATCHES "^.*i[1-9]86.*$")
endif(uname_executable)
endif(NOT WIN32)
option(PNG_MMX "Use MMX assembler code (x86 only)" ${png_asm_tmp})
# msvc does not append 'lib' - do it here to have consistent name # msvc does not append 'lib' - do it here to have consistent name
if(MSVC) if(MSVC)
@ -77,6 +90,16 @@ else(MSVC)
) )
endif(MSVC) endif(MSVC)
if(NOT PNG_MMX)
add_definitions(-DPNG_NO_MMX_CODE)
endif(NOT PNG_MMX)
if(NOT WIN32)
find_library(M_LIBRARY
NAMES m
PATHS /usr/lib /usr/local/lib
)
endif(NOT WIN32)
# now build our target # now build our target
include_directories(${CMAKE_SOURCE_DIR} ${ZLIB_INCLUDE_DIR}) include_directories(${CMAKE_SOURCE_DIR} ${ZLIB_INCLUDE_DIR})
@ -87,10 +110,10 @@ else(PNG_SHARED)
add_library(STATIC ${libpng_sources}) add_library(STATIC ${libpng_sources})
endif(PNG_SHARED) endif(PNG_SHARED)
target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY}) target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY})
if(PNG_SHARED) if(PNG_SHARED AND WIN32)
set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL) set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL)
endif(PNG_SHARED) endif(PNG_SHARED AND WIN32)
if(PNG_TESTS) if(PNG_TESTS)
# does not work with msvc due to png_lib_ver issue # does not work with msvc due to png_lib_ver issue
@ -102,7 +125,7 @@ endif(PNG_TESTS)
# install # install
install_targets(/bin ${PNG_LIB_NAME}) install_targets(/bin ${PNG_LIB_NAME})
install(FILES png.h pngconf.h DESTINATION include) install(FILES libpng.so libpng.a DESTINATION lib)
install(FILES png.h pngconf.h DESTINATION include) install(FILES png.h pngconf.h DESTINATION include)
install(FILES libpng.3 libpngpf.3 DESTINATION man/man3) install(FILES libpng.3 libpngpf.3 DESTINATION man/man3)
# what's with libpng.txt and all the extra files? # what's with libpng.txt and all the extra files?
@ -120,3 +143,5 @@ install(FILES libpng.3 libpngpf.3 DESTINATION man/man3)
# lib /def:libpng.def /machine:x86 # lib /def:libpng.def /machine:x86

2
scripts/libpng-config-head.in
View File

@ -8,7 +8,7 @@
# Modeled after libxml-config. # Modeled after libxml-config.
version=1.2.15beta4 version=1.2.15beta5
prefix="" prefix=""
libdir="" libdir=""
libs="" libs=""

2
scripts/libpng.pc-configure.in
View File

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

2
scripts/libpng.pc.in
View File

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

2
scripts/makefile.32sunu
View File

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

2
scripts/makefile.64sunu
View File

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

2
scripts/makefile.aix
View File

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

2
scripts/makefile.beos
View File

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

2
scripts/makefile.cygwin
View File

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

2
scripts/makefile.darwin
View File

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

2
scripts/makefile.dec
View File

@ -5,7 +5,7 @@
# Library name: # Library name:
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.15beta4 PNGMIN = 1.2.15beta5
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12 LIBNAME = libpng12

2
scripts/makefile.elf
View File

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

2
scripts/makefile.gcmmx
View File

@ -16,7 +16,7 @@
# Library name: # Library name:
LIBNAME = libpng12 LIBNAME = libpng12
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.15beta4 PNGMIN = 1.2.15beta5
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:

2
scripts/makefile.hp64
View File

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

2
scripts/makefile.hpgcc
View File

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

2
scripts/makefile.hpux
View File

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

2
scripts/makefile.linux
View File

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

2
scripts/makefile.mingw
View File

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

2
scripts/makefile.ne12bsd
View File

@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
LIB= png12 LIB= png12
SHLIB_MAJOR= 0 SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.15beta4 SHLIB_MINOR= 1.2.15beta5
SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ 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 \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c pngwtran.c pngmem.c pngerror.c pngpread.c

2
scripts/makefile.netbsd
View File

@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng
LIB= png LIB= png
SHLIB_MAJOR= 3 SHLIB_MAJOR= 3
SHLIB_MINOR= 1.2.15beta4 SHLIB_MINOR= 1.2.15beta5
SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ 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 \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c pngwtran.c pngmem.c pngerror.c pngpread.c

2
scripts/makefile.openbsd
View File

@ -7,7 +7,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0 SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.15beta4 SHLIB_MINOR= 1.2.15beta5
LIB= png LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \

2
scripts/makefile.sco
View File

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

2
scripts/makefile.sggcc
View File

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

2
scripts/makefile.sgi
View File

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

2
scripts/makefile.so9
View File

@ -8,7 +8,7 @@
# Library name: # Library name:
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.15beta4 PNGMIN = 1.2.15beta5
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12 LIBNAME = libpng12

2
scripts/makefile.solaris
View File

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

2
scripts/pngos2.def
View File

@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2 ; PNG.LIB module definition file for OS/2
;---------------------------------------- ;----------------------------------------
; Version 1.2.15beta4 ; Version 1.2.15beta5
LIBRARY PNG LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2" DESCRIPTION "PNG image compression library for OS/2"

2
scripts/pngw32.def
View File

@ -5,7 +5,7 @@
LIBRARY LIBRARY
EXPORTS EXPORTS
;Version 1.2.15beta4 ;Version 1.2.15beta5
png_build_grayscale_palette @1 png_build_grayscale_palette @1
png_check_sig @2 png_check_sig @2
png_chunk_error @3 png_chunk_error @3