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

Imported from libpng-1.2.19beta30.tar

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2007-07-26 12:37:43 -05:00
parent f3fcf00392
commit f024ce7675
55 changed files with 212 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.2.19beta29 - July 20, 2007 Libpng 1.2.19beta30 - July 26, 2007
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.19beta29.tar.gz libpng-1.2.19beta30.tar.gz
libpng-1.2.19beta29.tar.bz2 libpng-1.2.19beta30.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.19beta29-no-config.tar.gz libpng-1.2.19beta30-no-config.tar.gz
libpng-1.2.19beta29-no-config.tar.bz2 libpng-1.2.19beta30-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
lp1219b29.zip lp1219b30.zip
lp1219b29.tar.bz2 lp1219b30.tar.bz2
Project files Project files
libpng-1.2.19beta29-project-netware.zip libpng-1.2.19beta30-project-netware.zip
libpng-1.2.19beta29-project-wince.zip libpng-1.2.19beta30-project-wince.zip
Other information: Other information:
libpng-1.2.19beta29-README.txt libpng-1.2.19beta30-README.txt
libpng-1.2.19beta29-KNOWNBUGS.txt libpng-1.2.19beta30-KNOWNBUGS.txt
libpng-1.2.19beta29-LICENSE.txt libpng-1.2.19beta30-LICENSE.txt
libpng-1.2.19beta29-Y2K-compliance.txt libpng-1.2.19beta30-Y2K-compliance.txt
Changes since the last public release (1.2.18): Changes since the last public release (1.2.18):
@ -163,6 +163,9 @@ version 1.2.19beta28 [July 19, 2007]
version 1.2.19beta29 [July 20, 2007] version 1.2.19beta29 [July 20, 2007]
Fix typo in pnggccrd.c (%%eax should be %%ax in secondloop48) Fix typo in pnggccrd.c (%%eax should be %%ax in secondloop48)
version 1.2.19beta30 [July 26, 2007]
Revised pnggccrd.c
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

3
CHANGES
View File

@ -1856,6 +1856,9 @@ version 1.2.19beta28 [July 19, 2007]
version 1.2.19beta29 [July 20, 2007] version 1.2.19beta29 [July 20, 2007]
Fix typo in pnggccrd.c (%%eax should be %%ax in secondloop48) Fix typo in pnggccrd.c (%%eax should be %%ax in secondloop48)
version 1.2.19beta30 [July 26, 2007]
Revised pnggccrd.c
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

20
INSTALL
View File

@ -1,5 +1,5 @@
Installing libpng version 1.2.19beta29 - July 20, 2007 Installing libpng version 1.2.19beta30 - July 26, 2007
On Unix/Linux and similar systems, you can simply type On Unix/Linux and similar systems, you can simply type
@ -44,7 +44,7 @@ to have access to the zlib.h and zconf.h include files that
correspond to the version of zlib that's installed. 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.19beta29" or "lpng109" and "zlib-1.2.1" might be called "libpng-1.2.19beta30" 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:
@ -101,14 +101,14 @@ include
CMakeLists.txt => "cmake" script 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.19beta29) gcc, creates libpng12.so.0.1.2.19beta30)
makefile.linux => Linux/ELF makefile makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.19beta29) (gcc, creates libpng12.so.0.1.2.19beta30)
makefile.gcmmx => Linux/ELF makefile makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.19beta29, (gcc, creates libpng12.so.0.1.2.19beta30,
uses assembler code tuned for Intel MMX platform) uses assembler code tuned for Intel MMX platform)
makefile.nommx => Linux/ELF makefile makefile.nommx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.19beta29 (gcc, creates libpng12.so.0.1.2.19beta30
does not use Intel MMX assembler code) does not use Intel MMX assembler code)
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
@ -131,14 +131,14 @@ 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.19beta29) creates libpng12.so.0.1.2.19beta30)
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.19beta29) creates libpng12.so.0.1.2.19beta30)
makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc,
creates libpng12.so.0.1.2.19beta29) creates libpng12.so.0.1.2.19beta30)
makefile.so9 => Solaris 9 makefile (gcc, makefile.so9 => Solaris 9 makefile (gcc,
creates libpng12.so.0.1.2.19beta29) creates libpng12.so.0.1.2.19beta30)
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

2
KNOWNBUG
View File

@ -1,5 +1,5 @@
Known bugs in libpng version 1.2.19beta29 Known bugs in libpng version 1.2.19beta30
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

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.19beta29, July 20, 2007, are libpng versions 1.2.6, August 15, 2004, through 1.2.19beta30, July 26, 2007, are
Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are Copyright (c) 2004, 2006-2007 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
July 20, 2007 July 26, 2007

14
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.2.19beta29 - July 20, 2007 (shared library 12.0) README for libpng version 1.2.19beta30 - July 26, 2007 (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.19beta29) gcc, creates libpng12.so.0.1.2.19beta30)
makefile.linux => Linux/ELF makefile makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.19beta29) (gcc, creates libpng12.so.0.1.2.19beta30)
makefile.gcmmx => Linux/ELF makefile makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.19beta29, (gcc, creates libpng12.so.0.1.2.19beta30,
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.19beta29) (gcc, creates libpng12.so.0.1.2.19beta30)
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.19beta29) (gcc, creates libpng12.so.0.1.2.19beta30)
makefile.so9 => Solaris 9 makefile makefile.so9 => Solaris 9 makefile
(gcc, creates libpng12.so.0.1.2.19beta29) (gcc, creates libpng12.so.0.1.2.19beta30)
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:
========================= =========================
July 20, 2007 July 26, 2007
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.19beta29 are Y2K compliant. It is my belief that earlier upward through 1.2.19beta30 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.19beta29. # Generated by GNU Autoconf 2.61 for libpng 1.2.19beta30.
# #
# 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.19beta29' PACKAGE_VERSION='1.2.19beta30'
PACKAGE_STRING='libpng 1.2.19beta29' PACKAGE_STRING='libpng 1.2.19beta30'
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"
@ -1405,7 +1405,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.19beta29 to adapt to many kinds of systems. \`configure' configures libpng 1.2.19beta30 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1475,7 +1475,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.19beta29:";; short | recursive ) echo "Configuration of libpng 1.2.19beta30:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1585,7 +1585,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.19beta29 libpng configure 1.2.19beta30
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,
@ -1599,7 +1599,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.19beta29, which was It was created by libpng $as_me 1.2.19beta30, which was
generated by GNU Autoconf 2.61. Invocation command line was generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@ $ $0 $@
@ -2269,7 +2269,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='libpng' PACKAGE='libpng'
VERSION='1.2.19beta29' VERSION='1.2.19beta30'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -2440,7 +2440,7 @@ fi
PNGLIB_VERSION=1.2.19beta29 PNGLIB_VERSION=1.2.19beta30
PNGLIB_MAJOR=1 PNGLIB_MAJOR=1
PNGLIB_MINOR=2 PNGLIB_MINOR=2
PNGLIB_RELEASE=19 PNGLIB_RELEASE=19
@ -21282,7 +21282,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.19beta29, which was This file was extended by libpng $as_me 1.2.19beta30, 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
@ -21335,7 +21335,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.19beta29 libpng config.status 1.2.19beta30
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.19beta29], [png-mng-implement@lists.sourceforge.net]) AC_INIT([libpng], [1.2.19beta30], [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.19beta29 PNGLIB_VERSION=1.2.19beta30
PNGLIB_MAJOR=1 PNGLIB_MAJOR=1
PNGLIB_MINOR=2 PNGLIB_MINOR=2
PNGLIB_RELEASE=19 PNGLIB_RELEASE=19

6
libpng-1.2.19beta29.txt → libpng-1.2.19beta30.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.19beta29 - July 20, 2007 libpng version 1.2.19beta30 - July 26, 2007
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-2007 Glenn Randers-Pehrson Copyright (c) 1998-2007 Glenn Randers-Pehrson
@ -2921,13 +2921,13 @@ application:
IX. Y2K Compliance in libpng IX. Y2K Compliance in libpng
July 20, 2007 July 26, 2007
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.19beta29 are Y2K compliant. It is my belief that earlier upward through 1.2.19beta30 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

18
libpng.3
View File

@ -1,6 +1,6 @@
.TH LIBPNG 3 "July 20, 2007" .TH LIBPNG 3 "July 26, 2007"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta29 libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta30
.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.19beta29 - July 20, 2007 libpng version 1.2.19beta30 - July 26, 2007
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-2007 Glenn Randers-Pehrson Copyright (c) 1998-2007 Glenn Randers-Pehrson
@ -3331,13 +3331,13 @@ application:
.SH IX. Y2K Compliance in libpng .SH IX. Y2K Compliance in libpng
July 20, 2007 July 26, 2007
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.19beta29 are Y2K compliant. It is my belief that earlier upward through 1.2.19beta30 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
@ -3526,7 +3526,7 @@ the first widely used release:
1.2.17 13 10217 12.so.0.17[.0] 1.2.17 13 10217 12.so.0.17[.0]
1.0.26 10 10026 10.so.0.26[.0] 1.0.26 10 10026 10.so.0.26[.0]
1.2.18 13 10218 12.so.0.18[.0] 1.2.18 13 10218 12.so.0.18[.0]
1.2.19beta1-28 13 10219 12.so.0.19[.0] 1.2.19beta1-30 13 10219 12.so.0.19[.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
@ -3582,7 +3582,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.19beta29 - July 20, 2007: Libpng version 1.2.19beta30 - July 26, 2007:
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).
@ -3603,7 +3603,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.19beta29, July 20, 2007, are libpng versions 1.2.6, August 15, 2004, through 1.2.19beta30, July 26, 2007, are
Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are Copyright (c) 2004,2006-2007 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
@ -3702,7 +3702,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson Glenn Randers-Pehrson
glennrp at users.sourceforge.net glennrp at users.sourceforge.net
July 20, 2007 July 26, 2007
.\" end of man page .\" end of man page

4
libpngpf.3
View File

@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "July 20, 2007" .TH LIBPNGPF 3 "July 26, 2007"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta29 libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta30
(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 "July 20, 2007" .TH PNG 5 "July 26, 2007"
.SH NAME .SH NAME
png \- Portable Network Graphics (PNG) format png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION .SH DESCRIPTION

6
png.c
View File

@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions /* png.c - location for general purpose libpng functions
* *
* Last changed in libpng 1.2.19 July 20, 2007 * Last changed in libpng 1.2.19 July 26, 2007
* 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-2007 Glenn Randers-Pehrson * Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -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_19beta29 Your_png_h_is_not_version_1_2_19beta29; typedef version_1_2_19beta30 Your_png_h_is_not_version_1_2_19beta30;
/* 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. */
@ -706,7 +706,7 @@ png_charp PNGAPI
png_get_copyright(png_structp png_ptr) png_get_copyright(png_structp png_ptr)
{ {
png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */ png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */
return ((png_charp) "\n libpng version 1.2.19beta29 - July 20, 2007\n\ return ((png_charp) "\n libpng version 1.2.19beta30 - July 26, 2007\n\
Copyright (c) 1998-2007 Glenn Randers-Pehrson\n\ Copyright (c) 1998-2007 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.19beta29 - July 20, 2007 * libpng version 1.2.19beta30 - July 26, 2007
* Copyright (c) 1998-2007 Glenn Randers-Pehrson * Copyright (c) 1998-2007 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.19beta29 - July 20, 2007: Glenn * libpng versions 0.97, January 1998, through 1.2.19beta30 - July 26, 2007: Glenn
* See also "Contributing Authors", below. * See also "Contributing Authors", below.
* *
* Note about libpng version numbers: * Note about libpng version numbers:
@ -150,7 +150,7 @@
* 1.2.17 13 10217 12.so.0.17[.0] * 1.2.17 13 10217 12.so.0.17[.0]
* 1.0.26 10 10026 10.so.0.26[.0] * 1.0.26 10 10026 10.so.0.26[.0]
* 1.2.18 13 10218 12.so.0.18[.0] * 1.2.18 13 10218 12.so.0.18[.0]
* 1.2.19beta1-28 13 10219 12.so.0.19[.0] * 1.2.19beta1-30 13 10219 12.so.0.19[.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
@ -180,7 +180,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.19beta29, July 20, 2007, are * libpng versions 1.2.6, August 15, 2004, through 1.2.19beta30, July 26, 2007, are
* Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are * Copyright (c) 2004, 2006-2007 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:
@ -292,13 +292,13 @@
* Y2K compliance in libpng: * Y2K compliance in libpng:
* ========================= * =========================
* *
* July 20, 2007 * July 26, 2007
* *
* 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.19beta29 are Y2K compliant. It is my belief that earlier * upward through 1.2.19beta30 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
@ -354,9 +354,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.19beta29" #define PNG_LIBPNG_VER_STRING "1.2.19beta30"
#define PNG_HEADER_VERSION_STRING \ #define PNG_HEADER_VERSION_STRING \
" libpng version 1.2.19beta29 - July 20, 2007\n" " libpng version 1.2.19beta30 - July 26, 2007\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
@ -368,7 +368,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 29 #define PNG_LIBPNG_VER_BUILD 30
/* Release Status */ /* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_ALPHA 1
@ -1407,7 +1407,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_19beta29; typedef png_structp version_1_2_19beta30;
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.19beta29 - July 20, 2007 * libpng version 1.2.19beta30 - July 26, 2007
* 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-2007 Glenn Randers-Pehrson * Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

2
pngerror.c
View File

@ -1,7 +1,7 @@
/* pngerror.c - stub functions for i/o and memory allocation /* pngerror.c - stub functions for i/o and memory allocation
* *
* Last changed in libpng 1.2.19 July 20, 2007 * Last changed in libpng 1.2.19 July 26, 2007
* 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-2007 Glenn Randers-Pehrson * Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

147
pnggccrd.c
View File

@ -1,9 +1,9 @@
/* pnggccrd.c - mixed C/assembler version of utilities to read a PNG file /* pnggccrd.c - mixed C/assembler version of utilities to read a PNG file
* *
* For Intel x86 CPU (Pentium-MMX or later) and GNU C compiler. * For Intel/AMD x86 or x86-64 CPU (Pentium-MMX or later) and GNU C compiler.
* *
* Last changed in libpng 1.2.19 July 20, 2007 * Last changed in libpng 1.2.19 July 26, 2007
* 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 Intel Corporation * Copyright (c) 1998 Intel Corporation
* Copyright (c) 1999-2002,2007 Greg Roelofs * Copyright (c) 1999-2002,2007 Greg Roelofs
@ -23,6 +23,7 @@
* *
* http://www.ibiblio.org/gferg/ldp/GCC-Inline-Assembly-HOWTO.html * http://www.ibiblio.org/gferg/ldp/GCC-Inline-Assembly-HOWTO.html
* http://sam.zoy.org/blog/2007-04-13-shlib-with-non-pic-code-have-inline-assembly-and-pic-mix-well * http://sam.zoy.org/blog/2007-04-13-shlib-with-non-pic-code-have-inline-assembly-and-pic-mix-well
* http://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html
* http://gcc.gnu.org/onlinedocs/gcc/Variable-Attributes.html * http://gcc.gnu.org/onlinedocs/gcc/Variable-Attributes.html
* http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html * http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
* AMD64 Architecture Programmer's Manual, volumes 1 and 5 * AMD64 Architecture Programmer's Manual, volumes 1 and 5
@ -224,7 +225,7 @@
* - fixed buffer-overrun bug in png_combine_row() C code (non-MMX) * - fixed buffer-overrun bug in png_combine_row() C code (non-MMX)
* *
* 20010808: * 20010808:
* - added PNG_THREAD_UNSAFE_OK around code using global variables [GRP] * - added PNG_THREAD_UNSAFE_OK around code using global variables [GR-P]
* *
* 20011124: * 20011124:
* - fixed missing save of Eflag in png_mmx_support() [Maxim Sobolev] * - fixed missing save of Eflag in png_mmx_support() [Maxim Sobolev]
@ -237,13 +238,13 @@
* *
* 20040724: * 20040724:
* - more tinkering with clobber list at lines 4529 and 5033 to get it to * - more tinkering with clobber list at lines 4529 and 5033 to get it to
* compile with gcc 3.4 [GRP] * compile with gcc 3.4 [GR-P]
* *
* 20040809: * 20040809:
* - added "rim" definitions for CONST4 and CONST6 [GRP] * - added "rim" definitions for CONST4 and CONST6 [GR-P]
* *
* 20060303: * 20060303:
* - added "OS2" to list of systems that don't need leading underscores [GRP] * - added "OS2" to list of systems that don't need leading underscores [GR-P]
* *
* 20060320: * 20060320:
* - made PIC-compliant [Christian Aichinger] * - made PIC-compliant [Christian Aichinger]
@ -356,7 +357,7 @@
* 20070618: * 20070618:
* - fixed misplaced PNG_THREAD_UNSAFE_OK endif (was missing LOAD_GOT_rbp/ * - fixed misplaced PNG_THREAD_UNSAFE_OK endif (was missing LOAD_GOT_rbp/
* RESTORE_rbp in 32-bit thread-safe case) * RESTORE_rbp in 32-bit thread-safe case)
* - changed all "ifdef *" to "if defined(*)" [GRP] * - changed all "ifdef *" to "if defined(*)" [GR-P]
* *
* 20070619: * 20070619:
* - rearranged most bitdepth-related case statements to put most frequent * - rearranged most bitdepth-related case statements to put most frequent
@ -369,7 +370,7 @@
* - removed single libpng-1.2.x PNG_DEBUG dependency on 1.0.x png_struct * - removed single libpng-1.2.x PNG_DEBUG dependency on 1.0.x png_struct
* member (row_buf_size) * member (row_buf_size)
* - rearranged pass-related if-blocks in png_do_read_interlace() to put most * - rearranged pass-related if-blocks in png_do_read_interlace() to put most
* frequent cases (4, 5) at top [GRP suggestion] * frequent cases (4, 5) at top [GR-P suggestion]
* *
* 20070624-29: * 20070624-29:
* - fixed 64-bit crash bug: pointers -> rsi/rdi, not esi/edi (switched to * - fixed 64-bit crash bug: pointers -> rsi/rdi, not esi/edi (switched to
@ -397,16 +398,25 @@
* - added check for (manual) PIC macro to fix OpenBSD crash bug * - added check for (manual) PIC macro to fix OpenBSD crash bug
* *
* 20070717: * 20070717:
* - Copy 6 bytes per pixel, not 4, and use stride of 6, not 4, in the * - fixed 48-bit png_combine_row() bug (was acting like 32-bit): copy 6
* second loop of interlace processing of 48-bit pixels (GR-P). * bytes per pixel, not 4, and use stride of 6, not 4, in the second loop
* of interlace processing of 48-bit pixels [GR-P]
*
* 20070722:
* - fixed 64-bit png_uint_32 bug with MMXLength/FullLength temp vars
*
* [still broken: tops of all row-filter blocks (input/output constraints);
* shows up on 64-bit dynamic (-fPIC) version with -O2, especially if debug-
* printfs enabled, but at right edge of odd-width images even if disabled]
* *
* *
* STILL TO DO: * STILL TO DO:
* - fix final thread-unsafe code using stack vars and pointer? (paeth top, * - fix final thread-unsafe code using stack vars and pointer? (paeth top,
* default, bottom only; default, bottom already 5 reg constraints; could * default, bottom only: default, bottom already 5 reg constraints; could
* replace bpp with pointer and group bpp/patemp/pbtemp/pctemp in array) * replace bpp with pointer and group bpp/patemp/pbtemp/pctemp in array)
* - fix ebp/no-reg-constraint inefficiency (avg/paeth/sub top) * - fix ebp/no-reg-constraint inefficiency (avg/paeth/sub top)
* - test png_do_read_interlace() 64-bit case (pixel_bytes == 8) * - test png_do_read_interlace() 64-bit case (pixel_bytes == 8)
* - write MMX code for 48-bit case (pixel_bytes == 6)
* - figure out what's up with 24-bit case (pixel_bytes == 3): * - figure out what's up with 24-bit case (pixel_bytes == 3):
* why subtract 8 from width_mmx in the pass 4/5 case? due to * why subtract 8 from width_mmx in the pass 4/5 case? due to
* odd number of bytes? (only width_mmx case) (near line 2335) * odd number of bytes? (only width_mmx case) (near line 2335)
@ -429,13 +439,15 @@
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_USE_PNGGCCRD) #if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_USE_PNGGCCRD)
/* for some inexplicable reason, gcc x.x.x on OpenBSD (and elsewhere?) does /* for some inexplicable reason, gcc 3.3.5 on OpenBSD (and elsewhere?) does
* *not* define __PIC__ when the -fPIC option is used, so we have to rely on * *not* define __PIC__ when the -fPIC option is used, so we have to rely on
* makefiles and whatnot to define the PIC macro explicitly */ * makefiles and whatnot to define the PIC macro explicitly */
#if defined(PIC) && !defined(__PIC__) // (this can/should move to pngconf.h) #if defined(PIC) && !defined(__PIC__) // (this can/should move to pngconf.h)
# define __PIC__ # define __PIC__
#endif #endif
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_USE_PNGGCCRD)
/* if you want/need full thread-safety on x86-64 even when linking statically, /* if you want/need full thread-safety on x86-64 even when linking statically,
* comment out the "&& defined(__PIC__)" part here: */ * comment out the "&& defined(__PIC__)" part here: */
#if defined(__x86_64__) && defined(__PIC__) #if defined(__x86_64__) && defined(__PIC__)
@ -662,13 +674,12 @@ static PNG_CONST ull _amask4_2_2 __attribute__((used, aligned(8))) = 0x00000000
#if defined(PNG_HAVE_MMX_READ_FILTER_ROW) || defined(PNG_HAVE_MMX_COMBINE_ROW) #if defined(PNG_HAVE_MMX_READ_FILTER_ROW) || defined(PNG_HAVE_MMX_COMBINE_ROW)
// this block is specific to png_read_filter_row_mmx_paeth() // this block is specific to png_read_filter_row_mmx_paeth() except for
// LOAD_GOT_rbp and RESTORE_rbp, which are also used in png_combine_row()
#if defined(PNG_x86_64_USE_GOTPCREL) #if defined(PNG_x86_64_USE_GOTPCREL)
# if defined(PNG_HAVE_MMX_READ_FILTER_ROW)
# define pa_TEMP "%%r11d" # define pa_TEMP "%%r11d"
# define pb_TEMP "%%r12d" # define pb_TEMP "%%r12d"
# define pc_TEMP "%%r13d" # define pc_TEMP "%%r13d"
# endif
# if defined(PNG_CLOBBER_x86_64_REGS_SUPPORTED) // works as of gcc 3.4.3 ... # if defined(PNG_CLOBBER_x86_64_REGS_SUPPORTED) // works as of gcc 3.4.3 ...
# define SAVE_r11_r12_r13 # define SAVE_r11_r12_r13
# define RESTORE_r11_r12_r13 # define RESTORE_r11_r12_r13
@ -1893,12 +1904,12 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
"jnc skip48 \n\t" // if CF = 0 "jnc skip48 \n\t" // if CF = 0
"movl (%3), %%eax \n\t" "movl (%3), %%eax \n\t"
"movl %%eax, (%4) \n\t" "movl %%eax, (%4) \n\t"
"movw 4(%3), %%ax \n\t" "movw 4(%3), %%ax \n\t" // GR-P bugfix 20070717
"movw %%ax, 4(%4) \n\t" "movw %%ax, 4(%4) \n\t" // GR-P bugfix 20070717
"skip48: \n\t" "skip48: \n\t"
"add $6, %3 \n\t" "add $6, %3 \n\t" // GR-P bugfix 20070717
"add $6, %4 \n\t" "add $6, %4 \n\t" // GR-P bugfix 20070717
"decl %%ecx \n\t" "decl %%ecx \n\t"
"jnz secondloop48 \n\t" "jnz secondloop48 \n\t"
@ -3121,16 +3132,14 @@ png_do_read_interlace(png_structp png_ptr)
png_memcpy(v, sptr, BPP4); png_memcpy(v, sptr, BPP4);
for (j = 0; j < png_pass_inc[pass]; j++) for (j = 0; j < png_pass_inc[pass]; j++)
{ {
#if defined(PNG_DEBUG) && defined(PNG_1_0_X) // row_buf_size gone in 1.2.x %-12-%#if defined(PNG_DEBUG) && defined(PNG_1_0_X) // row_buf_size gone in 1.2.x
if (dp < row || dp+3 > row+png_ptr->row_buf_size) %-12-% if (dp < row || dp+3 > row+png_ptr->row_buf_size)
{ %-12-% {
printf("dp out of bounds: row=%10p, dp=%10p, " %-12-% printf("dp out of bounds: row=%10p, dp=%10p, "
"rp=%10p\n", row, dp, %-12-% "rp=%10p\n", row, dp, row+png_ptr->row_buf_size);
row+png_ptr->row_buf_size); %-12-% printf("row_buf_size=%lu\n", png_ptr->row_buf_size);
printf("row_buf_size=%lu\n", %-12-% }
png_ptr->row_buf_size); %-12-%#endif
}
#endif
png_memcpy(dp, v, BPP4); png_memcpy(dp, v, BPP4);
dp -= BPP4; dp -= BPP4;
} }
@ -3221,7 +3230,7 @@ png_do_read_interlace(png_structp png_ptr)
#if defined(PNG_HAVE_MMX_READ_FILTER_ROW) #if defined(PNG_HAVE_MMX_READ_FILTER_ROW)
#ifdef PNG_MMX_READ_FILTER_AVG_SUPPORTED #if defined(PNG_MMX_READ_FILTER_AVG_SUPPORTED)
//===========================================================================// //===========================================================================//
// // // //
@ -3235,7 +3244,7 @@ static void /* PRIVATE */
png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row,
png_bytep prev_row) png_bytep prev_row)
{ {
png_uint_32 FullLength, MMXLength; unsigned FullLength, MMXLength; // png_uint_32 is actually 64-bit on x86-64
int bpp; int bpp;
int dummy_value_a; int dummy_value_a;
int dummy_value_c; // fix 'forbidden register 2 (cx) was spilled' error int dummy_value_c; // fix 'forbidden register 2 (cx) was spilled' error
@ -3248,14 +3257,15 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row,
FullLength = row_info->rowbytes; // number of bytes to filter FullLength = row_info->rowbytes; // number of bytes to filter
__asm__ __volatile__ ( __asm__ __volatile__ (
"avg_top: \n\t"
SAVE_GOT_ebx SAVE_GOT_ebx
SAVE_r15 SAVE_r15
SAVE_ebp SAVE_ebp
// initialize address pointers and offset // initialize address pointers and offset
//pre "movl row, %2 \n\t" // edi/rdi: ptr to Avg(x) //pre "movl row, %5 \n\t" // edi/rdi: ptr to Avg(x)
"xorl %%ebx, %%ebx \n\t" // ebx: x "xorl %%ebx, %%ebx \n\t" // ebx: x
//pre "movl prev_row, %1 \n\t" // esi/rsi: ptr to Prior(x) //pre "movl prev_row, %4 \n\t" // esi/rsi: ptr to Prior(x)
"mov %2, " PDX " \n\t" // copy of row ptr... "mov %5, " PDX " \n\t" // copy of row ptr...
//pre "subl bpp, " PDX " \n\t" // (bpp is preloaded into ecx) //pre "subl bpp, " PDX " \n\t" // (bpp is preloaded into ecx)
"sub " PCX "," PDX " \n\t" // edx/rdx: ptr to Raw(x-bpp) "sub " PCX "," PDX " \n\t" // edx/rdx: ptr to Raw(x-bpp)
//pre "movl FullLength, %%eax \n\t" // bring in via eax... //pre "movl FullLength, %%eax \n\t" // bring in via eax...
@ -3265,24 +3275,24 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row,
// Compute the Raw value for the first bpp bytes // Compute the Raw value for the first bpp bytes
// Raw(x) = Avg(x) + (Prior(x)/2) // Raw(x) = Avg(x) + (Prior(x)/2)
"avg_rlp: \n\t" "avg_rlp: \n\t"
"movb (%1," PBX ",), %%al \n\t" // load al with Prior(x) "movb (%4," PBX ",), %%al \n\t" // load al with Prior(x)
"incl %%ebx \n\t" "incl %%ebx \n\t"
"shrb %%al \n\t" // divide by 2 "shrb %%al \n\t" // divide by 2
"addb -1(%2," PBX ",), %%al \n\t" // add Avg(x); -1 to offset inc ebx "addb -1(%5," PBX ",), %%al \n\t" // add Avg(x); -1 to offset inc ebx
//pre "cmpl bpp, %%ebx \n\t" // (bpp is preloaded into ecx) //pre "cmpl bpp, %%ebx \n\t" // (bpp is preloaded into ecx)
"cmpl %%ecx, %%ebx \n\t" "cmpl %%ecx, %%ebx \n\t"
"movb %%al, -1(%2," PBX ",) \n\t" // write Raw(x); -1 to offset inc ebx "movb %%al, -1(%5," PBX ",) \n\t" // write Raw(x); -1 to offset inc ebx
"jb avg_rlp \n\t" // mov does not affect flags "jb avg_rlp \n\t" // mov does not affect flags
// get # of bytes to alignment (32-bit mask _would_ be good enough // get # of bytes to alignment (32-bit mask _would_ be good enough
// [computing delta], but 32-bit ops are zero-extended on 64-bit, argh) // [computing delta], but 32-bit ops are zero-extended on 64-bit, argh)
// (if swapped edx and ebp, could do 8-bit or 16-bit mask...FIXME?) // (if swapped edx and ebp, could do 8-bit or 16-bit mask...FIXME?)
"mov %2, " PBP " \n\t" // take start of row "mov %5, " PBP " \n\t" // take start of row
"add " PBX "," PBP " \n\t" // add bpp "add " PBX "," PBP " \n\t" // add bpp
"add $0xf, " PBP " \n\t" // add 7+8 to incr past alignment bdry "add $0xf, " PBP " \n\t" // add 7+8 to incr past alignment bdry
// "andl $0xfffffff8, %%ebp \n\t" // mask to alignment boundary (32-bit!) // "andl $0xfffffff8, %%ebp \n\t" // mask to alignment boundary (32-bit!)
CLEAR_BOTTOM_3_BITS PBP "\n\t" // mask to alignment boundary CLEAR_BOTTOM_3_BITS PBP "\n\t" // mask to alignment boundary
"sub %2, " PBP " \n\t" // subtract row ptr again => ebp = "sub %5, " PBP " \n\t" // subtract row ptr again => ebp =
"jz avg_go \n\t" // target value of ebx at alignment "jz avg_go \n\t" // target value of ebx at alignment
"xorl %%ecx, %%ecx \n\t" "xorl %%ecx, %%ecx \n\t"
@ -3292,14 +3302,14 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row,
// Raw(x) = Avg(x) + ((Raw(x-bpp) + Prior(x))/2) // Raw(x) = Avg(x) + ((Raw(x-bpp) + Prior(x))/2)
"avg_lp1: \n\t" "avg_lp1: \n\t"
"xorl %%eax, %%eax \n\t" "xorl %%eax, %%eax \n\t"
"movb (%1," PBX ",), %%cl \n\t" // load cl with Prior(x) "movb (%4," PBX ",), %%cl \n\t" // load cl with Prior(x)
"movb (" PDX "," PBX ",), %%al \n\t" // load al with Raw(x-bpp) "movb (" PDX "," PBX ",), %%al \n\t" // load al with Raw(x-bpp)
"addw %%cx, %%ax \n\t" "addw %%cx, %%ax \n\t"
"incl %%ebx \n\t" "incl %%ebx \n\t"
"shrw %%ax \n\t" // divide by 2 "shrw %%ax \n\t" // divide by 2
"addb -1(%2," PBX ",), %%al \n\t" // add Avg(x); -1 to offset inc ebx "addb -1(%5," PBX ",), %%al \n\t" // add Avg(x); -1 to offset inc ebx
"cmpl %%ebp, %%ebx \n\t" // check if at alignment boundary "cmpl %%ebp, %%ebx \n\t" // check if at alignment boundary
"movb %%al, -1(%2," PBX ",) \n\t" // write Raw(x); -1 to offset inc ebx "movb %%al, -1(%5," PBX ",) \n\t" // write Raw(x); -1 to offset inc ebx
"jb avg_lp1 \n\t" // repeat until at alignment boundary "jb avg_lp1 \n\t" // repeat until at alignment boundary
"avg_go: \n\t" "avg_go: \n\t"
@ -3314,15 +3324,32 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row,
RESTORE_r15 RESTORE_r15
RESTORE_GOT_ebx RESTORE_GOT_ebx
: "=c" (MMXLength), // output regs // "There is no way for you to specify that an input operand is modified
"=S" (dummy_value_S), // without also specifying it as an output operand." [makes sense]
"=D" (dummy_value_D),
"=a" (diff)
: "0" (bpp), // ecx // input regs // "Unless an output operand has the `&' constraint modifier, GCC may
"1" (prev_row), // esi/rsi // allocate it in the same register as an unrelated input operand, on the
"2" (row), // edi/rdi // assumption the inputs are consumed before the outputs are produced."
"3" (FullLength) // eax // [trying to _force_ this]
// "`=' Means that this operand is write-only for this instruction:
// the previous value is discarded and replaced by output data."
// [operand == variable name, presumably]
// output regs
// these are operands 0-1 (originally 0-3):
: "=c" (MMXLength), // %0 -> %0
"=a" (diff) // %3 -> %1
// "=S" (dummy_value_S), // %1 -> GONE
// "=D" (dummy_value_D), // %2 -> GONE
// input regs
// these are operands 2-5 (originally 4-7); two of their constraints say
// they must go in same places as operands 0-1 (originally 0-3) above:
: "0" (bpp), // %4 -> %2 ecx
"1" (FullLength), // %7 -> %3 eax
"S" (prev_row), // %5 -> %4 esi/rsi
"D" (row) // %6 -> %5 edi/rdi
: "%edx" // clobber list : "%edx" // clobber list
_CLOBBER_r15 _CLOBBER_r15
@ -3962,13 +3989,14 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row,
); );
} /* end png_read_filter_row_mmx_avg() */ } /* end png_read_filter_row_mmx_avg() */
#endif /* PNG_MMX_READ_FILTER_AVG_SUPPORTED */ #endif /* PNG_MMX_READ_FILTER_AVG_SUPPORTED */
#if defined(PNG_MMX_READ_FILTER_PAETH_SUPPORTED)
#if defined(PNG_x86_64_USE_GOTPCREL) || defined(PNG_THREAD_UNSAFE_OK) #if defined(PNG_x86_64_USE_GOTPCREL) || defined(PNG_THREAD_UNSAFE_OK)
#ifdef PNG_MMX_READ_FILTER_PAETH_SUPPORTED
//===========================================================================// //===========================================================================//
// // // //
// P N G _ R E A D _ F I L T E R _ R O W _ M M X _ P A E T H // // P N G _ R E A D _ F I L T E R _ R O W _ M M X _ P A E T H //
@ -3981,7 +4009,7 @@ static void /* PRIVATE */
png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row,
png_bytep prev_row) png_bytep prev_row)
{ {
png_uint_32 FullLength, MMXLength; unsigned FullLength, MMXLength; // png_uint_32 is actually 64-bit on x86-64
int bpp; int bpp;
int dummy_value_a; int dummy_value_a;
int dummy_value_c; // fix 'forbidden register 2 (cx) was spilled' error int dummy_value_c; // fix 'forbidden register 2 (cx) was spilled' error
@ -5075,14 +5103,15 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row,
); );
} /* end png_read_filter_row_mmx_paeth() */ } /* end png_read_filter_row_mmx_paeth() */
#endif /* PNG_MMX_READ_FILTER_PAETH_SUPPORTED */
#endif // PNG_x86_64_USE_GOTPCREL || PNG_THREAD_UNSAFE_OK #endif // PNG_x86_64_USE_GOTPCREL || PNG_THREAD_UNSAFE_OK
#endif /* PNG_MMX_READ_FILTER_PAETH_SUPPORTED */
#ifdef PNG_MMX_READ_FILTER_SUB_SUPPORTED #if defined(PNG_MMX_READ_FILTER_SUB_SUPPORTED)
//===========================================================================// //===========================================================================//
// // // //
// P N G _ R E A D _ F I L T E R _ R O W _ M M X _ S U B // // P N G _ R E A D _ F I L T E R _ R O W _ M M X _ S U B //
@ -5094,7 +5123,7 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row,
static void /* PRIVATE */ static void /* PRIVATE */
png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row)
{ {
png_uint_32 FullLength, MMXLength; unsigned FullLength, MMXLength; // png_uint_32 is actually 64-bit on x86-64
int bpp; int bpp;
int dummy_value_a; int dummy_value_a;
int dummy_value_c; int dummy_value_c;
@ -5564,12 +5593,14 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row)
); );
} // end of png_read_filter_row_mmx_sub() } // end of png_read_filter_row_mmx_sub()
#endif /* PNG_MMX_READ_FILTER_SUB_SUPPORTED */ #endif /* PNG_MMX_READ_FILTER_SUB_SUPPORTED */
#ifdef PNG_MMX_READ_FILTER_UP_SUPPORTED #if defined(PNG_MMX_READ_FILTER_UP_SUPPORTED)
//===========================================================================// //===========================================================================//
// // // //
// P N G _ R E A D _ F I L T E R _ R O W _ M M X _ U P // // P N G _ R E A D _ F I L T E R _ R O W _ M M X _ U P //
@ -5582,7 +5613,7 @@ static void /* PRIVATE */
png_read_filter_row_mmx_up(png_row_infop row_info, png_bytep row, png_read_filter_row_mmx_up(png_row_infop row_info, png_bytep row,
png_bytep prev_row) png_bytep prev_row)
{ {
png_uint_32 len; unsigned len; // png_uint_32 is actually 64-bit on x86-64
int dummy_value_d; // fix 'forbidden register 3 (dx) was spilled' error int dummy_value_d; // fix 'forbidden register 3 (dx) was spilled' error
png_bytep dummy_value_S; png_bytep dummy_value_S;
png_bytep dummy_value_D; png_bytep dummy_value_D;
@ -5715,6 +5746,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_MMX_READ_FILTER_UP_SUPPORTED */ #endif /* PNG_MMX_READ_FILTER_UP_SUPPORTED */
@ -5726,7 +5758,6 @@ png_read_filter_row_mmx_up(png_row_infop row_info, png_bytep row,
/* */ /* */
/*===========================================================================*/ /*===========================================================================*/
/* Optimized png_read_filter_row routines */ /* Optimized png_read_filter_row routines */
void /* PRIVATE */ void /* PRIVATE */

2
pngpread.c
View File

@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode /* pngpread.c - read a png file in push mode
* *
* Last changed in libpng 1.2.19 July 20, 2007 * Last changed in libpng 1.2.19 July 26, 2007
* 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-2007 Glenn Randers-Pehrson * Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

2
pngread.c
View File

@ -1,7 +1,7 @@
/* pngread.c - read a PNG file /* pngread.c - read a PNG file
* *
* Last changed in libpng 1.2.19 July 20, 2007 * Last changed in libpng 1.2.19 July 26, 2007
* 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-2007 Glenn Randers-Pehrson * Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

2
pngrtran.c
View File

@ -1,7 +1,7 @@
/* pngrtran.c - transforms the data in a row for PNG readers /* pngrtran.c - transforms the data in a row for PNG readers
* *
* Last changed in libpng 1.2.19 July 20, 2007 * Last changed in libpng 1.2.19 July 26, 2007
* 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-2007 Glenn Randers-Pehrson * Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

2
pngrutil.c
View File

@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file /* pngrutil.c - utilities to read a PNG file
* *
* Last changed in libpng 1.2.19 July 20, 2007 * Last changed in libpng 1.2.19 July 26, 2007
* 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-2007 Glenn Randers-Pehrson * Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

2
pngtest.c
View File

@ -1548,4 +1548,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_19beta29 your_png_h_is_not_version_1_2_19beta29; typedef version_1_2_19beta30 your_png_h_is_not_version_1_2_19beta30;

4
pngvcrd.c
View File

@ -3,7 +3,7 @@
* *
* For Intel x86 CPU and Microsoft Visual C++ compiler * For Intel x86 CPU and Microsoft Visual C++ compiler
* *
* Last changed in libpng 1.2.19 July 20, 2007 * Last changed in libpng 1.2.19 July 26, 2007
* 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-2007 Glenn Randers-Pehrson * Copyright (c) 1998-2007 Glenn Randers-Pehrson
* Copyright (c) 1998, Intel Corporation * Copyright (c) 1998, Intel Corporation
@ -22,6 +22,8 @@
* *
* [runtime MMX configuration, GRR 20010102] * [runtime MMX configuration, GRR 20010102]
* *
* [Copy 6 bytes per pixel, not 4, and use stride of 6, not 4, in the
* second loop of interlace processing of 48-bit pixels, GR-P 20070717]
*/ */
#define PNG_INTERNAL #define PNG_INTERNAL

2
pngwutil.c
View File

@ -1,7 +1,7 @@
/* pngwutil.c - utilities to write a PNG file /* pngwutil.c - utilities to write a PNG file
* *
* Last changed in libpng 1.2.19 July 20, 2007 * Last changed in libpng 1.2.19 July 26, 2007
* 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-2007 Glenn Randers-Pehrson * Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

2
scripts/CMakeLists.txt
View File

@ -175,7 +175,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in
# SET UP LINKS # SET UP LINKS
set_target_properties(${PNG_LIB_NAME} PROPERTIES set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 0.${PNGLIB_RELEASE}.1.2.19beta29 # VERSION 0.${PNGLIB_RELEASE}.1.2.19beta30
VERSION 0.${PNGLIB_RELEASE}.0 VERSION 0.${PNGLIB_RELEASE}.0
SOVERSION 0 SOVERSION 0
CLEAN_DIRECT_OUTPUT 1) CLEAN_DIRECT_OUTPUT 1)

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

@ -8,7 +8,7 @@
# Modeled after libxml-config. # Modeled after libxml-config.
version=1.2.19beta29 version=1.2.19beta30
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.19beta29 Version: 1.2.19beta30
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.19beta29 Version: 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:

2
scripts/makefile.cygwin
View File

@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12 LIBNAME = libpng12
PNGMAJ = 0 PNGMAJ = 0
CYGDLL = 12 CYGDLL = 12
PNGMIN = 1.2.19beta29 PNGMIN = 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:

2
scripts/makefile.mingw
View File

@ -78,7 +78,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12 LIBNAME = libpng12
PNGMAJ = 0 PNGMAJ = 0
MINGDLL = 12 MINGDLL = 12
PNGMIN = 1.2.19beta29 PNGMIN = 1.2.19beta30
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll SHAREDLIB=libpng$(MINGDLL).dll

2
scripts/makefile.ne12bsd
View File

@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
LIB= png12 LIB= png12
SHLIB_MAJOR= 0 SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.19beta29 SHLIB_MINOR= 1.2.19beta30
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

@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng
LIB= png LIB= png
SHLIB_MAJOR= 3 SHLIB_MAJOR= 3
SHLIB_MINOR= 1.2.19beta29 SHLIB_MINOR= 1.2.19beta30
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.nommx
View File

@ -7,7 +7,7 @@
# Library name: # Library name:
LIBNAME = libpng12 LIBNAME = libpng12
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.19beta29 PNGMIN = 1.2.19beta30
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:

2
scripts/makefile.openbsd
View File

@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0 SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.19beta29 SHLIB_MINOR= 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
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.19beta29 PNGMIN = 1.2.19beta30
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:

2
scripts/makefile.solaris-x86
View File

@ -8,7 +8,7 @@
# Library name: # Library name:
LIBNAME = libpng12 LIBNAME = libpng12
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.19beta29 PNGMIN = 1.2.19beta30
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.19beta29 ; Version 1.2.19beta30
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.19beta29 ;Version 1.2.19beta30
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