Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Libpng
提交
db05b1eb
T
Third Party Libpng
项目概览
OpenHarmony
/
Third Party Libpng
11 个月 前同步成功
通知
4
Star
22
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Libpng
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
db05b1eb
编写于
9月 02, 2007
作者:
G
Glenn Randers-Pehrson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Imported from libpng-1.2.20rc5.tar
上级
d20666a2
变更
53
隐藏空白更改
内联
并排
Showing
53 changed file
with
311 addition
and
225 deletion
+311
-225
ANNOUNCE
ANNOUNCE
+18
-14
CHANGES
CHANGES
+4
-0
INSTALL
INSTALL
+8
-8
KNOWNBUG
KNOWNBUG
+3
-20
LICENSE
LICENSE
+2
-2
Makefile.am
Makefile.am
+1
-1
Makefile.in
Makefile.in
+2
-1
README
README
+7
-7
Y2KINFO
Y2KINFO
+2
-2
configure
configure
+86
-35
configure.ac
configure.ac
+13
-2
libpng-1.2.20rc5.txt
libpng-1.2.20rc5.txt
+3
-3
libpng.3
libpng.3
+10
-10
libpngpf.3
libpngpf.3
+2
-2
png.5
png.5
+1
-1
png.c
png.c
+4
-56
png.h
png.h
+11
-11
pngconf.h
pngconf.h
+1
-12
pngerror.c
pngerror.c
+1
-1
pnggccrd.c
pnggccrd.c
+100
-0
pngget.c
pngget.c
+0
-4
pngpread.c
pngpread.c
+1
-1
pngtest.c
pngtest.c
+1
-1
scripts/CMakeLists.txt
scripts/CMakeLists.txt
+1
-1
scripts/libpng-config-head.in
scripts/libpng-config-head.in
+1
-1
scripts/libpng.pc-configure.in
scripts/libpng.pc-configure.in
+1
-1
scripts/libpng.pc.in
scripts/libpng.pc.in
+1
-1
scripts/makefile.32sunu
scripts/makefile.32sunu
+1
-1
scripts/makefile.64sunu
scripts/makefile.64sunu
+1
-1
scripts/makefile.aix
scripts/makefile.aix
+1
-1
scripts/makefile.beos
scripts/makefile.beos
+1
-1
scripts/makefile.cygwin
scripts/makefile.cygwin
+1
-2
scripts/makefile.darwin
scripts/makefile.darwin
+1
-1
scripts/makefile.dec
scripts/makefile.dec
+1
-1
scripts/makefile.elf
scripts/makefile.elf
+1
-1
scripts/makefile.gcmmx
scripts/makefile.gcmmx
+1
-1
scripts/makefile.hp64
scripts/makefile.hp64
+1
-1
scripts/makefile.hpgcc
scripts/makefile.hpgcc
+1
-1
scripts/makefile.hpux
scripts/makefile.hpux
+1
-1
scripts/makefile.linux
scripts/makefile.linux
+1
-1
scripts/makefile.mingw
scripts/makefile.mingw
+1
-1
scripts/makefile.ne12bsd
scripts/makefile.ne12bsd
+1
-1
scripts/makefile.netbsd
scripts/makefile.netbsd
+1
-1
scripts/makefile.nommx
scripts/makefile.nommx
+1
-1
scripts/makefile.openbsd
scripts/makefile.openbsd
+1
-1
scripts/makefile.sco
scripts/makefile.sco
+1
-1
scripts/makefile.sggcc
scripts/makefile.sggcc
+1
-1
scripts/makefile.sgi
scripts/makefile.sgi
+1
-1
scripts/makefile.so9
scripts/makefile.so9
+1
-1
scripts/makefile.solaris
scripts/makefile.solaris
+1
-1
scripts/makefile.solaris-x86
scripts/makefile.solaris-x86
+1
-1
scripts/pngos2.def
scripts/pngos2.def
+1
-1
scripts/pngw32.def
scripts/pngw32.def
+1
-1
未找到文件。
ANNOUNCE
浏览文件 @
db05b1eb
Libpng 1.2.20rc
4 - September 1
, 2007
Libpng 1.2.20rc
5 - September 2
, 2007
This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version.
...
...
@@ -9,32 +9,32 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
libpng-1.2.20rc
4
.tar.gz
libpng-1.2.20rc
4
.tar.bz2
libpng-1.2.20rc
5
.tar.gz
libpng-1.2.20rc
5
.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
libpng-1.2.20rc
4
-no-config.tar.gz
libpng-1.2.20rc
4
-no-config.tar.bz2
libpng-1.2.20rc
5
-no-config.tar.gz
libpng-1.2.20rc
5
-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lp1220r0
4
.zip
lp1220r0
4
.tar.bz2
lp1220r0
5
.zip
lp1220r0
5
.tar.bz2
Project files
libpng-1.2.20rc
4
-project-netware.zip
libpng-1.2.20rc
4
-project-wince.zip
libpng-1.2.20rc
5
-project-netware.zip
libpng-1.2.20rc
5
-project-wince.zip
Other information:
libpng-1.2.20rc
4
-README.txt
libpng-1.2.20rc
4
-KNOWNBUGS.txt
libpng-1.2.20rc
4
-LICENSE.txt
libpng-1.2.20rc
4
-Y2K-compliance.txt
libpng-1.2.20rc
5
-README.txt
libpng-1.2.20rc
5
-KNOWNBUGS.txt
libpng-1.2.20rc
5
-LICENSE.txt
libpng-1.2.20rc
5
-Y2K-compliance.txt
Changes since the last public release (1.2.19):
...
...
@@ -62,7 +62,7 @@ version 1.2.20rc2 [August 27, 2007]
Revised #ifdefs to ensure one and only one of pnggccrd.c, pngvcrd.c,
or part of pngrutil.c is selected.
version 1.2.20rc3 [September
1
, 2007]
version 1.2.20rc3 [September
2
, 2007]
Remove a little more code in pngwutil.c when PNG_NO_WRITE_FILTER is selected.
Added /D _CRT_SECURE_NO_WARNINGS to visual6c and visualc71 projects.
Compile png_mmx_support() in png.c even when PNG_NO_MMX_CODE is defined.
...
...
@@ -72,6 +72,10 @@ version 1.2.20rc3 [September 1, 2007]
version 1.2.20rc4 [September 1, 2007]
Removed Intel contributions (MMX, Optimized C).
version 1.2.20rc5 [September 2, 2007]
Restored configure and Makefile.in to rc3 and put a snippet of code in
pnggccrd.c, to ensure configure makes the same PNG_NO_MMX_CODE selection
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
...
...
CHANGES
浏览文件 @
db05b1eb
...
...
@@ -1929,6 +1929,10 @@ version 1.2.20rc3 [August 30, 2007]
version 1.2.20rc4 [September 1, 2007]
Removed Intel contributions (MMX, Optimized C).
version 1.2.20rc5 [September 2, 2007]
Restored configure and Makefile.in to rc3 and put a snippet of code in
pnggccrd.c, to ensure configure makes the same PNG_NO_MMX_CODE selection
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
...
...
INSTALL
浏览文件 @
db05b1eb
Installing libpng version 1.2.20rc
4 - September 1
, 2007
Installing libpng version 1.2.20rc
5 - September 2
, 2007
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.
You can rename the directories that you downloaded (they
might be called "libpng-1.2.20rc
4
" or "lpng109" and "zlib-1.2.1"
might be called "libpng-1.2.20rc
5
" or "lpng109" and "zlib-1.2.1"
or "zlib121") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:
...
...
@@ -101,9 +101,9 @@ include
CMakeLists.txt => "cmake" script
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng12.so.0.1.2.20rc
4
)
gcc, creates libpng12.so.0.1.2.20rc
5
)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.20rc
4
)
(gcc, creates libpng12.so.0.1.2.20rc
5
)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
...
...
@@ -125,14 +125,14 @@ include
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.sggcc => Silicon Graphics (gcc,
creates libpng12.so.0.1.2.20rc
4
)
creates libpng12.so.0.1.2.20rc
5
)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng12.so.0.1.2.20rc
4
)
creates libpng12.so.0.1.2.20rc
5
)
makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc,
creates libpng12.so.0.1.2.20rc
4
)
creates libpng12.so.0.1.2.20rc
5
)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng12.so.0.1.2.20rc
4
)
creates libpng12.so.0.1.2.20rc
5
)
makefile.32sunu => Sun Ultra 32-bit makefile
makefile.64sunu => Sun Ultra 64-bit makefile
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
...
...
KNOWNBUG
浏览文件 @
db05b1eb
Known bugs in libpng version 1.2.20rc
4
Known bugs in libpng version 1.2.20rc
5
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
on a non-MMX i386 platform.
STATUS: Under investigation. The change to pnggccrd.c in libpng-1.2.1
fixed a problem under FreeBSD but not the problem with NetBSD, which
still fails as of libpng-1.2.2rc1.
2. February 23, 2006: The custom makefiles don't build libpng with -lz.
1. February 23, 2006: The custom makefiles don't build libpng with -lz.
STATUS: This is a subject of debate. The change will probably be made
as a part of a major overhaul of the makefiles in libpng version 1.3.0.
3
. February 24, 2006: The Makefile generated by the "configure" script
2
. February 24, 2006: The Makefile generated by the "configure" script
fails to install symbolic links
libpng12.so => libpng12.so.0.1.2.9betaN
that are generated by the custom makefiles.
4. June 28, 2007: Pnggccrd.c has been reported to be unreliable on
several 64-bit platforms running gcc-3.x. Although it appears to
build properly, it does not always read files correctly.
STATUS: Appears to be a bug in the 64-bit version of gcc-3.4.6.
Workarounds are to define PNG_NO_MMX_FILTER_UP|AVG|PAETH (as in
pngconf.h) or to upgrade gcc to a newer version.
LICENSE
浏览文件 @
db05b1eb
...
...
@@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
If you modify libpng you may insert additional notices immediately following
this sentence.
libpng versions 1.2.6, August 15, 2004, through 1.2.20rc
4, September 1
, 2007, are
libpng versions 1.2.6, August 15, 2004, through 1.2.20rc
5, September 2
, 2007, are
Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
...
...
@@ -106,4 +106,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
September
1
, 2007
September
2
, 2007
Makefile.am
浏览文件 @
db05b1eb
...
...
@@ -83,7 +83,7 @@ EXTRA_DIST= \
${srcdir}
/contrib/pngsuite/
*
\
${srcdir}
/contrib/visupng/
*
\
$(TESTS)
\
example.c libpng.txt
example.c libpng.txt
pngvcrd.c
CLEANFILES
=
pngout.png libpng12.pc libpng12-config libpng.vers
\
libpng.sym
...
...
Makefile.in
浏览文件 @
db05b1eb
...
...
@@ -183,6 +183,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS
=
@LDFLAGS@
LIBOBJS
=
@LIBOBJS@
LIBPNG_DEFINES
=
@LIBPNG_DEFINES@
LIBPNG_NO_MMX
=
@LIBPNG_NO_MMX@
LIBS
=
@LIBS@
LIBTOOL
=
@LIBTOOL@
LN_S
=
@LN_S@
...
...
@@ -320,7 +321,7 @@ EXTRA_DIST = \
${srcdir}
/contrib/pngsuite/
*
\
${srcdir}
/contrib/visupng/
*
\
$(TESTS)
\
example.c libpng.txt
example.c libpng.txt
pngvcrd.c
CLEANFILES
=
pngout.png libpng12.pc libpng12-config libpng.vers
\
libpng.sym
...
...
README
浏览文件 @
db05b1eb
README for libpng version 1.2.20rc
4 - September 1
, 2007 (shared library 12.0)
README for libpng version 1.2.20rc
5 - September 2
, 2007 (shared library 12.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
...
...
@@ -190,11 +190,11 @@ Files in this distribution:
descrip.mms => VMS makefile for MMS or MMK
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng12.so.0.1.2.20rc
4
)
gcc, creates libpng12.so.0.1.2.20rc
5
)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.20rc
4
)
(gcc, creates libpng12.so.0.1.2.20rc
5
)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.20rc
4
,
(gcc, creates libpng12.so.0.1.2.20rc
5
,
uses assembler code tuned for Intel MMX platform)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
...
...
@@ -216,12 +216,12 @@ Files in this distribution:
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
(gcc, creates libpng12.so.0.1.2.20rc
4
)
(gcc, creates libpng12.so.0.1.2.20rc
5
)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng12.so.0.1.2.20rc
4
)
(gcc, creates libpng12.so.0.1.2.20rc
5
)
makefile.so9 => Solaris 9 makefile
(gcc, creates libpng12.so.0.1.2.20rc
4
)
(gcc, creates libpng12.so.0.1.2.20rc
5
)
makefile.32sunu => Sun Ultra 32-bit makefile
makefile.64sunu => Sun Ultra 64-bit makefile
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
...
...
Y2KINFO
浏览文件 @
db05b1eb
Y2K compliance in libpng:
=========================
September
1
, 2007
September
2
, 2007
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
upward through 1.2.20rc
4
are Y2K compliant. It is my belief that earlier
upward through 1.2.20rc
5
are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
Libpng only has three year fields. One is a 2-byte unsigned integer
...
...
configure
浏览文件 @
db05b1eb
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for libpng 1.2.20rc
4
.
# Generated by GNU Autoconf 2.61 for libpng 1.2.20rc
5
.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
...
...
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.2.20rc
4
'
PACKAGE_STRING='libpng 1.2.20rc
4
'
PACKAGE_VERSION='1.2.20rc
5
'
PACKAGE_STRING='libpng 1.2.20rc
5
'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
...
...
@@ -876,6 +876,7 @@ LIBTOOL
POW_LIB
LIBOBJS
LIBPNG_DEFINES
LIBPNG_NO_MMX
HAVE_LD_VERSION_SCRIPT_TRUE
HAVE_LD_VERSION_SCRIPT_FALSE
PNGLIB_VERSION
...
...
@@ -1404,7 +1405,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libpng 1.2.20rc
4
to adapt to many kinds of systems.
\`configure' configures libpng 1.2.20rc
5
to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
...
...
@@ -1474,7 +1475,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.2.20rc
4
:";;
short | recursive ) echo "Configuration of libpng 1.2.20rc
5
:";;
esac
cat <<\_ACEOF
...
...
@@ -1584,7 +1585,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.2.20rc
4
libpng configure 1.2.20rc
5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
...
...
@@ -1598,7 +1599,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libpng $as_me 1.2.20rc
4
, which was
It was created by libpng $as_me 1.2.20rc
5
, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
...
...
@@ -2268,7 +2269,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.2.20rc
4
'
VERSION='1.2.20rc
5
'
cat >>confdefs.h <<_ACEOF
...
...
@@ -2439,7 +2440,7 @@ fi
PNGLIB_VERSION=1.2.20rc
4
PNGLIB_VERSION=1.2.20rc
5
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=20
...
...
@@ -4787,7 +4788,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 479
0
"configure"' > conftest.$ac_ext
echo '#line 479
1
"configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
...
...
@@ -7300,11 +7301,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:730
3
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:730
4
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:730
7
: \$? = $ac_status" >&5
echo "$as_me:730
8
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
...
...
@@ -7590,11 +7591,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:759
3
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:759
4
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:759
7
: \$? = $ac_status" >&5
echo "$as_me:759
8
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
...
...
@@ -7694,11 +7695,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:769
7
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:769
8
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:770
1
: \$? = $ac_status" >&5
echo "$as_me:770
2
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
...
...
@@ -10043,7 +10044,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 1004
6
"configure"
#line 1004
7
"configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
...
...
@@ -10143,7 +10144,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 1014
6
"configure"
#line 1014
7
"configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
...
...
@@ -12563,11 +12564,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:1256
6
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:1256
7
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:1257
0
: \$? = $ac_status" >&5
echo "$as_me:1257
1
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
...
...
@@ -12667,11 +12668,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:1267
0
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:1267
1
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:1267
4
: \$? = $ac_status" >&5
echo "$as_me:1267
5
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
...
...
@@ -14229,11 +14230,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:1423
2
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:1423
3
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:1423
6
: \$? = $ac_status" >&5
echo "$as_me:1423
7
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
...
...
@@ -14333,11 +14334,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:1433
6
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:1433
7
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:1434
0
: \$? = $ac_status" >&5
echo "$as_me:1434
1
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
...
...
@@ -16520,11 +16521,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:1652
3
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:1652
4
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:1652
7
: \$? = $ac_status" >&5
echo "$as_me:1652
8
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
...
...
@@ -16810,11 +16811,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:1681
3
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:1681
4
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:1681
7
: \$? = $ac_status" >&5
echo "$as_me:1681
8
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
...
...
@@ -16914,11 +16915,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:1691
7
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:1691
8
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:1692
1
: \$? = $ac_status" >&5
echo "$as_me:1692
2
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
...
...
@@ -20712,6 +20713,55 @@ fi
LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
{ echo "$as_me:$LINENO: checking if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE" >&5
echo $ECHO_N "checking if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include "$srcdir/pnggccrd.c"
int
main ()
{
return 0;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
LIBPNG_NO_MMX=""
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
LIBPNG_NO_MMX=-DPNG_NO_MMX_CODE
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
LIBPNG_DEFINES=$LIBPNG_DEFINES\ $LIBPNG_NO_MMX
{ echo "$as_me:$LINENO: checking if libraries can be versioned" >&5
...
...
@@ -21232,7 +21282,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libpng $as_me 1.2.20rc
4
, which was
This file was extended by libpng $as_me 1.2.20rc
5
, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
...
...
@@ -21285,7 +21335,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
libpng config.status 1.2.20rc
4
libpng config.status 1.2.20rc
5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
...
...
@@ -21613,6 +21663,7 @@ LIBTOOL!$LIBTOOL$ac_delim
POW_LIB!$POW_LIB$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LIBPNG_DEFINES!$LIBPNG_DEFINES$ac_delim
LIBPNG_NO_MMX!$LIBPNG_NO_MMX$ac_delim
HAVE_LD_VERSION_SCRIPT_TRUE!$HAVE_LD_VERSION_SCRIPT_TRUE$ac_delim
HAVE_LD_VERSION_SCRIPT_FALSE!$HAVE_LD_VERSION_SCRIPT_FALSE$ac_delim
PNGLIB_VERSION!$PNGLIB_VERSION$ac_delim
...
...
@@ -21625,7 +21676,7 @@ compatlib!$compatlib$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2
0
; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2
1
; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
...
...
configure.ac
浏览文件 @
db05b1eb
...
...
@@ -18,12 +18,12 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
AC_INIT([libpng], [1.2.20rc
4
], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.2.20rc
5
], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
PNGLIB_VERSION=1.2.20rc
4
PNGLIB_VERSION=1.2.20rc
5
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=20
...
...
@@ -59,7 +59,18 @@ AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_ERROR([cannot find pow])) )
AC_CHECK_LIB(z, zlibVersion, , AC_ERROR([zlib not installed]))
LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
AC_MSG_CHECKING(
[if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE])
AC_TRY_COMPILE(
[#include "$srcdir/pnggccrd.c"],
[return 0;],
AC_MSG_RESULT(yes)
LIBPNG_NO_MMX="",
AC_MSG_RESULT(no)
LIBPNG_NO_MMX=-DPNG_NO_MMX_CODE)
LIBPNG_DEFINES=$LIBPNG_DEFINES\ $LIBPNG_NO_MMX
AC_SUBST(LIBPNG_DEFINES)
AC_SUBST(LIBPNG_NO_MMX)
AC_MSG_CHECKING([if libraries can be versioned])
GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
...
...
libpng-1.2.20rc
4
.txt
→
libpng-1.2.20rc
5
.txt
浏览文件 @
db05b1eb
libpng.txt - A description on how to use and modify libpng
libpng version 1.2.20rc
4 - September 1
, 2007
libpng version 1.2.20rc
5 - September 2
, 2007
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2007 Glenn Randers-Pehrson
...
...
@@ -2796,13 +2796,13 @@ application:
IX. Y2K Compliance in libpng
September
1
, 2007
September
2
, 2007
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
upward through 1.2.20rc
4
are Y2K compliant. It is my belief that earlier
upward through 1.2.20rc
5
are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
Libpng only has three year fields. One is a 2-byte unsigned integer that
...
...
libpng.3
浏览文件 @
db05b1eb
.TH LIBPNG 3 "September
1
, 2007"
.TH LIBPNG 3 "September
2
, 2007"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.20rc
4
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.20rc
5
.SH SYNOPSIS
\fB
#include <png.h>\fP
...
...
@@ -410,7 +410,7 @@ Following is a copy of the libpng.txt file that accompanies libpng.
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
libpng version 1.2.20rc
4 - September 1
, 2007
libpng version 1.2.20rc
5 - September 2
, 2007
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2007 Glenn Randers-Pehrson
...
...
@@ -3206,13 +3206,13 @@ application:
.SH IX. Y2K Compliance in libpng
September
1
, 2007
September
2
, 2007
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
upward through 1.2.20rc
4
are Y2K compliant. It is my belief that earlier
upward through 1.2.20rc
5
are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
Libpng only has three year fields. One is a 2-byte unsigned integer that
...
...
@@ -3407,8 +3407,8 @@ the first widely used release:
1.0.27 10 10027 10.so.0.27[.0]
1.2.19 13 10219 12.so.0.19[.0]
1.2.20beta01-04 13 10220 12.so.0.20[.0]
1.0.28rc1-
4
10 10028 10.so.0.28[.0]
1.2.20rc1-
4
13 10220 12.so.0.20[.0]
1.0.28rc1-
5
10 10028 10.so.0.28[.0]
1.2.20rc1-
5
13 10220 12.so.0.20[.0]
1.0.28 10 10028 10.so.0.28[.0]
1.2.20 13 10220 12.so.0.20[.0]
...
...
@@ -3466,7 +3466,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.2.20rc
4 - September 1
, 2007:
Libpng version 1.2.20rc
5 - September 2
, 2007:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
...
...
@@ -3487,7 +3487,7 @@ included in the libpng distribution, the latter shall prevail.)
If you modify libpng you may insert additional notices immediately following
this sentence.
libpng versions 1.2.6, August 15, 2004, through 1.2.20rc
4, September 1
, 2007, are
libpng versions 1.2.6, August 15, 2004, through 1.2.20rc
5, September 2
, 2007, are
Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
...
...
@@ -3586,7 +3586,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
September
1
, 2007
September
2
, 2007
.\" end of man page
libpngpf.3
浏览文件 @
db05b1eb
.TH LIBPNGPF 3 "September
1
, 2007"
.TH LIBPNGPF 3 "September
2
, 2007"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.20rc
4
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.20rc
5
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
...
...
png.5
浏览文件 @
db05b1eb
.TH PNG 5 "September
1
, 2007"
.TH PNG 5 "September
2
, 2007"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
...
...
png.c
浏览文件 @
db05b1eb
...
...
@@ -13,7 +13,7 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef
version_1_2_20rc
4
Your_png_h_is_not_version_1_2_20rc4
;
typedef
version_1_2_20rc
5
Your_png_h_is_not_version_1_2_20rc5
;
/* Version information for C files. This had better match the version
* string defined in png.h. */
...
...
@@ -693,7 +693,7 @@ png_charp PNGAPI
png_get_copyright
(
png_structp
png_ptr
)
{
png_ptr
=
png_ptr
;
/* silence compiler warning about unused png_ptr */
return
((
png_charp
)
"
\n
libpng version 1.2.20rc
4 - September 1
, 2007
\n
\
return
((
png_charp
)
"
\n
libpng version 1.2.20rc
5 - September 2
, 2007
\n
\
Copyright (c) 1998-2007 Glenn Randers-Pehrson
\n
\
Copyright (c) 1996-1997 Andreas Dilger
\n
\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
\n
"
);
...
...
@@ -730,51 +730,9 @@ png_get_header_version(png_structp png_ptr)
png_ptr
=
png_ptr
;
/* silence compiler warning about unused png_ptr */
return
((
png_charp
)
PNG_HEADER_VERSION_STRING
#ifdef PNG_READ_SUPPORTED
# ifdef PNG_USE_PNGGCCRD
# ifdef __x86_64__
# ifdef __PIC__
" (PNGGCRD x86_64, PIC)
\n
"
# else
# ifdef PNG_THREAD_UNSAFE_OK
" (PNGGCRD x86_64, Thread unsafe)
\n
"
# else
" (PNGGCRD x86_64, Thread safe)
\n
"
# endif
# endif
# else
# ifdef PNG_THREAD_UNSAFE_OK
" (PNGGCRD, Thread unsafe)
\n
"
# else
" (PNGGCRD, Thread safe)
\n
"
# endif
# endif
# else
# ifdef PNG_USE_PNGVCRD
# ifdef __x86_64__
" (x86_64 PNGVCRD)
\n
"
# else
" (PNGVCRD)
\n
"
# endif
# else
# ifdef __x86_64__
# ifdef PNG_OPTIMIZED_CODE_SUPPORTED
" (x86_64 OPTIMIZED)
\n
"
# else
" (x86_64 NOT OPTIMIZED)
\n
"
# endif
# else
# ifdef PNG_OPTIMIZED_CODE_SUPPORTED
" (OPTIMIZED)
\n
"
# else
" (NOT OPTIMIZED)
\n
"
# endif
# endif
# endif
# endif
#else
" (NO READ SUPPORT)
\n
"
" (NO READ SUPPORT)"
#endif
);
"
\n
"
);
}
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
...
...
@@ -815,16 +773,6 @@ png_access_version_number(void)
#if defined(PNG_READ_SUPPORTED) && defined(PNG_ASSEMBLER_CODE_SUPPORTED)
#if !defined(PNG_1_0_X)
#if defined(PNG_MMX_CODE_SUPPORTED)
/* this INTERNAL function was added to libpng 1.2.0 */
void
/* PRIVATE */
png_init_mmx_flags
(
png_structp
png_ptr
)
{
/* obsolete, to be removed from libpng-1.4.0 */
}
#endif
/* !(PNG_MMX_CODE_SUPPORTED) */
/* this function was added to libpng 1.2.0 */
int
PNGAPI
png_mmx_support
(
void
)
...
...
png.h
浏览文件 @
db05b1eb
/* png.h - header file for PNG reference library
*
* libpng version 1.2.20rc
4 - September 1
, 2007
* libpng version 1.2.20rc
5 - September 2
, 2007
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
...
...
@@ -9,7 +9,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.2.20rc
4 - September 1
, 2007: Glenn
* libpng versions 0.97, January 1998, through 1.2.20rc
5 - September 2
, 2007: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
...
...
@@ -156,8 +156,8 @@
* 1.0.27 10 10027 10.so.0.27[.0]
* 1.2.19 13 10219 12.so.0.19[.0]
* 1.2.20beta01-04 13 10220 12.so.0.20[.0]
* 1.0.28rc1-
4
10 10028 10.so.0.28[.0]
* 1.2.20rc1-
4
13 10220 12.so.0.20[.0]
* 1.0.28rc1-
5
10 10028 10.so.0.28[.0]
* 1.2.20rc1-
5
13 10220 12.so.0.20[.0]
* 1.0.28 10 10028 10.so.0.28[.0]
* 1.2.20 13 10220 12.so.0.20[.0]
*
...
...
@@ -189,7 +189,7 @@
* If you modify libpng you may insert additional notices immediately following
* this sentence.
*
* libpng versions 1.2.6, August 15, 2004, through 1.2.20rc
4, September 1
, 2007, are
* libpng versions 1.2.6, August 15, 2004, through 1.2.20rc
5, September 2
, 2007, are
* Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.2.5
* with the following individual added to the list of Contributing Authors:
...
...
@@ -301,13 +301,13 @@
* Y2K compliance in libpng:
* =========================
*
* September
1
, 2007
* September
2
, 2007
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
* upward through 1.2.20rc
4
are Y2K compliant. It is my belief that earlier
* upward through 1.2.20rc
5
are Y2K compliant. It is my belief that earlier
* versions were also Y2K compliant.
*
* Libpng only has three year fields. One is a 2-byte unsigned integer
...
...
@@ -363,9 +363,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.20rc
4
"
#define PNG_LIBPNG_VER_STRING "1.2.20rc
5
"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.2.20rc
4 - September 1
, 2007\n"
" libpng version 1.2.20rc
5 - September 2
, 2007\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
...
...
@@ -377,7 +377,7 @@
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero: */
#define PNG_LIBPNG_VER_BUILD
4
#define PNG_LIBPNG_VER_BUILD
5
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
...
...
@@ -1412,7 +1412,7 @@ struct png_struct_def
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
typedef
png_structp
version_1_2_20rc
4
;
typedef
png_structp
version_1_2_20rc
5
;
typedef
png_struct
FAR
*
FAR
*
png_structpp
;
...
...
pngconf.h
浏览文件 @
db05b1eb
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.2.20rc
4 - September 1
, 2007
* libpng version 1.2.20rc
5 - September 2
, 2007
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
...
...
@@ -765,17 +765,6 @@
# define PNG_MMX_CODE_SUPPORTED
# endif
# if !defined(PNG_USE_PNGVCRD) && defined(PNG_MMX_CODE_SUPPORTED) && \
defined(_MSC_VER)
# define PNG_USE_PNGVCRD
# endif
# if !defined(PNG_USE_PNGGCCRD) && defined(PNG_MMX_CODE_SUPPORTED) && \
!defined(PNG_USE_PNGVCRD)
# define PNG_USE_PNGGCCRD
# define PNG_THREAD_UNSAFE_OK
# endif
#endif
/* end of obsolete code to be removed from libpng-1.4.0 */
...
...
pngerror.c
浏览文件 @
db05b1eb
/* pngerror.c - stub functions for i/o and memory allocation
*
* Last changed in libpng 1.2.20 September
1
, 2007
* Last changed in libpng 1.2.20 September
2
, 2007
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
...
...
pnggccrd.c
浏览文件 @
db05b1eb
/* pnggccrd.c was removed from libpng-1.2.20. */
/* This code snippet is for use by configure's compilation test. */
#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && \
defined(PNG_MMX_CODE_SUPPORTED)
int
PNGAPI
png_dummy_mmx_support
(
void
);
static
int
_mmx_supported
=
2
;
// 0: no MMX; 1: MMX supported; 2: not tested
int
PNGAPI
png_dummy_mmx_support
(
void
)
__attribute__
((
noinline
));
int
PNGAPI
png_dummy_mmx_support
(
void
)
{
int
result
;
#if defined(PNG_MMX_CODE_SUPPORTED) // superfluous, but what the heck
__asm__
__volatile__
(
#if defined(__x86_64__)
"pushq %%rbx
\n\t
"
// rbx gets clobbered by CPUID instruction
"pushq %%rcx
\n\t
"
// so does rcx...
"pushq %%rdx
\n\t
"
// ...and rdx (but rcx & rdx safe on Linux)
"pushfq
\n\t
"
// save Eflag to stack
"popq %%rax
\n\t
"
// get Eflag from stack into rax
"movq %%rax, %%rcx
\n\t
"
// make another copy of Eflag in rcx
"xorl $0x200000, %%eax
\n\t
"
// toggle ID bit in Eflag (i.e., bit 21)
"pushq %%rax
\n\t
"
// save modified Eflag back to stack
"popfq
\n\t
"
// restore modified value to Eflag reg
"pushfq
\n\t
"
// save Eflag to stack
"popq %%rax
\n\t
"
// get Eflag from stack
"pushq %%rcx
\n\t
"
// save original Eflag to stack
"popfq
\n\t
"
// restore original Eflag
#else
"pushl %%ebx
\n\t
"
// ebx gets clobbered by CPUID instruction
"pushl %%ecx
\n\t
"
// so does ecx...
"pushl %%edx
\n\t
"
// ...and edx (but ecx & edx safe on Linux)
"pushfl
\n\t
"
// save Eflag to stack
"popl %%eax
\n\t
"
// get Eflag from stack into eax
"movl %%eax, %%ecx
\n\t
"
// make another copy of Eflag in ecx
"xorl $0x200000, %%eax
\n\t
"
// toggle ID bit in Eflag (i.e., bit 21)
"pushl %%eax
\n\t
"
// save modified Eflag back to stack
"popfl
\n\t
"
// restore modified value to Eflag reg
"pushfl
\n\t
"
// save Eflag to stack
"popl %%eax
\n\t
"
// get Eflag from stack
"pushl %%ecx
\n\t
"
// save original Eflag to stack
"popfl
\n\t
"
// restore original Eflag
#endif
"xorl %%ecx, %%eax
\n\t
"
// compare new Eflag with original Eflag
"jz 0f
\n\t
"
// if same, CPUID instr. is not supported
"xorl %%eax, %%eax
\n\t
"
// set eax to zero
// ".byte 0x0f, 0xa2 \n\t" // CPUID instruction (two-byte opcode)
"cpuid
\n\t
"
// get the CPU identification info
"cmpl $1, %%eax
\n\t
"
// make sure eax return non-zero value
"jl 0f
\n\t
"
// if eax is zero, MMX is not supported
"xorl %%eax, %%eax
\n\t
"
// set eax to zero and...
"incl %%eax
\n\t
"
// ...increment eax to 1. This pair is
// faster than the instruction "mov eax, 1"
"cpuid
\n\t
"
// get the CPU identification info again
"andl $0x800000, %%edx
\n\t
"
// mask out all bits but MMX bit (23)
"cmpl $0, %%edx
\n\t
"
// 0 = MMX not supported
"jz 0f
\n\t
"
// non-zero = yes, MMX IS supported
"movl $1, %%eax
\n\t
"
// set return value to 1
"jmp 1f
\n\t
"
// DONE: have MMX support
"0:
\n\t
"
// .NOT_SUPPORTED: target label for jump instructions
"movl $0, %%eax
\n\t
"
// set return value to 0
"1:
\n\t
"
// .RETURN: target label for jump instructions
#if defined(__x86_64__)
"popq %%rdx
\n\t
"
// restore rdx
"popq %%rcx
\n\t
"
// restore rcx
"popq %%rbx
\n\t
"
// restore rbx
#else
"popl %%edx
\n\t
"
// restore edx
"popl %%ecx
\n\t
"
// restore ecx
"popl %%ebx
\n\t
"
// restore ebx
#endif
// "ret \n\t" // DONE: no MMX support
// (fall through to standard C "ret")
:
"=a"
(
result
)
// output list
:
// any variables used on input (none)
// no clobber list
// , "%ebx", "%ecx", "%edx" // GRR: we handle these manually
// , "memory" // if write to a variable gcc thought was in a reg
// , "cc" // "condition codes" (flag bits)
);
_mmx_supported
=
result
;
#else
_mmx_supported
=
0
;
#endif
/* PNG_MMX_CODE_SUPPORTED */
return
_mmx_supported
;
}
#endif
pngget.c
浏览文件 @
db05b1eb
...
...
@@ -842,11 +842,7 @@ png_uint_32 PNGAPI
png_get_asm_flags
(
png_structp
png_ptr
)
{
/* obsolete, to be removed from libpng-1.4.0 */
#ifdef PNG_MMX_CODE_SUPPORTED
return
(
png_uint_32
)(
png_ptr
?
png_ptr
->
asm_flags
:
0L
);
#else
return
(
png_ptr
?
0L
:
0L
);
#endif
}
/* this function was added to libpng 1.2.0 and should exist by default */
...
...
pngpread.c
浏览文件 @
db05b1eb
/* pngpread.c - read a png file in push mode
*
* Last changed in libpng 1.2.20 September
1
, 2007
* Last changed in libpng 1.2.20 September
2
, 2007
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
...
...
pngtest.c
浏览文件 @
db05b1eb
...
...
@@ -1548,4 +1548,4 @@ main(int argc, char *argv[])
}
/* Generate a compiler error if there is an old png.h in the search path. */
typedef
version_1_2_20rc
4
your_png_h_is_not_version_1_2_20rc4
;
typedef
version_1_2_20rc
5
your_png_h_is_not_version_1_2_20rc5
;
scripts/CMakeLists.txt
浏览文件 @
db05b1eb
...
...
@@ -165,7 +165,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in
# SET UP LINKS
set_target_properties
(
${
PNG_LIB_NAME
}
PROPERTIES
# VERSION 0.${PNGLIB_RELEASE}.1.2.20rc
4
# VERSION 0.${PNGLIB_RELEASE}.1.2.20rc
5
VERSION 0.
${
PNGLIB_RELEASE
}
.0
SOVERSION 0
CLEAN_DIRECT_OUTPUT 1
)
...
...
scripts/libpng-config-head.in
浏览文件 @
db05b1eb
...
...
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
version
=
1.2.20rc
4
version
=
1.2.20rc
5
prefix
=
""
libdir
=
""
libs
=
""
...
...
scripts/libpng.pc-configure.in
浏览文件 @
db05b1eb
...
...
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng12
Name: libpng
Description: Loads and saves PNG files
Version: 1.2.20rc
4
Version: 1.2.20rc
5
Libs: -L${libdir} -lpng12
Cflags: -I${includedir} @LIBPNG_NO_MMX@
scripts/libpng.pc.in
浏览文件 @
db05b1eb
...
...
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng12
Name: libpng
Description: Loads and saves PNG files
Version: 1.2.20rc
4
Version: 1.2.20rc
5
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}
scripts/makefile.32sunu
浏览文件 @
db05b1eb
...
...
@@ -8,7 +8,7 @@
# Library name:
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
# Shared library names:
...
...
scripts/makefile.64sunu
浏览文件 @
db05b1eb
...
...
@@ -8,7 +8,7 @@
# Library name:
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
# Shared library names:
...
...
scripts/makefile.aix
浏览文件 @
db05b1eb
...
...
@@ -20,7 +20,7 @@ LN_SF = ln -f -s
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
prefix
=
/usr/local
...
...
scripts/makefile.beos
浏览文件 @
db05b1eb
...
...
@@ -8,7 +8,7 @@
# Library name:
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
# Shared library names:
...
...
scripts/makefile.cygwin
浏览文件 @
db05b1eb
...
...
@@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME
=
libpng12
PNGMAJ
=
0
CYGDLL
=
12
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
SHAREDLIB
=
cygpng
$(CYGDLL)
.dll
...
...
@@ -288,7 +288,6 @@ pngwrite.o pngwrite.pic.o: png.h pngconf.h pngwrite.c
pngwtran.o pngwtran.pic.o
:
png.h pngconf.h pngwtran.c
pngwutil.o pngwutil.pic.o
:
png.h pngconf.h pngwutil.c
pngpread.o pngpread.pic.o
:
png.h pngconf.h pngpread.c
# pnggccrd.o pnggccrd.pic.o: png.h pngconf.h pnggccrd.c
pngtest.o
:
png.h pngconf.h pngtest.c
pngtest-stat.o
:
png.h pngconf.h pngtest.c
...
...
scripts/makefile.darwin
浏览文件 @
db05b1eb
...
...
@@ -19,7 +19,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
# Shared library names:
...
...
scripts/makefile.dec
浏览文件 @
db05b1eb
...
...
@@ -5,7 +5,7 @@
# Library name:
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
LIBNAME
=
libpng12
...
...
scripts/makefile.elf
浏览文件 @
db05b1eb
...
...
@@ -12,7 +12,7 @@
# Library name:
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
# Shared library names:
...
...
scripts/makefile.gcmmx
浏览文件 @
db05b1eb
...
...
@@ -14,7 +14,7 @@
# Library name:
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
# Shared library names:
...
...
scripts/makefile.hp64
浏览文件 @
db05b1eb
...
...
@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
# Shared library names:
...
...
scripts/makefile.hpgcc
浏览文件 @
db05b1eb
...
...
@@ -8,7 +8,7 @@
# Library name:
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
# Shared library names:
...
...
scripts/makefile.hpux
浏览文件 @
db05b1eb
...
...
@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
# Shared library names:
...
...
scripts/makefile.linux
浏览文件 @
db05b1eb
...
...
@@ -6,7 +6,7 @@
# Library name:
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
# Shared library names:
...
...
scripts/makefile.mingw
浏览文件 @
db05b1eb
...
...
@@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME
=
libpng12
PNGMAJ
=
0
MINGDLL
=
12
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
SHAREDLIB
=
libpng
$(MINGDLL)
.dll
...
...
scripts/makefile.ne12bsd
浏览文件 @
db05b1eb
...
...
@@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
LIB
=
png12
SHLIB_MAJOR
=
0
SHLIB_MINOR
=
1.2.20rc
4
SHLIB_MINOR
=
1.2.20rc
5
SRCS
=
png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c
\
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c
\
pngwtran.c pngmem.c pngerror.c pngpread.c
...
...
scripts/makefile.netbsd
浏览文件 @
db05b1eb
...
...
@@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng
LIB
=
png
SHLIB_MAJOR
=
3
SHLIB_MINOR
=
1.2.20rc
4
SHLIB_MINOR
=
1.2.20rc
5
SRCS
=
png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c
\
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c
\
pngwtran.c pngmem.c pngerror.c pngpread.c
...
...
scripts/makefile.nommx
浏览文件 @
db05b1eb
...
...
@@ -7,7 +7,7 @@
# Library name:
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
# Shared library names:
...
...
scripts/makefile.openbsd
浏览文件 @
db05b1eb
...
...
@@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR
=
${PREFIX}
/man/cat
SHLIB_MAJOR
=
0
SHLIB_MINOR
=
1.2.20rc
4
SHLIB_MINOR
=
1.2.20rc
5
LIB
=
png
SRCS
=
png.c pngerror.c pngget.c pngmem.c pngpread.c
\
...
...
scripts/makefile.sco
浏览文件 @
db05b1eb
...
...
@@ -9,7 +9,7 @@
# Library name:
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
# Shared library names:
...
...
scripts/makefile.sggcc
浏览文件 @
db05b1eb
...
...
@@ -6,7 +6,7 @@
# Library name:
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
# Shared library names:
...
...
scripts/makefile.sgi
浏览文件 @
db05b1eb
...
...
@@ -6,7 +6,7 @@
# Library name:
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
# Shared library names:
...
...
scripts/makefile.so9
浏览文件 @
db05b1eb
...
...
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
LIBNAME
=
libpng12
...
...
scripts/makefile.solaris
浏览文件 @
db05b1eb
...
...
@@ -8,7 +8,7 @@
# Library name:
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
# Shared library names:
...
...
scripts/makefile.solaris-x86
浏览文件 @
db05b1eb
...
...
@@ -8,7 +8,7 @@
# Library name:
LIBNAME
=
libpng12
PNGMAJ
=
0
PNGMIN
=
1.2.20rc
4
PNGMIN
=
1.2.20rc
5
PNGVER
=
$(PNGMAJ)
.
$(PNGMIN)
# Shared library names:
...
...
scripts/pngos2.def
浏览文件 @
db05b1eb
...
...
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
; Version 1.2.20rc
4
; Version 1.2.20rc
5
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
...
...
scripts/pngw32.def
浏览文件 @
db05b1eb
...
...
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.2.20rc
4
;Version 1.2.20rc
5
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录