Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Libpng
提交
98eb24c7
T
Third Party Libpng
项目概览
OpenHarmony
/
Third Party Libpng
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
98eb24c7
编写于
4月 17, 2010
作者:
G
Glenn Randers-Pehrson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[devel] Updated contrib/pngminim project to work with the new pnglibconf.h
上级
8bdfb47d
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
89 addition
and
132 deletion
+89
-132
contrib/pngminim/decoder/gather.sh
contrib/pngminim/decoder/gather.sh
+13
-21
contrib/pngminim/decoder/makefile
contrib/pngminim/decoder/makefile
+14
-34
contrib/pngminim/decoder/pngusr.h
contrib/pngminim/decoder/pngusr.h
+7
-4
contrib/pngminim/encoder/gather.sh
contrib/pngminim/encoder/gather.sh
+15
-21
contrib/pngminim/encoder/makefile
contrib/pngminim/encoder/makefile
+10
-36
contrib/pngminim/encoder/pngusr.h
contrib/pngminim/encoder/pngusr.h
+3
-4
contrib/pngminim/preader/gather.sh
contrib/pngminim/preader/gather.sh
+16
-7
contrib/pngminim/preader/makefile
contrib/pngminim/preader/makefile
+8
-1
contrib/pngminim/preader/pngusr.h
contrib/pngminim/preader/pngusr.h
+3
-4
未找到文件。
contrib/pngminim/decoder/gather.sh
浏览文件 @
98eb24c7
# Get the source for the pngminus application
cp
../../pngminus/png2pnm.c pngm2pnm.c
# Get the libpng sources
cp
../../../
*
.h
.
cp
../../../
*
.c
.
# Get the libpng scripts for building pnglibconf.h
cp
../../../scripts/options.awk
.
cp
../../../scripts/pnglibconf.dfa
.
sed
-e
"s:scripts/::g"
../../../scripts/pnglibconf.mak
>
pnglibconf.mak
#14+%
# Remove libpng sources we won't use
test
-n
"
${
PNGSRC
}
"
||
PNGSRC
=
../../..
cp
${
PNGSRC
}
/contrib/pngminus/png2pnm.c pngm2pnm.c
cp
"
${
PNGSRC
}
"
/
*
.h
.
cp
"
${
PNGSRC
}
"
/
*
.c
.
rm
example.c pngtest.c pngpread.c pngw
*
.c
# Get the zlib sources
# Change the following 2 lines if zlib is somewhere else
cp
../../../../zlib/
*
.h
.
cp
../../../../zlib/
*
.c
.
# Remove zlib sources we won't use
rm
-f
pnglibconf.h
test
-d
scripts
||
mkdir
scripts
cp
"
${
PNGSRC
}
"
/scripts/pnglibconf.mak scripts
cp
"
${
PNGSRC
}
"
/scripts/pnglibconf.dfa scripts
cp
"
${
PNGSRC
}
"
/scripts/options.awk scripts
# change the following if zlib is somewhere else
test
-n
"
${
ZLIBSRC
}
"
||
ZLIBSRC
=
"
${
PNGSRC
}
"
/../zlib
cp
"
${
ZLIBSRC
}
"
/
*
.h
.
cp
"
${
ZLIBSRC
}
"
/
*
.c
.
rm
minigzip.c example.c compress.c deflate.c gz
*
contrib/pngminim/decoder/makefile
浏览文件 @
98eb24c7
...
...
@@ -4,9 +4,6 @@
#CC=cc
CC
=
gcc
LD
=
$(CC)
AWK
=
awk
SED
=
sed
CPP
=
cpp
RM
=
rm
-f
...
...
@@ -28,50 +25,33 @@ OBJS = pngm2pnm$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
# implicit make rules -------------------------------------------------------
.c$(O)
:
png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngusr.h zlib.h
# note: dependencies do not work on implicit rule lines
.c$(O)
:
$(CC)
-c
$(CFLAGS)
$<
# dependencies
all
:
pngm2pnm$(E)
# see scripts/pnglibconf.mak for more options
pnglibconf.h
:
pnglibconf.mak pnglibconf.dfn
make
-f
pnglibconf.mak pnglibconf.h
# used on demand to regenerate the standard header, CPPFLAGS should
# be empty - no non-standard defines
.dfn.out
:
rm
-f
$@
dfn.c dfn?.out
echo
'#include "$<"'
>
dfn.c
$(CPP)
$(DEFS)
$(DEFAULT_INCLUDES)
$(INCLUDES)
@LIBPNG_DEFINES@
\
$(CPPFLAGS)
$(SYMBOL_CFLAGS)
dfn.c
>
dfn1.out
$(SED)
-n
-e
's|^.*PNG_DEFN_MAGIC-\(.*\)-PNG_DEFN_END.*$$|\1|p'
\
dfn1.out
>
dfn2.out
$(SED)
-e
's| *@@@ *||g'
-e
's| *$$||'
dfn2.out
>
dfn3.out
rm
-f
dfn.c dfn[12].out
mv
dfn3.out
$@
pnglibconf.dfn
:
pnglibconf.dfa options.awk
rm
-f
$@
dfn?.out
test
-z
"
$(CPPFLAGS)
"
echo
"com @PNGLIB_VERSION@ STANDARD API DEFINITION"
|
\
$(AWK)
-f
options.awk
pre
=
1
out
=
dfn1.out
\
logunsupported
=
1 - pnglibconf.dfa 1>&2
$(AWK)
-f
options.awk
pre
=
0
out
=
dfn2.out
\
logunsupported
=
1 dfn1.out 1>&2
rm
dfn1.out
mv
dfn2.out
$@
pngm2pnm$(E)
:
$(OBJS)
$(LD)
-o
pngm2pnm
$(E)
$(OBJS)
strip pngm2pnm
$(E)
pnglibconf.h
:
scripts/pnglibconf.mak scripts/pnglibconf.dfa
\
scripts/options.awk pngusr.h
rm
-f
pnglibconf.h
$(MAKE)
$(MAKEFLAGS)
-f
scripts/pnglibconf.mak\
CPPFLAGS
=
-DPNG_USER_CONFIG
$@
clean
:
$(MAKE)
$(MAKEFLAGS)
-f
scripts/pnglibconf.mak clean
$(RM)
pngm2pnm
$(O)
$(RM)
pngm2pnm
$(E)
$(RM)
$(OBJS)
$(OBJS)
:
png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h
\
pnginfo.h pngdebug.h zlib.h
# End of makefile for pngm2pnm
contrib/pngminim/decoder/pngusr.h
浏览文件 @
98eb24c7
...
...
@@ -12,12 +12,15 @@
#ifndef MINRDPNGCONF_H
#define MINRDPNGCONF_H
#ifdef NJET
/* No 16-bit support beyond reading with strip_16 */
#endif
#define PNG_USER_PRIVATEBUILD "PNG minimal build"
#define PNG_USER_DLLFNAME_POSTFIX "MN"
#define PNG_NO_WARNINGS
#define png_warning(s1,s2) ""
#define png_chunk_warning(s1,s2) ""
#define PNG_NO_ERROR_TEXT
#define png_error(s1,s2) png_err(s1)
#define png_chunk_error(s1,s2) png_err(s1)
#define PNG_NO_READ_GAMMA
#define PNG_NO_READ_BACKGROUND
...
...
contrib/pngminim/encoder/gather.sh
浏览文件 @
98eb24c7
# Get the source for the pngminus application
cp
../../pngminus/pnm2png.c pnm2pngm.c
# Get the libpng sources
cp
../../../
*
.h
.
cp
../../../
*
.c
.
# Get the libpng scripts for building pnglibconf.h
cp
../../../scripts/options.awk
.
cp
../../../scripts/pnglibconf.dfa
.
sed
-e
"s:scripts/::g"
../../../scripts/pnglibconf.mak
>
pnglibconf.mak
#14+%
# Remove libpng sources we won't use
test
-n
"
${
PNGSRC
}
"
||
PNGSRC
=
../../..
cp
${
PNGSRC
}
/contrib/pngminus/pnm2png.c pnm2pngm.c
cp
"
${
PNGSRC
}
"
/
*
.h
.
cp
"
${
PNGSRC
}
"
/
*
.c
.
rm
example.c pngtest.c pngr
*
.c pngpread.c
rm
-f
pnglibconf.h
test
-d
scripts
||
mkdir
scripts
cp
"
${
PNGSRC
}
"
/scripts/pnglibconf.mak scripts
cp
"
${
PNGSRC
}
"
/scripts/pnglibconf.dfa scripts
cp
"
${
PNGSRC
}
"
/scripts/options.awk scripts
# change the following if zlib is somewhere else
test
-n
"
${
ZLIBSRC
}
"
||
ZLIBSRC
=
"
${
PNGSRC
}
"
/../zlib
cp
"
${
ZLIBSRC
}
"
/
*
.h
.
cp
"
${
ZLIBSRC
}
"
/
*
.c
.
rm
inf
*
.[ch]
rm
minigzip.c example.c gz
*
# Get the zlib sources
# Change the following 2 lines if zlib is somewhere else
cp
../../../../zlib/
*
.h
.
cp
../../../../zlib/
*
.c
.
# Remove zlib sources we won't use
rm
minigzip.c example.c inf
*
.[ch] gz
*
contrib/pngminim/encoder/makefile
浏览文件 @
98eb24c7
# Makefile for PngMinus (pnm2pngm)
# Linux / Unix
#CC=cc
CC
=
gcc
LD
=
$(CC)
AWK
=
awk
SED
=
sed
CPP
=
cpp
RM
=
rm
-f
CFLAGS
=
-DPNG_USER_CONFIG
-DNO_GZ
COMPRESS
-DNO_GZ
IP
-I
.
-O1
CFLAGS
=
-DPNG_USER_CONFIG
-DNO_GZIP
-I
.
-O1
C
=
.c
O
=
.o
...
...
@@ -28,49 +24,27 @@ OBJS = pnm2pngm$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
# implicit make rules -------------------------------------------------------
.c$(O)
:
png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngusr.h zlib.h
.c$(O)
:
$(CC)
-c
$(CFLAGS)
$<
# dependencies
all
:
pnm2pngm$(E)
# see scripts/pnglibconf.mak for more options
pnglibconf.h
:
pnglibconf.mak pnglibconf.dfn
make
-f
pnglibconf.mak pnglibconf.h
# used on demand to regenerate the standard header, CPPFLAGS should
# be empty - no non-standard defines
.dfn.out
:
rm
-f
$@
dfn.c dfn?.out
echo
'#include "$<"'
>
dfn.c
$(CPP)
$(DEFS)
$(DEFAULT_INCLUDES)
$(INCLUDES)
@LIBPNG_DEFINES@
\
$(CPPFLAGS)
$(SYMBOL_CFLAGS)
dfn.c
>
dfn1.out
$(SED)
-n
-e
's|^.*PNG_DEFN_MAGIC-\(.*\)-PNG_DEFN_END.*$$|\1|p'
\
dfn1.out
>
dfn2.out
$(SED)
-e
's| *@@@ *||g'
-e
's| *$$||'
dfn2.out
>
dfn3.out
rm
-f
dfn.c dfn[12].out
mv
dfn3.out
$@
pnglibconf.dfn
:
pnglibconf.dfa options.awk
rm
-f
$@
dfn?.out
test
-z
"
$(CPPFLAGS)
"
echo
"com @PNGLIB_VERSION@ STANDARD API DEFINITION"
|
\
$(AWK)
-f
options.awk
pre
=
1
out
=
dfn1.out
\
logunsupported
=
1 - pnglibconf.dfa 1>&2
$(AWK)
-f
options.awk
pre
=
0
out
=
dfn2.out
\
logunsupported
=
1 dfn1.out 1>&2
rm
dfn1.out
mv
dfn2.out
$@
pnm2pngm$(E)
:
$(OBJS)
$(LD)
-o
pnm2pngm
$(E)
$(OBJS)
strip pnm2pngm
$(E)
pnglibconf.h
:
scripts/pnglibconf.mak scripts/pnglibconf.dfa scripts/options.awk pngusr.h
rm
-f
pnglibconf.h
$(MAKE)
$(MAKEFLAGS)
-f
scripts/pnglibconf.mak
CPPFLAGS
=
-DPNG_USER_CONFIG
$@
clean
:
$(MAKE)
$(MAKEFLAGS)
-f
scripts/pnglibconf.mak clean
$(RM)
pnm2pngm
$(O)
$(RM)
pnm2pngm
$(E)
$(RM)
$(OBJS)
# End of makefile for pngm2pnm
$(OBJS)
:
png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngusr.h zlib.h
# End of makefile for pnm2pngm
contrib/pngminim/encoder/pngusr.h
浏览文件 @
98eb24c7
...
...
@@ -12,14 +12,13 @@
#ifndef MINWRPNGCONF_H
#define MINWRPNGCONF_H
#define PNG_USER_PRIVATEBUILD "PNG minimal build"
#define PNG_USER_DLLFNAME_POSTFIX "MN"
#define PNG_NO_READ_SUPPORTED
#define PNG_NO_WARNINGS
#define png_warning(s1,s2) ""
#define png_chunk_warning(s1,s2) ""
#define PNG_NO_ERROR_TEXT
#define png_error(s1,s2) png_err(s1)
#define png_chunk_error(s1,s2) png_err(s1)
#define PNG_NO_WRITE_BACKGROUND
#define PNG_NO_WRITE_GAMMA
...
...
contrib/pngminim/preader/gather.sh
浏览文件 @
98eb24c7
cp
../../gregbook/rpng2-x.c ../../gregbook/readpng2.[ch]
.
cp
../../gregbook/COPYING ../../gregbook/LICENSE
.
cp
../../../
*
.h
.
cp
../../../
*
.c
.
test
-n
"
${
PNGSRC
}
"
||
PNGSRC
=
../../..
cp
"
${
PNGSRC
}
"
/contrib/gregbook/rpng2-x.c
.
cp
"
${
PNGSRC
}
"
/contrib/gregbook/readpng2.[ch]
.
cp
"
${
PNGSRC
}
"
/contrib/gregbook/COPYING
.
cp
"
${
PNGSRC
}
"
/contrib/gregbook/LICENSE
.
cp
"
${
PNGSRC
}
"
/
*
.h
.
cp
"
${
PNGSRC
}
"
/
*
.c
.
rm
example.c pngtest.c pngw
*
.c
# change the following 2 lines if zlib is somewhere else
cp
../../../../zlib/
*
.h
.
cp
../../../../zlib/
*
.c
.
rm
-f
pnglibconf.h
test
-d
scripts
||
mkdir
scripts
cp
"
${
PNGSRC
}
"
/scripts/pnglibconf.mak scripts
cp
"
${
PNGSRC
}
"
/scripts/pnglibconf.dfa scripts
cp
"
${
PNGSRC
}
"
/scripts/options.awk scripts
# change the following if zlib is somewhere else
test
-n
"
${
ZLIBSRC
}
"
||
ZLIBSRC
=
"
${
PNGSRC
}
"
/../zlib
cp
"
${
ZLIBSRC
}
"
/
*
.h
.
cp
"
${
ZLIBSRC
}
"
/
*
.c
.
rm
minigzip.c example.c compress.c deflate.c gz
*
contrib/pngminim/preader/makefile
浏览文件 @
98eb24c7
...
...
@@ -41,7 +41,7 @@ OBJS = rpng2-x$(O) readpng2$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
# implicit make rules -------------------------------------------------------
.c$(O)
:
png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h readpng2.h pngusr.h zlib.h
.c$(O)
:
$(CC)
-c
$(CFLAGS)
$<
# dependencies
...
...
@@ -52,9 +52,16 @@ rpng2-x$(E): $(OBJS)
$(LD)
-o
rpng2-x
$(E)
$(OBJS)
$(LIBS)
strip rpng2-x
$(E)
pnglibconf.h
:
scripts/pnglibconf.mak scripts/pnglibconf.dfa scripts/options.awk pngusr.h
rm
-f
pnglibconf.h
$(MAKE)
$(MAKEFLAGS)
-f
scripts/pnglibconf.mak
CPPFLAGS
=
-DPNG_USER_CONFIG
$@
clean
:
$(MAKE)
$(MAKEFLAGS)
-f
scripts/pnglibconf.mak clean
$(RM)
rpng2-x
$(O)
$(RM)
rpng2-x
$(E)
$(RM)
$(OBJS)
$(OBJS)
:
png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h readpng2.h pngusr.h zlib.h
# End of makefile for rpng2-x
contrib/pngminim/preader/pngusr.h
浏览文件 @
98eb24c7
...
...
@@ -12,12 +12,11 @@
#ifndef MINPRDPNGCONF_H
#define MINPRDPNGCONF_H
#define PNG_USER_PRIVATEBUILD "PNG minimal build"
#define PNG_USER_DLLFNAME_POSTFIX "MN"
#define PNG_NO_WARNINGS
#define png_warning(s1,s2) ""
#define png_chunk_warning(s1,s2) ""
#define PNG_NO_ERROR_TEXT
#define png_error(s1,s2) png_err(s1)
#define png_chunk_error(s1,s2) png_err(s1)
#define PNG_NO_READ_QUANTIZE
#define PNG_NO_READ_INVERT
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录