Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
9e4f03b6
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看板
提交
9e4f03b6
编写于
11月 28, 2018
作者:
B
Behdad Esfahbod
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'fdo/master'
上级
19863c80
a3267cf8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
31 deletion
+31
-31
src/hb-aat-layout-common.hh
src/hb-aat-layout-common.hh
+23
-21
src/hb-aat-layout-kerx-table.hh
src/hb-aat-layout-kerx-table.hh
+8
-10
未找到文件。
src/hb-aat-layout-common.hh
浏览文件 @
9e4f03b6
...
@@ -363,6 +363,14 @@ struct Lookup
...
@@ -363,6 +363,14 @@ struct Lookup
}
}
}
}
inline
typename
T
::
type
get_class
(
hb_codepoint_t
glyph_id
,
unsigned
int
num_glyphs
,
unsigned
int
outOfRange
)
const
{
const
T
*
v
=
get_value
(
glyph_id
,
num_glyphs
);
return
v
?
*
v
:
outOfRange
;
}
inline
bool
sanitize
(
hb_sanitize_context_t
*
c
)
const
inline
bool
sanitize
(
hb_sanitize_context_t
*
c
)
const
{
{
TRACE_SANITIZE
(
this
);
TRACE_SANITIZE
(
this
);
...
@@ -480,7 +488,7 @@ struct StateTable
...
@@ -480,7 +488,7 @@ struct StateTable
{
{
typedef
typename
Types
::
HBUINT
HBUINT
;
typedef
typename
Types
::
HBUINT
HBUINT
;
typedef
typename
Types
::
HBUSHORT
HBUSHORT
;
typedef
typename
Types
::
HBUSHORT
HBUSHORT
;
typedef
typename
Types
::
ClassType
ClassType
;
typedef
typename
Types
::
ClassType
Narrow
ClassType
;
enum
State
enum
State
{
{
...
@@ -638,6 +646,7 @@ struct StateTable
...
@@ -638,6 +646,7 @@ struct StateTable
DEFINE_SIZE_STATIC
(
4
*
sizeof
(
HBUINT
));
DEFINE_SIZE_STATIC
(
4
*
sizeof
(
HBUINT
));
};
};
template
<
typename
HBUCHAR
>
struct
ClassTable
struct
ClassTable
{
{
inline
unsigned
int
get_class
(
hb_codepoint_t
glyph_id
,
unsigned
int
outOfRange
)
const
inline
unsigned
int
get_class
(
hb_codepoint_t
glyph_id
,
unsigned
int
outOfRange
)
const
...
@@ -645,6 +654,12 @@ struct ClassTable
...
@@ -645,6 +654,12 @@ struct ClassTable
unsigned
int
i
=
glyph_id
-
firstGlyph
;
unsigned
int
i
=
glyph_id
-
firstGlyph
;
return
i
>=
classArray
.
len
?
outOfRange
:
classArray
.
arrayZ
[
i
];
return
i
>=
classArray
.
len
?
outOfRange
:
classArray
.
arrayZ
[
i
];
}
}
inline
unsigned
int
get_class
(
hb_codepoint_t
glyph_id
,
unsigned
int
num_glyphs
HB_UNUSED
,
unsigned
int
outOfRange
)
const
{
return
get_class
(
glyph_id
,
outOfRange
);
}
inline
bool
sanitize
(
hb_sanitize_context_t
*
c
)
const
inline
bool
sanitize
(
hb_sanitize_context_t
*
c
)
const
{
{
TRACE_SANITIZE
(
this
);
TRACE_SANITIZE
(
this
);
...
@@ -652,7 +667,7 @@ struct ClassTable
...
@@ -652,7 +667,7 @@ struct ClassTable
}
}
protected:
protected:
GlyphID
firstGlyph
;
/* First glyph index included in the trimmed array. */
GlyphID
firstGlyph
;
/* First glyph index included in the trimmed array. */
ArrayOf
<
HBU
INT8
>
classArray
;
/* The class codes (indexed by glyph index minus
ArrayOf
<
HBU
CHAR
>
classArray
;
/* The class codes (indexed by glyph index minus
* firstGlyph). */
* firstGlyph). */
public:
public:
DEFINE_SIZE_ARRAY
(
4
,
classArray
);
DEFINE_SIZE_ARRAY
(
4
,
classArray
);
...
@@ -663,15 +678,9 @@ struct ObsoleteTypes
...
@@ -663,15 +678,9 @@ struct ObsoleteTypes
static
const
bool
extended
=
false
;
static
const
bool
extended
=
false
;
typedef
HBUINT16
HBUINT
;
typedef
HBUINT16
HBUINT
;
typedef
HBUINT8
HBUSHORT
;
typedef
HBUINT8
HBUSHORT
;
struct
ClassType
:
ClassTable
typedef
ClassTable
<
HBUINT8
>
ClassTypeNarrow
;
{
typedef
ClassTable
<
HBUINT16
>
ClassTypeWide
;
inline
unsigned
int
get_class
(
hb_codepoint_t
glyph_id
,
unsigned
int
num_glyphs
HB_UNUSED
,
unsigned
int
outOfRange
)
const
{
return
ClassTable
::
get_class
(
glyph_id
,
outOfRange
);
}
};
template
<
typename
T
>
template
<
typename
T
>
static
inline
unsigned
int
offsetToIndex
(
unsigned
int
offset
,
static
inline
unsigned
int
offsetToIndex
(
unsigned
int
offset
,
const
void
*
base
,
const
void
*
base
,
...
@@ -692,16 +701,9 @@ struct ExtendedTypes
...
@@ -692,16 +701,9 @@ struct ExtendedTypes
static
const
bool
extended
=
true
;
static
const
bool
extended
=
true
;
typedef
HBUINT32
HBUINT
;
typedef
HBUINT32
HBUINT
;
typedef
HBUINT16
HBUSHORT
;
typedef
HBUINT16
HBUSHORT
;
struct
ClassType
:
Lookup
<
HBUINT16
>
typedef
Lookup
<
HBUINT16
>
ClassTypeNarrow
;
{
typedef
Lookup
<
HBUINT16
>
ClassTypeWide
;
inline
unsigned
int
get_class
(
hb_codepoint_t
glyph_id
,
unsigned
int
num_glyphs
,
unsigned
int
outOfRange
)
const
{
const
HBUINT16
*
v
=
get_value
(
glyph_id
,
num_glyphs
);
return
v
?
*
v
:
outOfRange
;
}
};
template
<
typename
T
>
template
<
typename
T
>
static
inline
unsigned
int
offsetToIndex
(
unsigned
int
offset
,
static
inline
unsigned
int
offsetToIndex
(
unsigned
int
offset
,
const
void
*
base
,
const
void
*
base
,
...
...
src/hb-aat-layout-kerx-table.hh
浏览文件 @
9e4f03b6
...
@@ -392,9 +392,13 @@ struct KerxSubTableFormat2
...
@@ -392,9 +392,13 @@ struct KerxSubTableFormat2
unsigned
int
num_glyphs
=
c
->
sanitizer
.
get_num_glyphs
();
unsigned
int
num_glyphs
=
c
->
sanitizer
.
get_num_glyphs
();
unsigned
int
l
=
(
this
+
leftClassTable
).
get_class
(
left
,
num_glyphs
,
0
);
unsigned
int
l
=
(
this
+
leftClassTable
).
get_class
(
left
,
num_glyphs
,
0
);
unsigned
int
r
=
(
this
+
rightClassTable
).
get_class
(
right
,
num_glyphs
,
0
);
unsigned
int
r
=
(
this
+
rightClassTable
).
get_class
(
right
,
num_glyphs
,
0
);
unsigned
int
offset
=
l
+
r
;
const
FWORD
*
v
=
&
StructAtOffset
<
FWORD
>
(
&
(
this
+
array
),
offset
);
const
UnsizedArrayOf
<
FWORD
>
&
arrayZ
=
this
+
array
;
unsigned
int
kern_idx
=
l
+
r
;
kern_idx
=
Types
::
offsetToIndex
(
kern_idx
,
this
,
&
arrayZ
);
const
FWORD
*
v
=
&
arrayZ
[
kern_idx
];
if
(
unlikely
(
!
v
->
sanitize
(
&
c
->
sanitizer
)))
return
0
;
if
(
unlikely
(
!
v
->
sanitize
(
&
c
->
sanitizer
)))
return
0
;
return
kerxTupleKern
(
*
v
,
header
.
tuple_count
(),
this
,
c
);
return
kerxTupleKern
(
*
v
,
header
.
tuple_count
(),
this
,
c
);
}
}
...
@@ -437,19 +441,13 @@ struct KerxSubTableFormat2
...
@@ -437,19 +441,13 @@ struct KerxSubTableFormat2
c
->
check_range
(
this
,
array
)));
c
->
check_range
(
this
,
array
)));
}
}
/* Note:
* OT kern table specifies ClassTable as having 16-bit entries, whereas
* AAT kern table specifies them as having 8bit entries.
* I've not seen any fonts with this format in kern table.
* We follow AAT. */
protected:
protected:
KernSubTableHeader
header
;
KernSubTableHeader
header
;
HBUINT
rowWidth
;
/* The width, in bytes, of a row in the table. */
HBUINT
rowWidth
;
/* The width, in bytes, of a row in the table. */
OffsetTo
<
typename
Types
::
ClassType
,
HBUINT
,
false
>
OffsetTo
<
typename
Types
::
ClassType
Wide
,
HBUINT
,
false
>
leftClassTable
;
/* Offset from beginning of this subtable to
leftClassTable
;
/* Offset from beginning of this subtable to
* left-hand class table. */
* left-hand class table. */
OffsetTo
<
typename
Types
::
ClassType
,
HBUINT
,
false
>
OffsetTo
<
typename
Types
::
ClassType
Wide
,
HBUINT
,
false
>
rightClassTable
;
/* Offset from beginning of this subtable to
rightClassTable
;
/* Offset from beginning of this subtable to
* right-hand class table. */
* right-hand class table. */
OffsetTo
<
UnsizedArrayOf
<
FWORD
>
,
HBUINT
,
false
>
OffsetTo
<
UnsizedArrayOf
<
FWORD
>
,
HBUINT
,
false
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录