Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
543bd58d
T
Third Party Harfbuzz
项目概览
OpenHarmony
/
Third Party Harfbuzz
接近 2 年 前同步成功
通知
1
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看板
提交
543bd58d
编写于
10月 25, 2017
作者:
B
Behdad Esfahbod
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[post] Touch up and fixes
The get_glyph_from_name() is incorrect; needs fixing.
上级
d9e166f7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
81 addition
and
67 deletion
+81
-67
src/hb-ot-font.cc
src/hb-ot-font.cc
+3
-6
src/hb-ot-post-table.hh
src/hb-ot-post-table.hh
+78
-61
未找到文件。
src/hb-ot-font.cc
浏览文件 @
543bd58d
...
...
@@ -320,18 +320,15 @@ struct hb_ot_face_post_accelerator_t
}
inline
bool
get_glyph_name
(
hb_codepoint_t
glyph
,
char
*
name
,
unsigned
int
size
)
const
char
*
name
,
unsigned
int
size
)
const
{
if
(
unlikely
(
!
name
)
||
unlikely
(
!
size
))
return
false
;
return
this
->
post
->
get_glyph_name
(
glyph
,
name
,
size
,
this
->
post_len
);
}
inline
bool
get_glyph_from_name
(
const
char
*
name
,
int
len
,
hb_codepoint_t
*
glyph
)
const
hb_codepoint_t
*
glyph
)
const
{
if
(
unlikely
(
!
name
)
||
unlikely
(
!
len
))
if
(
unlikely
(
!
len
))
return
false
;
return
this
->
post
->
get_glyph_from_name
(
name
,
len
,
glyph
,
this
->
post_len
);
...
...
src/hb-ot-post-table.hh
浏览文件 @
543bd58d
...
...
@@ -113,69 +113,80 @@ struct post
return_trace
(
false
);
if
(
version
.
to_int
()
==
0x00020000
)
{
const
postV2Tail
&
v2
=
StructAfter
<
postV2Tail
>
(
*
this
);
const
postV2Tail
&
v2
=
StructAfter
<
postV2Tail
>
(
*
this
);
return_trace
(
v2
.
sanitize
(
c
));
}
return_trace
(
true
);
}
inline
bool
get_glyph_name
(
hb_codepoint_t
glyph
,
char
*
buffer
,
unsigned
int
buffer_length
,
unsigned
int
blob_len
)
const
char
*
buffer
,
unsigned
int
buffer_length
,
unsigned
int
blob_len
)
const
{
if
(
version
.
to_int
()
==
0x00010000
)
{
if
(
glyph
>=
NUM_FORMAT1_NAMES
)
return
false
;
return
false
;
strncpy
(
buffer
,
format1_names
[
glyph
],
buffer_length
);
buffer
[
buffer_length
]
=
'\0'
;
if
(
!
buffer_length
)
return
true
;
strncpy
(
buffer
,
format1_names
[
glyph
],
buffer_length
);
buffer
[
buffer_length
-
1
]
=
'\0'
;
return
true
;
}
if
(
version
.
to_int
()
==
0x00020000
)
{
const
postV2Tail
&
v2
=
StructAfter
<
postV2Tail
>
(
*
this
);
const
postV2Tail
&
v2
=
StructAfter
<
postV2Tail
>
(
*
this
);
if
(
glyph
>=
v2
.
numberOfGlyphs
)
return
false
;
return
false
;
if
(
!
buffer_length
)
return
true
;
unsigned
int
index
=
v2
.
glyphNameIndex
[
glyph
];
if
(
index
>=
NUM_FORMAT1_NAMES
)
if
(
index
<
NUM_FORMAT1_NAMES
)
{
unsigned
int
offset
=
min_size
+
v2
.
min_size
+
2
*
v2
.
numberOfGlyphs
;
char
*
data
=
(
char
*
)
this
+
offset
;
for
(
unsigned
int
i
=
0
;
data
<
(
char
*
)
this
+
blob_len
;
i
++
)
{
unsigned
int
name_length
=
data
[
0
];
data
++
;
if
(
i
==
index
-
NUM_FORMAT1_NAMES
)
{
unsigned
int
remaining
=
(
char
*
)
this
+
blob_len
-
data
;
name_length
=
MIN
(
name_length
,
buffer_length
);
name_length
=
MIN
(
name_length
,
remaining
);
memcpy
(
buffer
,
data
,
name_length
);
buffer
[
name_length
]
=
'\0'
;
return
true
;
}
data
+=
name_length
;
}
return
false
;
if
(
!
buffer_length
)
return
true
;
strncpy
(
buffer
,
format1_names
[
index
],
buffer_length
);
buffer
[
buffer_length
-
1
]
=
'\0'
;
return
true
;
}
else
index
-=
NUM_FORMAT1_NAMES
;
unsigned
int
offset
=
min_size
+
v2
.
min_size
+
2
*
v2
.
numberOfGlyphs
;
unsigned
char
*
data
=
(
unsigned
char
*
)
this
+
offset
;
unsigned
char
*
end
=
(
unsigned
char
*
)
this
+
blob_len
;
for
(
unsigned
int
i
=
0
;
data
<
end
;
i
++
)
{
strncpy
(
buffer
,
format1_names
[
index
],
buffer_length
);
buffer
[
buffer_length
]
=
'\0'
;
return
true
;
unsigned
int
name_length
=
data
[
0
];
data
++
;
if
(
i
==
index
)
{
if
(
unlikely
(
!
name_length
))
return
false
;
unsigned
int
remaining
=
end
-
data
;
name_length
=
MIN
(
name_length
,
buffer_length
-
1
);
name_length
=
MIN
(
name_length
,
remaining
);
memcpy
(
buffer
,
data
,
name_length
);
buffer
[
name_length
]
=
'\0'
;
return
true
;
}
data
+=
name_length
;
}
return
false
;
}
return
false
;
}
inline
bool
get_glyph_from_name
(
const
char
*
name
,
int
len
,
hb_codepoint_t
*
glyph
,
unsigned
int
blob_len
)
const
hb_codepoint_t
*
glyph
,
unsigned
int
blob_len
)
const
{
if
(
len
<
0
)
len
=
strlen
(
name
);
...
...
@@ -184,45 +195,51 @@ struct post
{
for
(
int
i
=
0
;
i
<
NUM_FORMAT1_NAMES
;
i
++
)
{
if
(
strncmp
(
name
,
format1_names
[
i
],
len
)
==
0
)
{
*
glyph
=
i
;
return
true
;
}
if
(
strncmp
(
name
,
format1_names
[
i
],
len
)
==
0
&&
format1_names
[
len
]
==
'\0'
)
{
*
glyph
=
i
;
return
true
;
}
}
return
false
;
}
if
(
version
.
to_int
()
==
0x00020000
)
{
const
postV2Tail
&
v2
=
StructAfter
<
postV2Tail
>
(
*
this
);
const
postV2Tail
&
v2
=
StructAfter
<
postV2Tail
>
(
*
this
);
unsigned
int
offset
=
min_size
+
v2
.
min_size
+
2
*
v2
.
numberOfGlyphs
;
char
*
data
=
(
char
*
)
this
+
offset
;
/* XXX The following code is wrong. */
return
false
;
for
(
hb_codepoint_t
gid
=
0
;
gid
<
v2
.
numberOfGlyphs
;
gid
++
)
{
unsigned
int
index
=
v2
.
glyphNameIndex
[
gid
];
if
(
index
>=
NUM_FORMAT1_NAMES
)
{
for
(
unsigned
int
i
=
0
;
data
<
(
char
*
)
this
+
blob_len
;
i
++
)
{
unsigned
int
name_length
=
data
[
0
];
unsigned
int
remaining
=
(
char
*
)
this
+
blob_len
-
data
-
1
;
name_length
=
MIN
(
name_length
,
remaining
);
if
(
name_length
==
len
&&
strncmp
(
name
,
data
+
1
,
len
)
==
0
)
{
*
glyph
=
gid
;
return
true
;
}
data
+=
name_length
+
1
;
}
return
false
;
}
else
if
(
strncmp
(
name
,
format1_names
[
index
],
len
)
==
0
)
{
*
glyph
=
gid
;
return
true
;
}
unsigned
int
index
=
v2
.
glyphNameIndex
[
gid
];
if
(
index
<
NUM_FORMAT1_NAMES
)
{
if
(
strncmp
(
name
,
format1_names
[
index
],
len
)
==
0
&&
format1_names
[
len
]
==
'\0'
)
{
*
glyph
=
gid
;
return
true
;
}
continue
;
}
index
-=
NUM_FORMAT1_NAMES
;
for
(
unsigned
int
i
=
0
;
data
<
(
char
*
)
this
+
blob_len
;
i
++
)
{
unsigned
int
name_length
=
data
[
0
];
unsigned
int
remaining
=
(
char
*
)
this
+
blob_len
-
data
-
1
;
name_length
=
MIN
(
name_length
,
remaining
);
if
(
name_length
==
(
unsigned
int
)
len
&&
strncmp
(
name
,
data
+
1
,
len
)
==
0
)
{
*
glyph
=
gid
;
return
true
;
}
data
+=
name_length
+
1
;
}
return
false
;
}
return
false
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录