Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
49544eb8
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,发现更多精彩内容 >>
提交
49544eb8
编写于
2月 16, 2018
作者:
G
Garret Rieger
提交者:
Behdad Esfahbod
2月 16, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[subset] Refactor composite glyf iteration code into an Iterator outside of the accelerator.
上级
dc6d67df
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
60 addition
and
56 deletion
+60
-56
src/hb-ot-glyf-table.hh
src/hb-ot-glyf-table.hh
+57
-53
src/hb-subset-plan.cc
src/hb-subset-plan.cc
+3
-3
未找到文件。
src/hb-ot-glyf-table.hh
浏览文件 @
49544eb8
...
...
@@ -133,6 +133,58 @@ struct glyf
return
size
;
}
struct
Iterator
{
const
char
*
glyph_start
;
const
char
*
glyph_end
;
const
CompositeGlyphHeader
*
current
;
inline
bool
move_to_next
()
{
if
(
current
->
flags
&
CompositeGlyphHeader
::
MORE_COMPONENTS
)
{
const
CompositeGlyphHeader
*
possible
=
&
StructAfter
<
CompositeGlyphHeader
,
CompositeGlyphHeader
>
(
*
current
);
if
(
!
in_range
(
possible
))
return
false
;
current
=
possible
;
return
true
;
}
return
false
;
}
inline
bool
in_range
(
const
CompositeGlyphHeader
*
composite
)
const
{
return
(
const
char
*
)
composite
>=
glyph_start
&&
((
const
char
*
)
composite
+
CompositeGlyphHeader
::
min_size
)
<=
glyph_end
&&
((
const
char
*
)
composite
+
composite
->
get_size
())
<=
glyph_end
;
}
};
static
inline
bool
get_iterator
(
const
char
*
glyph_data
,
unsigned
int
length
,
CompositeGlyphHeader
::
Iterator
*
iterator
/* OUT */
)
{
if
(
length
<
GlyphHeader
::
static_size
)
return
false
;
/* Empty glyph; zero extents. */
const
GlyphHeader
&
glyph_header
=
StructAtOffset
<
GlyphHeader
>
(
glyph_data
,
0
);
if
(
glyph_header
.
numberOfContours
<
0
)
{
const
CompositeGlyphHeader
*
possible
=
&
StructAfter
<
CompositeGlyphHeader
,
GlyphHeader
>
(
glyph_header
);
iterator
->
glyph_start
=
glyph_data
;
iterator
->
glyph_end
=
(
const
char
*
)
glyph_data
+
length
;
if
(
!
iterator
->
in_range
(
possible
))
return
false
;
iterator
->
current
=
possible
;
return
true
;
}
return
false
;
}
DEFINE_SIZE_MIN
(
4
);
};
...
...
@@ -166,69 +218,21 @@ struct glyf
hb_blob_destroy
(
glyf_blob
);
}
inline
bool
in_table
(
const
char
*
offset
,
unsigned
int
len
)
const
{
return
(
offset
-
(
const
char
*
)
glyf_table
+
len
)
<=
glyf_len
;
}
inline
bool
in_table
(
const
CompositeGlyphHeader
*
header
)
const
{
return
in_table
((
const
char
*
)
header
,
CompositeGlyphHeader
::
min_size
)
&&
in_table
((
const
char
*
)
header
,
header
->
get_size
());
}
inline
bool
in_glyph
(
const
CompositeGlyphHeader
*
header
,
unsigned
int
start_offset
,
unsigned
int
end_offset
)
const
{
do
{
unsigned
int
offset_in_glyf
=
(
const
char
*
)
header
-
(
const
char
*
)
glyf_table
;
if
(
offset_in_glyf
<
start_offset
||
offset_in_glyf
+
header
->
get_size
()
>
end_offset
)
return
false
;
}
while
(
next_composite
(
&
header
));
return
true
;
}
/*
* Returns true if the referenced glyph is a valid glyph and a composite glyph.
* If true is returned a pointer to the composite glyph will be written into
* composite.
*/
inline
bool
get_composite
(
hb_codepoint_t
glyph
,
const
CompositeGlyphHeader
**
composite
/* OUT */
)
const
inline
bool
get_composite
(
hb_codepoint_t
glyph
,
CompositeGlyphHeader
::
Iterator
*
composite
/* OUT */
)
const
{
unsigned
int
start_offset
,
end_offset
;
if
(
!
get_offsets
(
glyph
,
&
start_offset
,
&
end_offset
))
return
false
;
/* glyph not found */
if
(
end_offset
-
start_offset
<
GlyphHeader
::
static_size
)
return
false
;
/* Empty glyph; zero extents. */
const
GlyphHeader
&
glyph_header
=
StructAtOffset
<
GlyphHeader
>
(
glyf_table
,
start_offset
);
if
(
glyph_header
.
numberOfContours
<
0
)
{
const
CompositeGlyphHeader
*
possible
=
&
StructAfter
<
CompositeGlyphHeader
,
GlyphHeader
>
(
glyph_header
);
if
(
!
in_table
(
possible
)
||
!
in_glyph
(
possible
,
start_offset
,
end_offset
))
return
false
;
*
composite
=
possible
;
return
true
;
}
return
false
;
}
inline
bool
next_composite
(
const
CompositeGlyphHeader
**
next
/* IN/OUT */
)
const
{
if
((
*
next
)
->
flags
&
CompositeGlyphHeader
::
MORE_COMPONENTS
)
{
const
CompositeGlyphHeader
*
possible
=
&
StructAfter
<
CompositeGlyphHeader
,
CompositeGlyphHeader
>
(
**
next
);
if
(
!
in_table
(
possible
))
return
false
;
*
next
=
possible
;
return
true
;
}
return
false
;
return
CompositeGlyphHeader
::
get_iterator
((
const
char
*
)
this
->
glyf_table
+
start_offset
,
end_offset
-
start_offset
,
composite
);
}
inline
bool
get_offsets
(
hb_codepoint_t
glyph
,
...
...
src/hb-subset-plan.cc
浏览文件 @
49544eb8
...
...
@@ -106,13 +106,13 @@ _add_gid_and_children (const OT::glyf::accelerator_t &glyf,
hb_set_add
(
gids_to_retain
,
gid
);
const
OT
::
glyf
::
CompositeGlyphHeader
*
composite
;
OT
::
glyf
::
CompositeGlyphHeader
::
Iterator
composite
;
if
(
glyf
.
get_composite
(
gid
,
&
composite
))
{
do
{
_add_gid_and_children
(
glyf
,
(
hb_codepoint_t
)
composite
->
glyphIndex
,
gids_to_retain
);
}
while
(
glyf
.
next_composite
(
&
composite
));
_add_gid_and_children
(
glyf
,
(
hb_codepoint_t
)
composite
.
current
->
glyphIndex
,
gids_to_retain
);
}
while
(
composite
.
move_to_next
(
));
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录