Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Libpng
提交
873f16fe
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,发现更多精彩内容 >>
提交
873f16fe
编写于
9月 20, 2013
作者:
G
Glenn Randers-Pehrson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[libpng16] Reverted the change to unknown handling #defines; the change
breaks 'NOREAD' builds.
上级
7ae451f5
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
22 addition
and
14 deletion
+22
-14
ANNOUNCE
ANNOUNCE
+4
-2
CHANGES
CHANGES
+4
-2
png.c
png.c
+4
-4
pngpriv.h
pngpriv.h
+4
-2
pngrutil.c
pngrutil.c
+6
-4
未找到文件。
ANNOUNCE
浏览文件 @
873f16fe
Libpng 1.6.7beta01 - September
16
, 2013
Libpng 1.6.7beta01 - September
20
, 2013
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.
...
...
@@ -26,7 +26,9 @@ Other information:
Changes since the last public release (1.6.6):
Version 1.6.7 [September 16, 2013]
Version 1.6.7 [September 20, 2013]
Reverted the change to unknown handling #defines; the change breaks 'NOREAD'
builds.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
...
...
CHANGES
浏览文件 @
873f16fe
...
...
@@ -4637,10 +4637,12 @@ Version 1.6.4 [September 12, 2013]
Version 1.6.5 [September 14, 2013]
Removed two stray lines of code from arm/arm_init.c.
Version 1.6.6 [September
16
, 2013]
Version 1.6.6 [September
20
, 2013]
Removed two stray lines of code from arm/arm_init.c, again.
Version 1.6.7beta01 [September 16, 2013]
Version 1.6.7beta01 [September 20, 2013]
Reverted the change to unknown handling #defines; the change breaks 'NOREAD'
builds.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
...
...
png.c
浏览文件 @
873f16fe
...
...
@@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return
PNG_STRING_NEWLINE
\
"libpng version 1.6.7beta01 - September
16
, 2013"
PNG_STRING_NEWLINE
\
"libpng version 1.6.7beta01 - September
20
, 2013"
PNG_STRING_NEWLINE
\
"Copyright (c) 1998-2013 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
"libpng version 1.6.7beta01 - September
16
, 2013\
return
"libpng version 1.6.7beta01 - September
20
, 2013\
Copyright (c) 1998-2013 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."
;
...
...
@@ -855,7 +855,7 @@ png_handle_as_unknown(png_const_structrp png_ptr, png_const_bytep chunk_name)
return
PNG_HANDLE_CHUNK_AS_DEFAULT
;
}
#ifdef PNG_
HANDLE_AS_UNKNOWN
_SUPPORTED
#ifdef PNG_
READ_UNKNOWN_CHUNKS
_SUPPORTED
int
/* PRIVATE */
png_chunk_unknown_handling
(
png_const_structrp
png_ptr
,
png_uint_32
chunk_name
)
{
...
...
@@ -864,7 +864,7 @@ png_chunk_unknown_handling(png_const_structrp png_ptr, png_uint_32 chunk_name)
PNG_CSTRING_FROM_CHUNK
(
chunk_string
,
chunk_name
);
return
png_handle_as_unknown
(
png_ptr
,
chunk_string
);
}
#endif
/*
HANDLE_AS_UNKNOWN
*/
#endif
/*
READ_UNKNOWN_CHUNKS
*/
#endif
/* SET_UNKNOWN_CHUNKS */
#ifdef PNG_READ_SUPPORTED
...
...
pngpriv.h
浏览文件 @
873f16fe
...
...
@@ -1431,13 +1431,15 @@ PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr,
* just skips the chunk or errors out if it is critical.
*/
#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
PNG_INTERNAL_FUNCTION
(
int
,
png_chunk_unknown_handling
,
(
png_const_structrp
png_ptr
,
png_uint_32
chunk_name
),
PNG_EMPTY
);
/* Exactly as the API png_handle_as_unknown() except that the argument is a
* 32-bit chunk name, not a string.
*/
#endif
/* PNG_HANDLE_AS_UNKNOWN_SUPPORTED */
#endif
#endif
/* PNG_READ_UNKNOWN_CHUNKS_SUPPORTED */
#endif
/* PNG_READ_SUPPORTED */
/* Handle the transformations for reading and writing */
...
...
pngrutil.c
浏览文件 @
873f16fe
...
...
@@ -2764,6 +2764,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
png_debug
(
1
,
"in png_handle_unknown"
);
#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
/* NOTE: this code is based on the code in libpng-1.4.12 except for fixing
* the bug which meant that setting a non-default behavior for a specific
* chunk would be ignored (the default was always used unless a user
...
...
@@ -2775,15 +2776,16 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
* This is just an optimization to avoid multiple calls to the lookup
* function.
*/
# ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
keep
=
png_chunk_unknown_handling
(
png_ptr
,
png_ptr
->
chunk_name
);
# ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
# ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
keep
=
png_chunk_unknown_handling
(
png_ptr
,
png_ptr
->
chunk_name
);
# endif
# endif
/* One of the following methods will read the chunk or skip it (at least one
* of these is always defined because this is the only way to switch on
* PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
*/
#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
# ifdef PNG_READ_USER_CHUNKS_SUPPORTED
/* The user callback takes precedence over the chunk keep value, but the
* keep value is still required to validate a save of a critical chunk.
...
...
@@ -2891,7 +2893,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
png_crc_finish
(
png_ptr
,
length
);
}
# endif
/* PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED */
# endif
# ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
/* Now store the chunk in the chunk list if appropriate, and if the limits
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录