Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
1454d82a
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,发现更多精彩内容 >>
提交
1454d82a
编写于
2月 23, 2018
作者:
R
Rod Sheeter
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[subset] keep glyph trim separate of more general get_offset
上级
0ac8c0c1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
10 deletion
+8
-10
src/hb-ot-glyf-table.hh
src/hb-ot-glyf-table.hh
+4
-8
src/hb-subset-glyf.cc
src/hb-subset-glyf.cc
+4
-2
未找到文件。
src/hb-ot-glyf-table.hh
浏览文件 @
1454d82a
...
@@ -267,7 +267,7 @@ struct glyf
...
@@ -267,7 +267,7 @@ struct glyf
CompositeGlyphHeader
::
Iterator
*
composite
/* OUT */
)
const
CompositeGlyphHeader
::
Iterator
*
composite
/* OUT */
)
const
{
{
unsigned
int
start_offset
,
end_offset
;
unsigned
int
start_offset
,
end_offset
;
if
(
!
get_offsets
(
glyph
,
/* trim */
false
,
&
start_offset
,
&
end_offset
))
if
(
!
get_offsets
(
glyph
,
&
start_offset
,
&
end_offset
))
return
false
;
/* glyph not found */
return
false
;
/* glyph not found */
return
CompositeGlyphHeader
::
get_iterator
((
const
char
*
)
this
->
glyf_table
+
start_offset
,
return
CompositeGlyphHeader
::
get_iterator
((
const
char
*
)
this
->
glyf_table
+
start_offset
,
...
@@ -276,8 +276,8 @@ struct glyf
...
@@ -276,8 +276,8 @@ struct glyf
}
}
/* based on FontTools _g_l_y_f.py::trim */
/* based on FontTools _g_l_y_f.py::trim */
inline
bool
trim
_glyph
(
unsigned
int
start_offset
,
inline
bool
trim
(
unsigned
int
start_offset
,
unsigned
int
*
end_offset
)
const
unsigned
int
*
end_offset
)
const
{
{
static
const
int
FLAG_X_SHORT
=
0x02
;
static
const
int
FLAG_X_SHORT
=
0x02
;
static
const
int
FLAG_Y_SHORT
=
0x04
;
static
const
int
FLAG_Y_SHORT
=
0x04
;
...
@@ -359,7 +359,6 @@ struct glyf
...
@@ -359,7 +359,6 @@ struct glyf
}
}
inline
bool
get_offsets
(
hb_codepoint_t
glyph
,
inline
bool
get_offsets
(
hb_codepoint_t
glyph
,
bool
trim
,
unsigned
int
*
start_offset
/* OUT */
,
unsigned
int
*
start_offset
/* OUT */
,
unsigned
int
*
end_offset
/* OUT */
)
const
unsigned
int
*
end_offset
/* OUT */
)
const
{
{
...
@@ -383,9 +382,6 @@ struct glyf
...
@@ -383,9 +382,6 @@ struct glyf
if
(
*
start_offset
>
*
end_offset
||
*
end_offset
>
glyf_len
)
if
(
*
start_offset
>
*
end_offset
||
*
end_offset
>
glyf_len
)
return
false
;
return
false
;
if
(
trim
)
return
trim_glyph
(
*
start_offset
,
end_offset
);
return
true
;
return
true
;
}
}
...
@@ -438,7 +434,7 @@ struct glyf
...
@@ -438,7 +434,7 @@ struct glyf
hb_glyph_extents_t
*
extents
)
const
hb_glyph_extents_t
*
extents
)
const
{
{
unsigned
int
start_offset
,
end_offset
;
unsigned
int
start_offset
,
end_offset
;
if
(
!
get_offsets
(
glyph
,
/* trim */
false
,
&
start_offset
,
&
end_offset
))
if
(
!
get_offsets
(
glyph
,
&
start_offset
,
&
end_offset
))
return
false
;
return
false
;
if
(
end_offset
-
start_offset
<
GlyphHeader
::
static_size
)
if
(
end_offset
-
start_offset
<
GlyphHeader
::
static_size
)
...
...
src/hb-subset-glyf.cc
浏览文件 @
1454d82a
...
@@ -47,7 +47,8 @@ _calculate_glyf_and_loca_prime_size (const OT::glyf::accelerator_t &glyf,
...
@@ -47,7 +47,8 @@ _calculate_glyf_and_loca_prime_size (const OT::glyf::accelerator_t &glyf,
*
(
instruction_ranges
->
push
())
=
0
;
*
(
instruction_ranges
->
push
())
=
0
;
unsigned
int
start_offset
,
end_offset
;
unsigned
int
start_offset
,
end_offset
;
if
(
unlikely
(
!
glyf
.
get_offsets
(
next_glyph
,
/* trim */
true
,
&
start_offset
,
&
end_offset
)))
if
(
unlikely
(
!
(
glyf
.
get_offsets
(
next_glyph
,
&
start_offset
,
&
end_offset
)
&&
glyf
.
trim
(
start_offset
,
&
end_offset
))))
{
{
DEBUG_MSG
(
SUBSET
,
nullptr
,
"Invalid gid %d"
,
next_glyph
);
DEBUG_MSG
(
SUBSET
,
nullptr
,
"Invalid gid %d"
,
next_glyph
);
continue
;
continue
;
...
@@ -154,7 +155,8 @@ _write_glyf_and_loca_prime (hb_subset_plan_t *plan,
...
@@ -154,7 +155,8 @@ _write_glyf_and_loca_prime (hb_subset_plan_t *plan,
for
(
unsigned
int
i
=
0
;
i
<
glyph_ids
.
len
;
i
++
)
for
(
unsigned
int
i
=
0
;
i
<
glyph_ids
.
len
;
i
++
)
{
{
unsigned
int
start_offset
,
end_offset
;
unsigned
int
start_offset
,
end_offset
;
if
(
unlikely
(
!
glyf
.
get_offsets
(
glyph_ids
[
i
],
/* trim */
true
,
&
start_offset
,
&
end_offset
)))
if
(
unlikely
(
!
(
glyf
.
get_offsets
(
glyph_ids
[
i
],
&
start_offset
,
&
end_offset
)
&&
glyf
.
trim
(
start_offset
,
&
end_offset
))))
end_offset
=
start_offset
=
0
;
end_offset
=
start_offset
=
0
;
unsigned
int
instruction_start
=
instruction_ranges
[
i
*
2
];
unsigned
int
instruction_start
=
instruction_ranges
[
i
*
2
];
unsigned
int
instruction_end
=
instruction_ranges
[
i
*
2
+
1
];
unsigned
int
instruction_end
=
instruction_ranges
[
i
*
2
+
1
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录