Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Libpng
提交
2b8bef1d
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,发现更多精彩内容 >>
提交
2b8bef1d
编写于
4月 29, 2010
作者:
G
Glenn Randers-Pehrson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[devel] make png_reset_zstream prototype in png.h conditional on PNG_READ
上级
98914f74
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
12 deletion
+14
-12
png.c
png.c
+4
-4
png.h
png.h
+10
-8
未找到文件。
png.c
浏览文件 @
2b8bef1d
...
...
@@ -14,7 +14,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef
version_1_5_0beta2
4
Your_png_h_is_not_version_1_5_0beta24
;
typedef
version_1_5_0beta2
3
Your_png_h_is_not_version_1_5_0beta23
;
/* Version information for C files. This had better match the version
* string defined in png.h.
...
...
@@ -548,13 +548,13 @@ png_get_copyright(png_structp png_ptr)
#else
# ifdef __STDC__
return
((
png_charp
)
PNG_STRING_NEWLINE
\
"libpng version 1.5.0beta2
4
- April 29, 2010"
PNG_STRING_NEWLINE
\
"libpng version 1.5.0beta2
3
- April 29, 2010"
PNG_STRING_NEWLINE
\
"Copyright (c) 1998-2010 Glenn Randers-Pehrson"
PNG_STRING_NEWLINE
\
"Copyright (c) 1996-1997 Andreas Dilger"
PNG_STRING_NEWLINE
\
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."
\
PNG_STRING_NEWLINE
);
# else
return
((
png_charp
)
"libpng version 1.5.0beta2
4
- April 29, 2010\
return
((
png_charp
)
"libpng version 1.5.0beta2
3
- April 29, 2010\
Copyright (c) 1998-2010 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."
);
...
...
@@ -629,7 +629,7 @@ png_reset_zstream(png_structp png_ptr)
return
Z_STREAM_ERROR
;
return
(
inflateReset
(
&
png_ptr
->
zstream
));
}
#endif
/* PNG_
WRITE
_SUPPORTED */
#endif
/* PNG_
READ
_SUPPORTED */
/* This function was added to libpng-1.0.7 */
png_uint_32
PNGAPI
...
...
png.h
浏览文件 @
2b8bef1d
/* png.h - header file for PNG reference library
*
* libpng version 1.5.0beta2
4
- April 29, 2010
* libpng version 1.5.0beta2
3
- April 29, 2010
* Copyright (c) 1998-2010 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.)
...
...
@@ -11,7 +11,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.5.0beta2
4
- April 29, 2010: Glenn
* libpng versions 0.97, January 1998, through 1.5.0beta2
3
- April 29, 2010: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
...
...
@@ -170,7 +170,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.5.0beta2
4
, April 29, 2010, are
* libpng versions 1.2.6, August 15, 2004, through 1.5.0beta2
3
, April 29, 2010, are
* Copyright (c) 2004, 2006-2010 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:
...
...
@@ -288,7 +288,7 @@
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
* upward through 1.5.0beta2
4
are Y2K compliant. It is my belief that earlier
* upward through 1.5.0beta2
3
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
...
...
@@ -344,9 +344,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.5.0beta2
4
"
#define PNG_LIBPNG_VER_STRING "1.5.0beta2
3
"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.5.0beta2
4
- April 29, 2010\n"
" libpng version 1.5.0beta2
3
- April 29, 2010\n"
#define PNG_LIBPNG_VER_SONUM 15
#define PNG_LIBPNG_VER_DLLNUM 15
...
...
@@ -359,7 +359,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
#define PNG_LIBPNG_VER_BUILD 2
4
#define PNG_LIBPNG_VER_BUILD 2
3
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
...
...
@@ -834,7 +834,7 @@ typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp),);
/* 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_5_0beta2
4
;
typedef
png_structp
version_1_5_0beta2
3
;
typedef
png_struct
FAR
*
FAR
*
png_structpp
;
...
...
@@ -910,8 +910,10 @@ extern PNG_EXPORT(jmp_buf*, png_set_longjmp_fn, (png_structp png_ptr,
extern
PNG_EXPORT
(
void
,
png_longjmp
,
(
png_structp
png_ptr
,
int
val
),
PNG_NORETURN
,
9
);
#ifdef PNG_READ_SUPPORTED
/* Reset the compression stream */
extern
PNG_EXPORT
(
int
,
png_reset_zstream
,(
png_structp
png_ptr
),,
10
);
#endif
/* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */
#ifdef PNG_USER_MEM_SUPPORTED
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录