Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
8b9d9b71
T
Third Party Harfbuzz
项目概览
OpenHarmony
/
Third Party Harfbuzz
12 个月 前同步成功
通知
0
Star
18
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Harfbuzz
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8b9d9b71
编写于
10月 22, 2017
作者:
B
Behdad Esfahbod
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix set initialization issues
上级
0ca915ef
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
19 addition
and
25 deletion
+19
-25
src/hb-ot-layout-gsubgpos-private.hh
src/hb-ot-layout-gsubgpos-private.hh
+6
-6
src/hb-ot-shape.cc
src/hb-ot-shape.cc
+9
-8
src/hb-set-private.hh
src/hb-set-private.hh
+0
-9
src/hb-set.cc
src/hb-set.cc
+4
-2
未找到文件。
src/hb-ot-layout-gsubgpos-private.hh
浏览文件 @
8b9d9b71
...
...
@@ -160,7 +160,7 @@ struct hb_collect_glyphs_context_t :
return
HB_VOID
;
/* Return if new lookup was recursed to before. */
if
(
recursed_lookups
.
has
(
lookup_index
))
if
(
recursed_lookups
->
has
(
lookup_index
))
return
HB_VOID
;
hb_set_t
*
old_before
=
before
;
...
...
@@ -176,7 +176,7 @@ struct hb_collect_glyphs_context_t :
input
=
old_input
;
after
=
old_after
;
recursed_lookups
.
add
(
lookup_index
);
recursed_lookups
->
add
(
lookup_index
);
return
HB_VOID
;
}
...
...
@@ -187,7 +187,7 @@ struct hb_collect_glyphs_context_t :
hb_set_t
*
after
;
hb_set_t
*
output
;
recurse_func_t
recurse_func
;
hb_set_t
recursed_lookups
;
hb_set_t
*
recursed_lookups
;
unsigned
int
nesting_level_left
;
unsigned
int
debug_depth
;
...
...
@@ -203,15 +203,15 @@ struct hb_collect_glyphs_context_t :
after
(
glyphs_after
?
glyphs_after
:
hb_set_get_empty
()),
output
(
glyphs_output
?
glyphs_output
:
hb_set_get_empty
()),
recurse_func
(
nullptr
),
recursed_lookups
(),
recursed_lookups
(
nullptr
),
nesting_level_left
(
nesting_level_left_
),
debug_depth
(
0
)
{
recursed_lookups
.
init
();
recursed_lookups
=
hb_set_create
();
}
~
hb_collect_glyphs_context_t
(
void
)
{
recursed_lookups
.
fini
(
);
hb_set_destroy
(
recursed_lookups
);
}
void
set_recurse_func
(
recurse_func_t
func
)
{
recurse_func
=
func
;
}
...
...
src/hb-ot-shape.cc
浏览文件 @
8b9d9b71
...
...
@@ -939,18 +939,19 @@ hb_ot_shape_glyphs_closure (hb_font_t *font,
for
(
unsigned
int
i
=
0
;
i
<
count
;
i
++
)
add_char
(
font
,
buffer
->
unicode
,
mirror
,
info
[
i
].
codepoint
,
glyphs
);
hb_set_t
lookups
;
lookups
.
init
();
hb_ot_shape_plan_collect_lookups
(
shape_plan
,
HB_OT_TAG_GSUB
,
&
lookups
);
hb_set_t
*
lookups
=
hb_set_create
();
hb_ot_shape_plan_collect_lookups
(
shape_plan
,
HB_OT_TAG_GSUB
,
lookups
);
/* And find transitive closure. */
hb_set_t
copy
;
copy
.
init
();
hb_set_t
*
copy
=
hb_set_create
();
do
{
copy
.
set
(
glyphs
);
for
(
hb_codepoint_t
lookup_index
=
-
1
;
hb_set_next
(
&
lookups
,
&
lookup_index
);)
copy
->
set
(
glyphs
);
for
(
hb_codepoint_t
lookup_index
=
-
1
;
hb_set_next
(
lookups
,
&
lookup_index
);)
hb_ot_layout_lookup_substitute_closure
(
font
->
face
,
lookup_index
,
glyphs
);
}
while
(
!
copy
.
is_equal
(
glyphs
));
}
while
(
!
copy
->
is_equal
(
glyphs
));
hb_set_destroy
(
copy
);
hb_set_destroy
(
lookups
);
hb_shape_plan_destroy
(
shape_plan
);
}
src/hb-set-private.hh
浏览文件 @
8b9d9b71
...
...
@@ -175,15 +175,6 @@ struct hb_set_t
return
true
;
}
inline
void
init
(
void
)
{
hb_object_init
(
this
);
page_map
.
init
();
pages
.
init
();
}
inline
void
fini
(
void
)
{
page_map
.
finish
();
pages
.
finish
();
}
inline
void
clear
(
void
)
{
if
(
unlikely
(
hb_object_is_inert
(
this
)))
return
;
...
...
src/hb-set.cc
浏览文件 @
8b9d9b71
...
...
@@ -45,7 +45,8 @@ hb_set_create (void)
if
(
!
(
set
=
hb_object_create
<
hb_set_t
>
()))
return
hb_set_get_empty
();
set
->
clear
();
set
->
page_map
.
init
();
set
->
pages
.
init
();
return
set
;
}
...
...
@@ -95,7 +96,8 @@ hb_set_destroy (hb_set_t *set)
{
if
(
!
hb_object_destroy
(
set
))
return
;
set
->
fini
();
set
->
page_map
.
finish
();
set
->
pages
.
finish
();
free
(
set
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录