Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
903771b6
T
Third Party Harfbuzz
项目概览
OpenHarmony
/
Third Party Harfbuzz
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
903771b6
编写于
2月 26, 2018
作者:
R
Rod Sheeter
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[subset] clearer name for trim() and better comment about composite handling, per review feedback
上级
5267520e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
12 deletion
+13
-12
src/hb-ot-glyf-table.hh
src/hb-ot-glyf-table.hh
+5
-3
src/hb-subset-glyf.cc
src/hb-subset-glyf.cc
+8
-9
未找到文件。
src/hb-ot-glyf-table.hh
浏览文件 @
903771b6
...
@@ -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
(
unsigned
int
start_offset
,
inline
bool
remove_padding
(
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
;
...
@@ -294,7 +294,9 @@ struct glyf
...
@@ -294,7 +294,9 @@ struct glyf
int16_t
num_contours
=
(
int16_t
)
glyph_header
.
numberOfContours
;
int16_t
num_contours
=
(
int16_t
)
glyph_header
.
numberOfContours
;
if
(
num_contours
<
0
)
if
(
num_contours
<
0
)
return
true
;
/* no trimming for composites just yet */
/* Trimming for composites not implemented.
* If removing hints it falls out of that. */
return
true
;
else
if
(
num_contours
>
0
)
else
if
(
num_contours
>
0
)
{
{
unsigned
int
glyph_len
=
*
end_offset
-
start_offset
;
unsigned
int
glyph_len
=
*
end_offset
-
start_offset
;
...
...
src/hb-subset-glyf.cc
浏览文件 @
903771b6
...
@@ -43,12 +43,14 @@ _calculate_glyf_and_loca_prime_size (const OT::glyf::accelerator_t &glyf,
...
@@ -43,12 +43,14 @@ _calculate_glyf_and_loca_prime_size (const OT::glyf::accelerator_t &glyf,
for
(
unsigned
int
i
=
0
;
i
<
glyph_ids
.
len
;
i
++
)
for
(
unsigned
int
i
=
0
;
i
<
glyph_ids
.
len
;
i
++
)
{
{
hb_codepoint_t
next_glyph
=
glyph_ids
[
i
];
hb_codepoint_t
next_glyph
=
glyph_ids
[
i
];
*
(
instruction_ranges
->
push
())
=
0
;
unsigned
int
*
instruction_start
=
instruction_ranges
->
push
();
*
(
instruction_ranges
->
push
())
=
0
;
unsigned
int
*
instruction_end
=
instruction_ranges
->
push
();
*
instruction_start
=
0
;
*
instruction_end
=
0
;
unsigned
int
start_offset
,
end_offset
;
unsigned
int
start_offset
,
end_offset
;
if
(
unlikely
(
!
(
glyf
.
get_offsets
(
next_glyph
,
&
start_offset
,
&
end_offset
)
if
(
unlikely
(
!
(
glyf
.
get_offsets
(
next_glyph
,
&
start_offset
,
&
end_offset
)
&&
glyf
.
trim
(
start_offset
,
&
end_offset
))))
&&
glyf
.
remove_padding
(
start_offset
,
&
end_offset
))))
{
{
DEBUG_MSG
(
SUBSET
,
nullptr
,
"Invalid gid %d"
,
next_glyph
);
DEBUG_MSG
(
SUBSET
,
nullptr
,
"Invalid gid %d"
,
next_glyph
);
continue
;
continue
;
...
@@ -56,20 +58,17 @@ _calculate_glyf_and_loca_prime_size (const OT::glyf::accelerator_t &glyf,
...
@@ -56,20 +58,17 @@ _calculate_glyf_and_loca_prime_size (const OT::glyf::accelerator_t &glyf,
if
(
end_offset
-
start_offset
<
OT
::
glyf
::
GlyphHeader
::
static_size
)
if
(
end_offset
-
start_offset
<
OT
::
glyf
::
GlyphHeader
::
static_size
)
continue
;
/* 0-length glyph */
continue
;
/* 0-length glyph */
unsigned
int
instruction_start
=
0
,
instruction_end
=
0
;
if
(
drop_hints
)
if
(
drop_hints
)
{
{
if
(
unlikely
(
!
glyf
.
get_instruction_offsets
(
start_offset
,
end_offset
,
if
(
unlikely
(
!
glyf
.
get_instruction_offsets
(
start_offset
,
end_offset
,
&
instruction_start
,
&
instruction_end
)))
instruction_start
,
instruction_end
)))
{
{
DEBUG_MSG
(
SUBSET
,
nullptr
,
"Unable to get instruction offsets for %d"
,
next_glyph
);
DEBUG_MSG
(
SUBSET
,
nullptr
,
"Unable to get instruction offsets for %d"
,
next_glyph
);
return
false
;
return
false
;
}
}
instruction_ranges
->
array
[
i
*
2
]
=
instruction_start
;
instruction_ranges
->
array
[
i
*
2
+
1
]
=
instruction_end
;
}
}
total
+=
end_offset
-
start_offset
-
(
instruction_end
-
instruction_start
);
total
+=
end_offset
-
start_offset
-
(
*
instruction_end
-
*
instruction_start
);
/* round2 so short loca will work */
/* round2 so short loca will work */
total
+=
total
%
2
;
total
+=
total
%
2
;
}
}
...
@@ -156,7 +155,7 @@ _write_glyf_and_loca_prime (hb_subset_plan_t *plan,
...
@@ -156,7 +155,7 @@ _write_glyf_and_loca_prime (hb_subset_plan_t *plan,
{
{
unsigned
int
start_offset
,
end_offset
;
unsigned
int
start_offset
,
end_offset
;
if
(
unlikely
(
!
(
glyf
.
get_offsets
(
glyph_ids
[
i
],
&
start_offset
,
&
end_offset
)
if
(
unlikely
(
!
(
glyf
.
get_offsets
(
glyph_ids
[
i
],
&
start_offset
,
&
end_offset
)
&&
glyf
.
trim
(
start_offset
,
&
end_offset
))))
&&
glyf
.
remove_padding
(
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录