Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
1582eabe
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,发现更多精彩内容 >>
提交
1582eabe
编写于
2月 09, 2018
作者:
G
Garret Rieger
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update head table with loca format selected by glyf+loca subsetting.
上级
335bbaa6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
39 addition
and
6 deletion
+39
-6
src/hb-subset-glyf.cc
src/hb-subset-glyf.cc
+3
-4
src/hb-subset-glyf.hh
src/hb-subset-glyf.hh
+1
-0
src/hb-subset.cc
src/hb-subset.cc
+35
-2
未找到文件。
src/hb-subset-glyf.cc
浏览文件 @
1582eabe
...
@@ -103,10 +103,8 @@ _hb_subset_glyf_and_loca (const OT::glyf::accelerator_t &glyf,
...
@@ -103,10 +103,8 @@ _hb_subset_glyf_and_loca (const OT::glyf::accelerator_t &glyf,
{
{
// TODO(grieger): Sanity check writes to make sure they are in-bounds.
// TODO(grieger): Sanity check writes to make sure they are in-bounds.
// TODO(grieger): Sanity check allocation size for the new table.
// TODO(grieger): Sanity check allocation size for the new table.
// TODO(grieger): Subset loca simultaneously.
// TODO(grieger): Don't fail on bad offsets, just dump them.
// TODO(grieger): Don't fail on bad offsets, just dump them.
// TODO(grieger): Support short loca output.
// TODO(grieger): Support short loca output.
// TODO(grieger): Add a extra loca entry at the end.
unsigned
int
glyf_prime_size
;
unsigned
int
glyf_prime_size
;
unsigned
int
loca_prime_size
;
unsigned
int
loca_prime_size
;
...
@@ -150,7 +148,8 @@ _hb_subset_glyf_and_loca (const OT::glyf::accelerator_t &glyf,
...
@@ -150,7 +148,8 @@ _hb_subset_glyf_and_loca (const OT::glyf::accelerator_t &glyf,
bool
bool
hb_subset_glyf_and_loca
(
hb_subset_plan_t
*
plan
,
hb_subset_glyf_and_loca
(
hb_subset_plan_t
*
plan
,
hb_face_t
*
face
,
hb_face_t
*
face
,
hb_blob_t
**
glyf_prime
/* OUT */
,
bool
*
use_short_loca
,
/* OUT */
hb_blob_t
**
glyf_prime
,
/* OUT */
hb_blob_t
**
loca_prime
/* OUT */
)
hb_blob_t
**
loca_prime
/* OUT */
)
{
{
hb_blob_t
*
glyf_blob
=
OT
::
Sanitizer
<
OT
::
glyf
>
().
sanitize
(
face
->
reference_table
(
HB_OT_TAG_glyf
));
hb_blob_t
*
glyf_blob
=
OT
::
Sanitizer
<
OT
::
glyf
>
().
sanitize
(
face
->
reference_table
(
HB_OT_TAG_glyf
));
...
@@ -161,7 +160,7 @@ hb_subset_glyf_and_loca (hb_subset_plan_t *plan,
...
@@ -161,7 +160,7 @@ hb_subset_glyf_and_loca (hb_subset_plan_t *plan,
bool
result
=
_hb_subset_glyf_and_loca
(
glyf
,
glyf_data
,
plan
->
gids_to_retain
,
glyf_prime
,
loca_prime
);
bool
result
=
_hb_subset_glyf_and_loca
(
glyf
,
glyf_data
,
plan
->
gids_to_retain
,
glyf_prime
,
loca_prime
);
glyf
.
fini
();
glyf
.
fini
();
// TODO(grieger): Subset loca
*
use_short_loca
=
false
;
return
result
;
return
result
;
}
}
src/hb-subset-glyf.hh
浏览文件 @
1582eabe
...
@@ -34,6 +34,7 @@
...
@@ -34,6 +34,7 @@
bool
bool
hb_subset_glyf_and_loca
(
hb_subset_plan_t
*
plan
,
hb_subset_glyf_and_loca
(
hb_subset_plan_t
*
plan
,
hb_face_t
*
face
,
hb_face_t
*
face
,
bool
*
use_short_loca
,
/* OUT */
hb_blob_t
**
glyf_prime
/* OUT */
,
hb_blob_t
**
glyf_prime
/* OUT */
,
hb_blob_t
**
loca_prime
/* OUT */
);
hb_blob_t
**
loca_prime
/* OUT */
);
...
...
src/hb-subset.cc
浏览文件 @
1582eabe
...
@@ -253,6 +253,32 @@ hb_subset_face_add_table (hb_face_t *face, hb_tag_t tag, hb_blob_t *blob)
...
@@ -253,6 +253,32 @@ hb_subset_face_add_table (hb_face_t *face, hb_tag_t tag, hb_blob_t *blob)
return
true
;
return
true
;
}
}
bool
_add_head_and_set_loca_version
(
hb_face_t
*
source
,
bool
use_short_loca
,
hb_face_t
*
dest
)
{
hb_blob_t
*
head_blob
=
OT
::
Sanitizer
<
OT
::
head
>
().
sanitize
(
hb_face_reference_table
(
source
,
HB_OT_TAG_head
));
const
OT
::
head
*
head
=
OT
::
Sanitizer
<
OT
::
head
>::
lock_instance
(
head_blob
);
if
(
head
)
{
OT
::
head
*
head_prime
=
(
OT
::
head
*
)
calloc
(
OT
::
head
::
static_size
,
1
);
memcpy
(
head_prime
,
head
,
OT
::
head
::
static_size
);
head_prime
->
indexToLocFormat
.
set
(
use_short_loca
?
0
:
1
);
hb_blob_t
*
head_prime_blob
=
hb_blob_create
((
const
char
*
)
head_prime
,
OT
::
head
::
static_size
,
HB_MEMORY_MODE_WRITABLE
,
head_prime
,
free
);
hb_subset_face_add_table
(
dest
,
HB_OT_TAG_head
,
head_prime_blob
);
hb_blob_destroy
(
head_prime_blob
);
}
hb_blob_destroy
(
head_blob
);
return
!
head
;
}
bool
bool
_subset_glyf
(
hb_subset_plan_t
*
plan
,
hb_face_t
*
source
,
hb_face_t
*
dest
)
_subset_glyf
(
hb_subset_plan_t
*
plan
,
hb_face_t
*
source
,
hb_face_t
*
dest
)
{
{
...
@@ -260,16 +286,20 @@ _subset_glyf (hb_subset_plan_t *plan, hb_face_t *source, hb_face_t *dest)
...
@@ -260,16 +286,20 @@ _subset_glyf (hb_subset_plan_t *plan, hb_face_t *source, hb_face_t *dest)
hb_blob_t
*
loca_prime
=
nullptr
;
hb_blob_t
*
loca_prime
=
nullptr
;
bool
success
=
true
;
bool
success
=
true
;
bool
use_short_loca
=
false
;
// TODO(grieger): Migrate to subset function on the table like cmap.
// TODO(grieger): Migrate to subset function on the table like cmap.
if
(
hb_subset_glyf_and_loca
(
plan
,
source
,
&
glyf_prime
,
&
loca_prime
))
{
if
(
hb_subset_glyf_and_loca
(
plan
,
source
,
&
use_short_loca
,
&
glyf_prime
,
&
loca_prime
))
{
hb_subset_face_add_table
(
dest
,
HB_OT_TAG_glyf
,
glyf_prime
);
hb_subset_face_add_table
(
dest
,
HB_OT_TAG_glyf
,
glyf_prime
);
hb_subset_face_add_table
(
dest
,
HB_OT_TAG_loca
,
loca_prime
);
hb_subset_face_add_table
(
dest
,
HB_OT_TAG_loca
,
loca_prime
);
success
=
success
&&
_add_head_and_set_loca_version
(
source
,
use_short_loca
,
dest
);
}
else
{
}
else
{
success
=
false
;
success
=
false
;
}
}
hb_blob_destroy
(
loca_prime
);
hb_blob_destroy
(
loca_prime
);
hb_blob_destroy
(
glyf_prime
);
hb_blob_destroy
(
glyf_prime
);
_add_head_and_set_loca_version
(
source
,
use_short_loca
,
dest
);
return
success
;
return
success
;
}
}
...
@@ -284,8 +314,11 @@ _subset_table (hb_subset_plan_t *plan,
...
@@ -284,8 +314,11 @@ _subset_table (hb_subset_plan_t *plan,
switch
(
tag
)
{
switch
(
tag
)
{
case
HB_OT_TAG_glyf
:
case
HB_OT_TAG_glyf
:
return
_subset_glyf
(
plan
,
source
,
dest
);
return
_subset_glyf
(
plan
,
source
,
dest
);
case
HB_OT_TAG_head
:
// SKIP head, it's handled by glyf
return
true
;
case
HB_OT_TAG_loca
:
case
HB_OT_TAG_loca
:
// SKIP loca, it's handle by
the glyf subsetter.
// SKIP loca, it's handle by
glyf
return
true
;
return
true
;
case
HB_OT_TAG_cmap
:
case
HB_OT_TAG_cmap
:
// TODO(rsheeter): remove hb_subset_face_add_table
// TODO(rsheeter): remove hb_subset_face_add_table
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录