Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
772e6268
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,发现更多精彩内容 >>
提交
772e6268
编写于
7月 20, 2019
作者:
E
Ebrahim Byagowi
提交者:
Behdad Esfahbod
7月 20, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make HB_TINY builds work again by separating the always needed part
上级
cb704337
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
59 addition
and
20 deletion
+59
-20
src/hb-ot-font.cc
src/hb-ot-font.cc
+6
-6
src/hb-ot-metrics.cc
src/hb-ot-metrics.cc
+48
-14
src/hb-ot-metrics.hh
src/hb-ot-metrics.hh
+5
-0
未找到文件。
src/hb-ot-font.cc
浏览文件 @
772e6268
...
...
@@ -234,9 +234,9 @@ hb_ot_get_font_h_extents (hb_font_t *font,
hb_font_extents_t
*
metrics
,
void
*
user_data
HB_UNUSED
)
{
return
hb_ot_metrics_get_position
(
font
,
HB_OT_METRICS_HORIZONTAL_ASCENDER
,
&
metrics
->
ascender
)
&&
hb_ot_metrics_get_position
(
font
,
HB_OT_METRICS_HORIZONTAL_DESCENDER
,
&
metrics
->
descender
)
&&
hb_ot_metrics_get_position
(
font
,
HB_OT_METRICS_HORIZONTAL_LINE_GAP
,
&
metrics
->
line_gap
);
return
hb_ot_metrics_get_position
_common
(
font
,
HB_OT_METRICS_HORIZONTAL_ASCENDER
,
&
metrics
->
ascender
)
&&
hb_ot_metrics_get_position
_common
(
font
,
HB_OT_METRICS_HORIZONTAL_DESCENDER
,
&
metrics
->
descender
)
&&
hb_ot_metrics_get_position
_common
(
font
,
HB_OT_METRICS_HORIZONTAL_LINE_GAP
,
&
metrics
->
line_gap
);
}
static
hb_bool_t
...
...
@@ -245,9 +245,9 @@ hb_ot_get_font_v_extents (hb_font_t *font,
hb_font_extents_t
*
metrics
,
void
*
user_data
HB_UNUSED
)
{
return
hb_ot_metrics_get_position
(
font
,
HB_OT_METRICS_VERTICAL_ASCENDER
,
&
metrics
->
ascender
)
&&
hb_ot_metrics_get_position
(
font
,
HB_OT_METRICS_VERTICAL_DESCENDER
,
&
metrics
->
descender
)
&&
hb_ot_metrics_get_position
(
font
,
HB_OT_METRICS_VERTICAL_LINE_GAP
,
&
metrics
->
line_gap
);
return
hb_ot_metrics_get_position
_common
(
font
,
HB_OT_METRICS_VERTICAL_ASCENDER
,
&
metrics
->
ascender
)
&&
hb_ot_metrics_get_position
_common
(
font
,
HB_OT_METRICS_VERTICAL_DESCENDER
,
&
metrics
->
descender
)
&&
hb_ot_metrics_get_position
_common
(
font
,
HB_OT_METRICS_VERTICAL_LINE_GAP
,
&
metrics
->
line_gap
);
}
#if HB_USE_ATEXIT
...
...
src/hb-ot-metrics.cc
浏览文件 @
772e6268
...
...
@@ -24,8 +24,6 @@
#include "hb.hh"
#ifndef HB_NO_METRICS
#include "hb-ot-var-mvar-table.hh"
#include "hb-ot-gasp-table.hh" // Just so we compile it; unused otherwise.
#include "hb-ot-os2-table.hh"
...
...
@@ -34,6 +32,48 @@
#include "hb-ot-metrics.hh"
#include "hb-ot-face.hh"
/* Common part of _get_position logic needed on hb-ot-font so we
can have a slim builds using HB_NO_METRICS */
bool
hb_ot_metrics_get_position_common
(
hb_font_t
*
font
,
hb_ot_metrics_t
metrics_tag
,
hb_position_t
*
position
/* OUT. May be NULL. */
)
{
hb_face_t
*
face
=
font
->
face
;
switch
((
unsigned
int
)
metrics_tag
)
{
#ifndef HB_NO_VAR
#define GET_VAR hb_ot_metrics_get_variation (face, metrics_tag)
#else
#define GET_VAR 0
#endif
#define GET_METRIC_X(TABLE, ATTR) \
(face->table.TABLE->has_data () && \
(position && (*position = font->em_scalef_x (face->table.TABLE->ATTR + GET_VAR)), true))
#define GET_METRIC_Y(TABLE, ATTR) \
(face->table.TABLE->has_data () && \
(position && (*position = font->em_scalef_y (face->table.TABLE->ATTR + GET_VAR)), true))
case
HB_OT_METRICS_HORIZONTAL_ASCENDER
:
return
(
!
face
->
table
.
OS2
->
use_typo_metrics
()
&&
GET_METRIC_Y
(
hhea
,
ascender
))
||
GET_METRIC_Y
(
OS2
,
sTypoAscender
);
case
HB_OT_METRICS_HORIZONTAL_DESCENDER
:
return
(
!
face
->
table
.
OS2
->
use_typo_metrics
()
&&
GET_METRIC_Y
(
hhea
,
descender
))
||
GET_METRIC_Y
(
OS2
,
sTypoDescender
);
case
HB_OT_METRICS_HORIZONTAL_LINE_GAP
:
return
(
!
face
->
table
.
OS2
->
use_typo_metrics
()
&&
GET_METRIC_Y
(
hhea
,
lineGap
))
||
GET_METRIC_Y
(
OS2
,
sTypoLineGap
);
case
HB_OT_METRICS_VERTICAL_ASCENDER
:
return
GET_METRIC_X
(
vhea
,
ascender
);
case
HB_OT_METRICS_VERTICAL_DESCENDER
:
return
GET_METRIC_X
(
vhea
,
descender
);
case
HB_OT_METRICS_VERTICAL_LINE_GAP
:
return
GET_METRIC_X
(
vhea
,
lineGap
);
#undef GET_METRIC_Y
#undef GET_METRIC_X
#undef GET_VAR
default:
assert
(
0
);
return
false
;
}
}
#ifndef HB_NO_METRICS
#if 0
static bool
_get_gasp (hb_face_t *face, float *result, hb_ot_metrics_t metrics_tag)
...
...
@@ -64,6 +104,12 @@ hb_ot_metrics_get_position (hb_font_t *font,
hb_face_t
*
face
=
font
->
face
;
switch
(
metrics_tag
)
{
case
HB_OT_METRICS_HORIZONTAL_ASCENDER
:
case
HB_OT_METRICS_HORIZONTAL_DESCENDER
:
case
HB_OT_METRICS_HORIZONTAL_LINE_GAP
:
case
HB_OT_METRICS_VERTICAL_ASCENDER
:
case
HB_OT_METRICS_VERTICAL_DESCENDER
:
case
HB_OT_METRICS_VERTICAL_LINE_GAP
:
return
hb_ot_metrics_get_position_common
(
font
,
metrics_tag
,
position
);
#ifndef HB_NO_VAR
#define GET_VAR hb_ot_metrics_get_variation (face, metrics_tag)
#else
...
...
@@ -75,18 +121,6 @@ hb_ot_metrics_get_position (hb_font_t *font,
#define GET_METRIC_Y(TABLE, ATTR) \
(face->table.TABLE->has_data () && \
(position && (*position = font->em_scalef_y (face->table.TABLE->ATTR + GET_VAR)), true))
case
HB_OT_METRICS_HORIZONTAL_ASCENDER
:
return
(
!
face
->
table
.
OS2
->
use_typo_metrics
()
&&
GET_METRIC_Y
(
hhea
,
ascender
))
||
GET_METRIC_Y
(
OS2
,
sTypoAscender
);
case
HB_OT_METRICS_HORIZONTAL_DESCENDER
:
return
(
!
face
->
table
.
OS2
->
use_typo_metrics
()
&&
GET_METRIC_Y
(
hhea
,
descender
))
||
GET_METRIC_Y
(
OS2
,
sTypoDescender
);
case
HB_OT_METRICS_HORIZONTAL_LINE_GAP
:
return
(
!
face
->
table
.
OS2
->
use_typo_metrics
()
&&
GET_METRIC_Y
(
hhea
,
lineGap
))
||
GET_METRIC_Y
(
OS2
,
sTypoLineGap
);
case
HB_OT_METRICS_VERTICAL_ASCENDER
:
return
GET_METRIC_X
(
vhea
,
ascender
);
case
HB_OT_METRICS_VERTICAL_DESCENDER
:
return
GET_METRIC_X
(
vhea
,
descender
);
case
HB_OT_METRICS_VERTICAL_LINE_GAP
:
return
GET_METRIC_X
(
vhea
,
lineGap
);
case
HB_OT_METRICS_HORIZONTAL_CLIPPING_ASCENT
:
return
GET_METRIC_Y
(
OS2
,
usWinAscent
);
case
HB_OT_METRICS_HORIZONTAL_CLIPPING_DESCENT
:
return
GET_METRIC_Y
(
OS2
,
usWinDescent
);
case
HB_OT_METRICS_HORIZONTAL_CARET_RISE
:
return
GET_METRIC_Y
(
hhea
,
caretSlopeRise
);
...
...
src/hb-ot-metrics.hh
浏览文件 @
772e6268
...
...
@@ -27,4 +27,9 @@
#include "hb.hh"
HB_INTERNAL
bool
hb_ot_metrics_get_position_common
(
hb_font_t
*
font
,
hb_ot_metrics_t
metrics_tag
,
hb_position_t
*
position
/* OUT. May be NULL. */
);
#endif
/* HB_OT_METRICS_HH */
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录