Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Libpng
提交
f1b547a5
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,发现更多精彩内容 >>
提交
f1b547a5
编写于
11月 04, 2014
作者:
G
Glenn Randers-Pehrson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[libpng16] Use png_get_libpng_ver(NULL), not PNG_LIBPNG_VER_STRING
上级
5efb1327
变更
21
隐藏空白更改
内联
并排
Showing
21 changed file
with
56 addition
and
50 deletion
+56
-50
ANNOUNCE
ANNOUNCE
+4
-2
CHANGES
CHANGES
+3
-1
contrib/examples/iccfrompng.c
contrib/examples/iccfrompng.c
+1
-1
contrib/examples/pngpixel.c
contrib/examples/pngpixel.c
+1
-1
contrib/gregbook/readpng.c
contrib/gregbook/readpng.c
+2
-1
contrib/gregbook/readpng2.c
contrib/gregbook/readpng2.c
+1
-1
contrib/gregbook/writepng.c
contrib/gregbook/writepng.c
+1
-1
contrib/libtests/makepng.c
contrib/libtests/makepng.c
+1
-1
contrib/libtests/pngimage.c
contrib/libtests/pngimage.c
+2
-2
contrib/libtests/pngunknown.c
contrib/libtests/pngunknown.c
+1
-1
contrib/libtests/pngvalid.c
contrib/libtests/pngvalid.c
+4
-4
contrib/libtests/readpng.c
contrib/libtests/readpng.c
+1
-1
contrib/libtests/timepng.c
contrib/libtests/timepng.c
+1
-1
contrib/pngminus/png2pnm.c
contrib/pngminus/png2pnm.c
+1
-1
contrib/pngminus/pnm2png.c
contrib/pngminus/pnm2png.c
+2
-1
contrib/tools/pngfix.c
contrib/tools/pngfix.c
+1
-1
contrib/visupng/PngFile.c
contrib/visupng/PngFile.c
+2
-2
example.c
example.c
+3
-3
libpng-manual.txt
libpng-manual.txt
+8
-8
libpng.3
libpng.3
+12
-12
pngtest.c
pngtest.c
+4
-4
未找到文件。
ANNOUNCE
浏览文件 @
f1b547a5
Libpng 1.6.15beta05 - November
4
, 2014
Libpng 1.6.15beta05 - November
5
, 2014
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.
...
@@ -40,7 +40,9 @@ Version 1.6.15beta04 [November 4, 2014]
...
@@ -40,7 +40,9 @@ Version 1.6.15beta04 [November 4, 2014]
Removed new PNG_USE_ARM_NEON configuration flag and made a one-line
Removed new PNG_USE_ARM_NEON configuration flag and made a one-line
revision to configure.ac to support ARM on aarch64 instead (John Bowler).
revision to configure.ac to support ARM on aarch64 instead (John Bowler).
Version 1.6.15beta05 [November 4, 2014]
Version 1.6.15beta05 [November 5, 2014]
Use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING in
example.c, pngtest.c, and applications in the contrib directory.
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
...
...
CHANGES
浏览文件 @
f1b547a5
...
@@ -5048,7 +5048,9 @@ Version 1.6.15beta04 [November 4, 2014]
...
@@ -5048,7 +5048,9 @@ Version 1.6.15beta04 [November 4, 2014]
Removed new PNG_USE_ARM_NEON configuration flag and made a one-line
Removed new PNG_USE_ARM_NEON configuration flag and made a one-line
revision to configure.ac to support ARM on aarch64 instead (John Bowler).
revision to configure.ac to support ARM on aarch64 instead (John Bowler).
Version 1.6.15beta05 [November 4, 2014]
Version 1.6.15beta05 [November 5, 2014]
Use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING in
example.c, pngtest.c, and applications in the contrib directory.
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
...
...
contrib/examples/iccfrompng.c
浏览文件 @
f1b547a5
...
@@ -32,7 +32,7 @@ static png_byte no_profile[] = "no profile";
...
@@ -32,7 +32,7 @@ static png_byte no_profile[] = "no profile";
static
png_bytep
static
png_bytep
extract
(
FILE
*
fp
,
png_uint_32
*
proflen
)
extract
(
FILE
*
fp
,
png_uint_32
*
proflen
)
{
{
png_structp
png_ptr
=
png_create_read_struct
(
PNG_LIBPNG_VER_STRING
,
0
,
0
,
0
);
png_structp
png_ptr
=
png_create_read_struct
(
png_get_libpng_ver
(
NULL
)
,
0
,
0
,
0
);
png_infop
info_ptr
=
NULL
;
png_infop
info_ptr
=
NULL
;
png_bytep
result
=
NULL
;
png_bytep
result
=
NULL
;
...
...
contrib/examples/pngpixel.c
浏览文件 @
f1b547a5
...
@@ -161,7 +161,7 @@ int main(int argc, const char **argv)
...
@@ -161,7 +161,7 @@ int main(int argc, const char **argv)
* writes error messages to stderr. Creating the png_struct is a
* writes error messages to stderr. Creating the png_struct is a
* little tricky; just copy the following code.
* little tricky; just copy the following code.
*/
*/
png_structp
png_ptr
=
png_create_read_struct
(
PNG_LIBPNG_VER_STRING
,
png_structp
png_ptr
=
png_create_read_struct
(
png_get_libpng_ver
(
NULL
)
,
NULL
,
NULL
,
NULL
);
NULL
,
NULL
,
NULL
);
if
(
png_ptr
!=
NULL
)
if
(
png_ptr
!=
NULL
)
...
...
contrib/gregbook/readpng.c
浏览文件 @
f1b547a5
...
@@ -100,7 +100,8 @@ int readpng_init(FILE *infile, ulg *pWidth, ulg *pHeight)
...
@@ -100,7 +100,8 @@ int readpng_init(FILE *infile, ulg *pWidth, ulg *pHeight)
/* could pass pointers to user-defined error handlers instead of NULLs: */
/* could pass pointers to user-defined error handlers instead of NULLs: */
png_ptr
=
png_create_read_struct
(
PNG_LIBPNG_VER_STRING
,
NULL
,
NULL
,
NULL
);
png_ptr
=
png_create_read_struct
(
png_get_libpng_ver
(
NULL
),
NULL
,
NULL
,
NULL
);
if
(
!
png_ptr
)
if
(
!
png_ptr
)
return
4
;
/* out of memory */
return
4
;
/* out of memory */
...
...
contrib/gregbook/readpng2.c
浏览文件 @
f1b547a5
...
@@ -104,7 +104,7 @@ int readpng2_init(mainprog_info *mainprog_ptr)
...
@@ -104,7 +104,7 @@ int readpng2_init(mainprog_info *mainprog_ptr)
/* could also replace libpng warning-handler (final NULL), but no need: */
/* could also replace libpng warning-handler (final NULL), but no need: */
png_ptr
=
png_create_read_struct
(
PNG_LIBPNG_VER_STRING
,
mainprog_ptr
,
png_ptr
=
png_create_read_struct
(
png_get_libpng_ver
(
NULL
)
,
mainprog_ptr
,
readpng2_error_handler
,
readpng2_warning_handler
);
readpng2_error_handler
,
readpng2_warning_handler
);
if
(
!
png_ptr
)
if
(
!
png_ptr
)
return
4
;
/* out of memory */
return
4
;
/* out of memory */
...
...
contrib/gregbook/writepng.c
浏览文件 @
f1b547a5
...
@@ -90,7 +90,7 @@ int writepng_init(mainprog_info *mainprog_ptr)
...
@@ -90,7 +90,7 @@ int writepng_init(mainprog_info *mainprog_ptr)
/* could also replace libpng warning-handler (final NULL), but no need: */
/* could also replace libpng warning-handler (final NULL), but no need: */
png_ptr
=
png_create_write_struct
(
PNG_LIBPNG_VER_STRING
,
mainprog_ptr
,
png_ptr
=
png_create_write_struct
(
png_get_libpng_ver
(
NULL
)
,
mainprog_ptr
,
writepng_error_handler
,
NULL
);
writepng_error_handler
,
NULL
);
if
(
!
png_ptr
)
if
(
!
png_ptr
)
return
4
;
/* out of memory */
return
4
;
/* out of memory */
...
...
contrib/libtests/makepng.c
浏览文件 @
f1b547a5
...
@@ -556,7 +556,7 @@ write_png(const char **name, FILE *fp, int color_type, int bit_depth,
...
@@ -556,7 +556,7 @@ write_png(const char **name, FILE *fp, int color_type, int bit_depth,
volatile
png_fixed_point
gamma
,
chunk_insert
*
volatile
insert
,
volatile
png_fixed_point
gamma
,
chunk_insert
*
volatile
insert
,
unsigned
int
filters
,
unsigned
int
*
colors
)
unsigned
int
filters
,
unsigned
int
*
colors
)
{
{
png_structp
png_ptr
=
png_create_write_struct
(
PNG_LIBPNG_VER_STRING
,
png_structp
png_ptr
=
png_create_write_struct
(
png_get_libpng_ver
(
NULL
)
,
name
,
makepng_error
,
makepng_warning
);
name
,
makepng_error
,
makepng_warning
);
volatile
png_infop
info_ptr
=
NULL
;
volatile
png_infop
info_ptr
=
NULL
;
volatile
png_bytep
row
=
NULL
;
volatile
png_bytep
row
=
NULL
;
...
...
contrib/libtests/pngimage.c
浏览文件 @
f1b547a5
...
@@ -795,7 +795,7 @@ read_png(struct display *dp, struct buffer *bp, const char *operation,
...
@@ -795,7 +795,7 @@ read_png(struct display *dp, struct buffer *bp, const char *operation,
dp
->
transforms
=
transforms
;
dp
->
transforms
=
transforms
;
}
}
dp
->
read_pp
=
pp
=
png_create_read_struct
(
PNG_LIBPNG_VER_STRING
,
dp
,
dp
->
read_pp
=
pp
=
png_create_read_struct
(
png_get_libpng_ver
(
NULL
)
,
dp
,
display_error
,
display_warning
);
display_error
,
display_warning
);
if
(
pp
==
NULL
)
if
(
pp
==
NULL
)
display_log
(
dp
,
LIBPNG_ERROR
,
"failed to create read struct"
);
display_log
(
dp
,
LIBPNG_ERROR
,
"failed to create read struct"
);
...
@@ -1240,7 +1240,7 @@ write_png(struct display *dp, png_infop ip, int transforms)
...
@@ -1240,7 +1240,7 @@ write_png(struct display *dp, png_infop ip, int transforms)
dp
->
operation
=
"write"
;
dp
->
operation
=
"write"
;
dp
->
transforms
=
transforms
;
dp
->
transforms
=
transforms
;
dp
->
write_pp
=
png_create_write_struct
(
PNG_LIBPNG_VER_STRING
,
dp
,
dp
->
write_pp
=
png_create_write_struct
(
png_get_libpng_ver
(
NULL
)
,
dp
,
display_error
,
display_warning
);
display_error
,
display_warning
);
if
(
dp
->
write_pp
==
NULL
)
if
(
dp
->
write_pp
==
NULL
)
...
...
contrib/libtests/pngunknown.c
浏览文件 @
f1b547a5
...
@@ -651,7 +651,7 @@ check(FILE *fp, int argc, const char **argv, png_uint_32p flags/*out*/,
...
@@ -651,7 +651,7 @@ check(FILE *fp, int argc, const char **argv, png_uint_32p flags/*out*/,
/* Some of these errors are permanently fatal and cause an exit here, others
/* Some of these errors are permanently fatal and cause an exit here, others
* are per-test and cause an error return.
* are per-test and cause an error return.
*/
*/
d
->
png_ptr
=
png_create_read_struct
(
PNG_LIBPNG_VER_STRING
,
d
,
error
,
d
->
png_ptr
=
png_create_read_struct
(
png_get_libpng_ver
(
NULL
)
,
d
,
error
,
warning
);
warning
);
if
(
d
->
png_ptr
==
NULL
)
if
(
d
->
png_ptr
==
NULL
)
{
{
...
...
contrib/libtests/pngvalid.c
浏览文件 @
f1b547a5
...
@@ -1552,13 +1552,13 @@ set_store_for_write(png_store *ps, png_infopp ppi,
...
@@ -1552,13 +1552,13 @@ set_store_for_write(png_store *ps, png_infopp ppi,
*/
*/
# ifdef PNG_USER_MEM_SUPPORTED
# ifdef PNG_USER_MEM_SUPPORTED
if
(
!
ps
->
speed
)
if
(
!
ps
->
speed
)
ps
->
pwrite
=
png_create_write_struct_2
(
PNG_LIBPNG_VER_STRING
,
ps
->
pwrite
=
png_create_write_struct_2
(
png_get_libpng_ver
(
NULL
)
,
ps
,
store_error
,
store_warning
,
&
ps
->
write_memory_pool
,
ps
,
store_error
,
store_warning
,
&
ps
->
write_memory_pool
,
store_malloc
,
store_free
);
store_malloc
,
store_free
);
else
else
# endif
# endif
ps
->
pwrite
=
png_create_write_struct
(
PNG_LIBPNG_VER_STRING
,
ps
->
pwrite
=
png_create_write_struct
(
png_get_libpng_ver
(
NULL
)
,
ps
,
store_error
,
store_warning
);
ps
,
store_error
,
store_warning
);
png_set_write_fn
(
ps
->
pwrite
,
ps
,
store_write
,
store_flush
);
png_set_write_fn
(
ps
->
pwrite
,
ps
,
store_write
,
store_flush
);
...
@@ -1673,13 +1673,13 @@ set_store_for_read(png_store *ps, png_infopp ppi, png_uint_32 id,
...
@@ -1673,13 +1673,13 @@ set_store_for_read(png_store *ps, png_infopp ppi, png_uint_32 id,
*/
*/
# ifdef PNG_USER_MEM_SUPPORTED
# ifdef PNG_USER_MEM_SUPPORTED
if
(
!
ps
->
speed
)
if
(
!
ps
->
speed
)
ps
->
pread
=
png_create_read_struct_2
(
PNG_LIBPNG_VER_STRING
,
ps
,
ps
->
pread
=
png_create_read_struct_2
(
png_get_libpng_ver
(
NULL
)
,
ps
,
store_error
,
store_warning
,
&
ps
->
read_memory_pool
,
store_malloc
,
store_error
,
store_warning
,
&
ps
->
read_memory_pool
,
store_malloc
,
store_free
);
store_free
);
else
else
# endif
# endif
ps
->
pread
=
png_create_read_struct
(
PNG_LIBPNG_VER_STRING
,
ps
,
store_error
,
ps
->
pread
=
png_create_read_struct
(
png_get_libpng_ver
(
NULL
)
,
ps
,
store_error
,
store_warning
);
store_warning
);
if
(
ps
->
pread
==
NULL
)
if
(
ps
->
pread
==
NULL
)
...
...
contrib/libtests/readpng.c
浏览文件 @
f1b547a5
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
static
int
static
int
read_png
(
FILE
*
fp
)
read_png
(
FILE
*
fp
)
{
{
png_structp
png_ptr
=
png_create_read_struct
(
PNG_LIBPNG_VER_STRING
,
0
,
0
,
0
);
png_structp
png_ptr
=
png_create_read_struct
(
png_get_libpng_ver
(
NULL
)
,
0
,
0
,
0
);
png_infop
info_ptr
=
NULL
;
png_infop
info_ptr
=
NULL
;
png_bytep
row
=
NULL
,
display
=
NULL
;
png_bytep
row
=
NULL
,
display
=
NULL
;
...
...
contrib/libtests/timepng.c
浏览文件 @
f1b547a5
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
static
int
read_png
(
FILE
*
fp
)
static
int
read_png
(
FILE
*
fp
)
{
{
png_structp
png_ptr
=
png_create_read_struct
(
PNG_LIBPNG_VER_STRING
,
0
,
0
,
0
);
png_structp
png_ptr
=
png_create_read_struct
(
png_get_libpng_ver
(
NULL
)
,
0
,
0
,
0
);
png_infop
info_ptr
=
NULL
;
png_infop
info_ptr
=
NULL
;
png_bytep
row
=
NULL
,
display
=
NULL
;
png_bytep
row
=
NULL
,
display
=
NULL
;
...
...
contrib/pngminus/png2pnm.c
浏览文件 @
f1b547a5
...
@@ -223,7 +223,7 @@ BOOL png2pnm (FILE *png_file, FILE *pnm_file, FILE *alpha_file,
...
@@ -223,7 +223,7 @@ BOOL png2pnm (FILE *png_file, FILE *pnm_file, FILE *alpha_file,
/* create png and info structures */
/* create png and info structures */
png_ptr
=
png_create_read_struct
(
PNG_LIBPNG_VER_STRING
,
png_ptr
=
png_create_read_struct
(
png_get_libpng_ver
(
NULL
)
,
NULL
,
NULL
,
NULL
);
NULL
,
NULL
,
NULL
);
if
(
!
png_ptr
)
if
(
!
png_ptr
)
return
FALSE
;
/* out of memory */
return
FALSE
;
/* out of memory */
...
...
contrib/pngminus/pnm2png.c
浏览文件 @
f1b547a5
...
@@ -425,7 +425,8 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_file, FILE *alpha_file, BOOL interlace,
...
@@ -425,7 +425,8 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_file, FILE *alpha_file, BOOL interlace,
}
/* end for row */
}
/* end for row */
/* prepare the standard PNG structures */
/* prepare the standard PNG structures */
png_ptr
=
png_create_write_struct
(
PNG_LIBPNG_VER_STRING
,
NULL
,
NULL
,
NULL
);
png_ptr
=
png_create_write_struct
(
png_get_libpng_ver
(
NULL
),
NULL
,
NULL
,
NULL
);
if
(
!
png_ptr
)
if
(
!
png_ptr
)
{
{
return
FALSE
;
return
FALSE
;
...
...
contrib/tools/pngfix.c
浏览文件 @
f1b547a5
...
@@ -3580,7 +3580,7 @@ read_png(struct control *control)
...
@@ -3580,7 +3580,7 @@ read_png(struct control *control)
volatile
png_bytep
row
=
NULL
,
display
=
NULL
;
volatile
png_bytep
row
=
NULL
,
display
=
NULL
;
volatile
int
rc
;
volatile
int
rc
;
png_ptr
=
png_create_read_struct
(
PNG_LIBPNG_VER_STRING
,
control
,
png_ptr
=
png_create_read_struct
(
png_get_libpng_ver
(
NULL
)
,
control
,
error_handler
,
warning_handler
);
error_handler
,
warning_handler
);
if
(
png_ptr
==
NULL
)
if
(
png_ptr
==
NULL
)
...
...
contrib/visupng/PngFile.c
浏览文件 @
f1b547a5
...
@@ -136,7 +136,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
...
@@ -136,7 +136,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
/* create the two png(-info) structures */
/* create the two png(-info) structures */
png_ptr
=
png_create_read_struct
(
PNG_LIBPNG_VER_STRING
,
NULL
,
png_ptr
=
png_create_read_struct
(
png_get_libpng_ver
(
NULL
)
,
NULL
,
(
png_error_ptr
)
png_cexcept_error
,
(
png_error_ptr
)
NULL
);
(
png_error_ptr
)
png_cexcept_error
,
(
png_error_ptr
)
NULL
);
if
(
!
png_ptr
)
if
(
!
png_ptr
)
{
{
...
@@ -313,7 +313,7 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData,
...
@@ -313,7 +313,7 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData,
/* prepare the standard PNG structures */
/* prepare the standard PNG structures */
png_ptr
=
png_create_write_struct
(
PNG_LIBPNG_VER_STRING
,
NULL
,
png_ptr
=
png_create_write_struct
(
png_get_libpng_ver
(
NULL
)
,
NULL
,
(
png_error_ptr
)
png_cexcept_error
,
(
png_error_ptr
)
NULL
);
(
png_error_ptr
)
png_cexcept_error
,
(
png_error_ptr
)
NULL
);
if
(
!
png_ptr
)
if
(
!
png_ptr
)
{
{
...
...
example.c
浏览文件 @
f1b547a5
...
@@ -294,7 +294,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */
...
@@ -294,7 +294,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */
* the compiler header file version, so that we know if the application
* the compiler header file version, so that we know if the application
* was compiled with a compatible version of the library. REQUIRED
* was compiled with a compatible version of the library. REQUIRED
*/
*/
png_ptr
=
png_create_read_struct
(
PNG_LIBPNG_VER_STRING
,
png_ptr
=
png_create_read_struct
(
png_get_libpng_ver
(
NULL
)
,
png_voidp
user_error_ptr
,
user_error_fn
,
user_warning_fn
);
png_voidp
user_error_ptr
,
user_error_fn
,
user_warning_fn
);
if
(
png_ptr
==
NULL
)
if
(
png_ptr
==
NULL
)
...
@@ -613,7 +613,7 @@ initialize_png_reader(png_structp *png_ptr, png_infop *info_ptr)
...
@@ -613,7 +613,7 @@ initialize_png_reader(png_structp *png_ptr, png_infop *info_ptr)
* the library version is compatible in case we are using dynamically
* the library version is compatible in case we are using dynamically
* linked libraries.
* linked libraries.
*/
*/
*
png_ptr
=
png_create_read_struct
(
PNG_LIBPNG_VER_STRING
,
*
png_ptr
=
png_create_read_struct
(
png_get_libpng_ver
(
NULL
)
,
png_voidp
user_error_ptr
,
user_error_fn
,
user_warning_fn
);
png_voidp
user_error_ptr
,
user_error_fn
,
user_warning_fn
);
if
(
*
png_ptr
==
NULL
)
if
(
*
png_ptr
==
NULL
)
...
@@ -779,7 +779,7 @@ void write_png(char *file_name /* , ... other image information ... */)
...
@@ -779,7 +779,7 @@ void write_png(char *file_name /* , ... other image information ... */)
* the library version is compatible with the one used at compile time,
* the library version is compatible with the one used at compile time,
* in case we are using dynamically linked libraries. REQUIRED.
* in case we are using dynamically linked libraries. REQUIRED.
*/
*/
png_ptr
=
png_create_write_struct
(
PNG_LIBPNG_VER_STRING
,
png_ptr
=
png_create_write_struct
(
png_get_libpng_ver
(
NULL
)
,
png_voidp
user_error_ptr
,
user_error_fn
,
user_warning_fn
);
png_voidp
user_error_ptr
,
user_error_fn
,
user_warning_fn
);
if
(
png_ptr
==
NULL
)
if
(
png_ptr
==
NULL
)
...
...
libpng-manual.txt
浏览文件 @
f1b547a5
libpng-manual.txt - A description on how to use and modify libpng
libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.6.15beta05 - November
4
, 2014
libpng version 1.6.15beta05 - November
5
, 2014
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-2014 Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
...
@@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
...
@@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
Based on:
libpng versions 0.97, January 1998, through 1.6.15beta05 - November
4
, 2014
libpng versions 0.97, January 1998, through 1.6.15beta05 - November
5
, 2014
Updated and distributed by Glenn Randers-Pehrson
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
...
@@ -372,7 +372,7 @@ The structure allocation functions quietly return NULL if they fail to
...
@@ -372,7 +372,7 @@ The structure allocation functions quietly return NULL if they fail to
create the structure, so your application should check for that.
create the structure, so your application should check for that.
png_structp png_ptr = png_create_read_struct
png_structp png_ptr = png_create_read_struct
(
PNG_LIBPNG_VER_STRING
, (png_voidp)user_error_ptr,
(
png_get_libpng_ver(NULL)
, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn);
user_error_fn, user_warning_fn);
if (!png_ptr)
if (!png_ptr)
...
@@ -392,7 +392,7 @@ use a libpng that was built with PNG_USER_MEM_SUPPORTED defined, and use
...
@@ -392,7 +392,7 @@ use a libpng that was built with PNG_USER_MEM_SUPPORTED defined, and use
png_create_read_struct_2() instead of png_create_read_struct():
png_create_read_struct_2() instead of png_create_read_struct():
png_structp png_ptr = png_create_read_struct_2
png_structp png_ptr = png_create_read_struct_2
(
PNG_LIBPNG_VER_STRING
, (png_voidp)user_error_ptr,
(
png_get_libpng_ver(NULL)
, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn, (png_voidp)
user_error_fn, user_warning_fn, (png_voidp)
user_mem_ptr, user_malloc_fn, user_free_fn);
user_mem_ptr, user_malloc_fn, user_free_fn);
...
@@ -2486,7 +2486,7 @@ png_infop info_ptr;
...
@@ -2486,7 +2486,7 @@ png_infop info_ptr;
initialize_png_reader()
initialize_png_reader()
{
{
png_ptr = png_create_read_struct
png_ptr = png_create_read_struct
(
PNG_LIBPNG_VER_STRING
, (png_voidp)user_error_ptr,
(
png_get_libpng_ver(NULL)
, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn);
user_error_fn, user_warning_fn);
if (!png_ptr)
if (!png_ptr)
...
@@ -2694,7 +2694,7 @@ both "png_ptr"; you can call them anything you like, such as
...
@@ -2694,7 +2694,7 @@ both "png_ptr"; you can call them anything you like, such as
"read_ptr" and "write_ptr". Look at pngtest.c, for example.
"read_ptr" and "write_ptr". Look at pngtest.c, for example.
png_structp png_ptr = png_create_write_struct
png_structp png_ptr = png_create_write_struct
(
PNG_LIBPNG_VER_STRING
, (png_voidp)user_error_ptr,
(
png_get_libpng_ver(NULL)
, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn);
user_error_fn, user_warning_fn);
if (!png_ptr)
if (!png_ptr)
...
@@ -2713,7 +2713,7 @@ define PNG_USER_MEM_SUPPORTED and use
...
@@ -2713,7 +2713,7 @@ define PNG_USER_MEM_SUPPORTED and use
png_create_write_struct_2() instead of png_create_write_struct():
png_create_write_struct_2() instead of png_create_write_struct():
png_structp png_ptr = png_create_write_struct_2
png_structp png_ptr = png_create_write_struct_2
(
PNG_LIBPNG_VER_STRING
, (png_voidp)user_error_ptr,
(
png_get_libpng_ver(NULL)
, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn, (png_voidp)
user_error_fn, user_warning_fn, (png_voidp)
user_mem_ptr, user_malloc_fn, user_free_fn);
user_mem_ptr, user_malloc_fn, user_free_fn);
...
@@ -5277,7 +5277,7 @@ Other rules can be inferred by inspecting the libpng source.
...
@@ -5277,7 +5277,7 @@ Other rules can be inferred by inspecting the libpng source.
XVI. Y2K Compliance in libpng
XVI. Y2K Compliance in libpng
November
4
, 2014
November
5
, 2014
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.
...
...
libpng.3
浏览文件 @
f1b547a5
.TH LIBPNG 3 "November
4
, 2014"
.TH LIBPNG 3 "November
5
, 2014"
.SH NAME
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15beta05
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15beta05
.SH SYNOPSIS
.SH SYNOPSIS
...
@@ -504,7 +504,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
...
@@ -504,7 +504,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
.SH LIBPNG.TXT
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.6.15beta05 - November
4
, 2014
libpng version 1.6.15beta05 - November
5
, 2014
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-2014 Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
...
@@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng
...
@@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
Based on:
libpng versions 0.97, January 1998, through 1.6.15beta05 - November
4
, 2014
libpng versions 0.97, January 1998, through 1.6.15beta05 - November
5
, 2014
Updated and distributed by Glenn Randers-Pehrson
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
...
@@ -876,7 +876,7 @@ The structure allocation functions quietly return NULL if they fail to
...
@@ -876,7 +876,7 @@ The structure allocation functions quietly return NULL if they fail to
create the structure, so your application should check for that.
create the structure, so your application should check for that.
png_structp png_ptr = png_create_read_struct
png_structp png_ptr = png_create_read_struct
(
PNG_LIBPNG_VER_STRING
, (png_voidp)user_error_ptr,
(
png_get_libpng_ver(NULL)
, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn);
user_error_fn, user_warning_fn);
if (!png_ptr)
if (!png_ptr)
...
@@ -896,7 +896,7 @@ use a libpng that was built with PNG_USER_MEM_SUPPORTED defined, and use
...
@@ -896,7 +896,7 @@ use a libpng that was built with PNG_USER_MEM_SUPPORTED defined, and use
png_create_read_struct_2() instead of png_create_read_struct():
png_create_read_struct_2() instead of png_create_read_struct():
png_structp png_ptr = png_create_read_struct_2
png_structp png_ptr = png_create_read_struct_2
(
PNG_LIBPNG_VER_STRING
, (png_voidp)user_error_ptr,
(
png_get_libpng_ver(NULL)
, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn, (png_voidp)
user_error_fn, user_warning_fn, (png_voidp)
user_mem_ptr, user_malloc_fn, user_free_fn);
user_mem_ptr, user_malloc_fn, user_free_fn);
...
@@ -2990,7 +2990,7 @@ png_infop info_ptr;
...
@@ -2990,7 +2990,7 @@ png_infop info_ptr;
initialize_png_reader()
initialize_png_reader()
{
{
png_ptr = png_create_read_struct
png_ptr = png_create_read_struct
(
PNG_LIBPNG_VER_STRING
, (png_voidp)user_error_ptr,
(
png_get_libpng_ver(NULL)
, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn);
user_error_fn, user_warning_fn);
if (!png_ptr)
if (!png_ptr)
...
@@ -3198,7 +3198,7 @@ both "png_ptr"; you can call them anything you like, such as
...
@@ -3198,7 +3198,7 @@ both "png_ptr"; you can call them anything you like, such as
"read_ptr" and "write_ptr". Look at pngtest.c, for example.
"read_ptr" and "write_ptr". Look at pngtest.c, for example.
png_structp png_ptr = png_create_write_struct
png_structp png_ptr = png_create_write_struct
(
PNG_LIBPNG_VER_STRING
, (png_voidp)user_error_ptr,
(
png_get_libpng_ver(NULL)
, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn);
user_error_fn, user_warning_fn);
if (!png_ptr)
if (!png_ptr)
...
@@ -3217,7 +3217,7 @@ define PNG_USER_MEM_SUPPORTED and use
...
@@ -3217,7 +3217,7 @@ define PNG_USER_MEM_SUPPORTED and use
png_create_write_struct_2() instead of png_create_write_struct():
png_create_write_struct_2() instead of png_create_write_struct():
png_structp png_ptr = png_create_write_struct_2
png_structp png_ptr = png_create_write_struct_2
(
PNG_LIBPNG_VER_STRING
, (png_voidp)user_error_ptr,
(
png_get_libpng_ver(NULL)
, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn, (png_voidp)
user_error_fn, user_warning_fn, (png_voidp)
user_mem_ptr, user_malloc_fn, user_free_fn);
user_mem_ptr, user_malloc_fn, user_free_fn);
...
@@ -5781,7 +5781,7 @@ Other rules can be inferred by inspecting the libpng source.
...
@@ -5781,7 +5781,7 @@ Other rules can be inferred by inspecting the libpng source.
.SH XVI. Y2K Compliance in libpng
.SH XVI. Y2K Compliance in libpng
November
4
, 2014
November
5
, 2014
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.
...
@@ -6090,7 +6090,7 @@ possible without all of you.
...
@@ -6090,7 +6090,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.6.15beta05 - November
4
, 2014:
Libpng version 1.6.15beta05 - November
5
, 2014:
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).
...
@@ -6113,7 +6113,7 @@ this sentence.
...
@@ -6113,7 +6113,7 @@ this sentence.
This code is released under the libpng license.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.6.15beta05, November
4
, 2014, are
libpng versions 1.2.6, August 15, 2004, through 1.6.15beta05, November
5
, 2014, are
Copyright (c) 2004,2006-2014 Glenn Randers-Pehrson, and are
Copyright (c) 2004,2006-2014 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
...
@@ -6212,7 +6212,7 @@ certification mark of the Open Source Initiative.
...
@@ -6212,7 +6212,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
glennrp at users.sourceforge.net
November
4
, 2014
November
5
, 2014
.\" end of man page
.\" end of man page
pngtest.c
浏览文件 @
f1b547a5
...
@@ -869,11 +869,11 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
...
@@ -869,11 +869,11 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
pngtest_debug
(
"Allocating read and write structures"
);
pngtest_debug
(
"Allocating read and write structures"
);
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
read_ptr
=
read_ptr
=
png_create_read_struct_2
(
PNG_LIBPNG_VER_STRING
,
NULL
,
png_create_read_struct_2
(
png_get_libpng_ver
(
NULL
)
,
NULL
,
NULL
,
NULL
,
NULL
,
png_debug_malloc
,
png_debug_free
);
NULL
,
NULL
,
NULL
,
png_debug_malloc
,
png_debug_free
);
#else
#else
read_ptr
=
read_ptr
=
png_create_read_struct
(
PNG_LIBPNG_VER_STRING
,
NULL
,
NULL
,
NULL
);
png_create_read_struct
(
png_get_libpng_ver
(
NULL
)
,
NULL
,
NULL
,
NULL
);
#endif
#endif
png_set_error_fn
(
read_ptr
,
&
error_parameters
,
pngtest_error
,
png_set_error_fn
(
read_ptr
,
&
error_parameters
,
pngtest_error
,
pngtest_warning
);
pngtest_warning
);
...
@@ -881,11 +881,11 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
...
@@ -881,11 +881,11 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
#ifdef PNG_WRITE_SUPPORTED
#ifdef PNG_WRITE_SUPPORTED
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
write_ptr
=
write_ptr
=
png_create_write_struct_2
(
PNG_LIBPNG_VER_STRING
,
NULL
,
png_create_write_struct_2
(
png_get_libpng_ver
(
NULL
)
,
NULL
,
NULL
,
NULL
,
NULL
,
png_debug_malloc
,
png_debug_free
);
NULL
,
NULL
,
NULL
,
png_debug_malloc
,
png_debug_free
);
#else
#else
write_ptr
=
write_ptr
=
png_create_write_struct
(
PNG_LIBPNG_VER_STRING
,
NULL
,
NULL
,
NULL
);
png_create_write_struct
(
png_get_libpng_ver
(
NULL
)
,
NULL
,
NULL
,
NULL
);
#endif
#endif
png_set_error_fn
(
write_ptr
,
&
error_parameters
,
pngtest_error
,
png_set_error_fn
(
write_ptr
,
&
error_parameters
,
pngtest_error
,
pngtest_warning
);
pngtest_warning
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录