walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[metrics] _-prefix internal symbol

This commit is contained in:
Behdad Esfahbod 2019-07-22 07:48:32 -04:00
parent 89228ccb9a
commit 77141dff7d
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hb-ot-font.cc
View File

@ -234,9 +234,9 @@ hb_ot_get_font_h_extents (hb_font_t *font,
hb_font_extents_t *metrics, hb_font_extents_t *metrics,
void *user_data HB_UNUSED) void *user_data HB_UNUSED)
{ {
return hb_ot_metrics_get_position_common (font, HB_OT_METRICS_HORIZONTAL_ASCENDER, &metrics->ascender) && 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_DESCENDER, &metrics->descender) &&
hb_ot_metrics_get_position_common (font, HB_OT_METRICS_HORIZONTAL_LINE_GAP, &metrics->line_gap); _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_HORIZONTAL_LINE_GAP, &metrics->line_gap);
} }
static hb_bool_t static hb_bool_t
@ -245,9 +245,9 @@ hb_ot_get_font_v_extents (hb_font_t *font,
hb_font_extents_t *metrics, hb_font_extents_t *metrics,
void *user_data HB_UNUSED) void *user_data HB_UNUSED)
{ {
return hb_ot_metrics_get_position_common (font, HB_OT_METRICS_VERTICAL_ASCENDER, &metrics->ascender) && 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_DESCENDER, &metrics->descender) &&
hb_ot_metrics_get_position_common (font, HB_OT_METRICS_VERTICAL_LINE_GAP, &metrics->line_gap); _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_VERTICAL_LINE_GAP, &metrics->line_gap);
} }
#if HB_USE_ATEXIT #if HB_USE_ATEXIT

8
src/hb-ot-metrics.cc
View File

@ -48,9 +48,9 @@ _fix_ascender_descender (float value, hb_ot_metrics_t metrics_tag)
/* The common part of _get_position logic needed on hb-ot-font and here /* The common part of _get_position logic needed on hb-ot-font and here
to be able to have slim builds without the not always needed parts */ to be able to have slim builds without the not always needed parts */
bool bool
hb_ot_metrics_get_position_common (hb_font_t *font, _hb_ot_metrics_get_position_common (hb_font_t *font,
hb_ot_metrics_t metrics_tag, hb_ot_metrics_t metrics_tag,
hb_position_t *position /* OUT. May be NULL. */) hb_position_t *position /* OUT. May be NULL. */)
{ {
hb_face_t *face = font->face; hb_face_t *face = font->face;
switch ((unsigned int) metrics_tag) switch ((unsigned int) metrics_tag)
@ -124,7 +124,7 @@ hb_ot_metrics_get_position (hb_font_t *font,
case HB_OT_METRICS_HORIZONTAL_LINE_GAP: case HB_OT_METRICS_HORIZONTAL_LINE_GAP:
case HB_OT_METRICS_VERTICAL_ASCENDER: case HB_OT_METRICS_VERTICAL_ASCENDER:
case HB_OT_METRICS_VERTICAL_DESCENDER: case HB_OT_METRICS_VERTICAL_DESCENDER:
case HB_OT_METRICS_VERTICAL_LINE_GAP: return hb_ot_metrics_get_position_common (font, metrics_tag, position); case HB_OT_METRICS_VERTICAL_LINE_GAP: return _hb_ot_metrics_get_position_common (font, metrics_tag, position);
#ifndef HB_NO_VAR #ifndef HB_NO_VAR
#define GET_VAR hb_ot_metrics_get_variation (face, metrics_tag) #define GET_VAR hb_ot_metrics_get_variation (face, metrics_tag)
#else #else

6
src/hb-ot-metrics.hh
View File

@ -28,8 +28,8 @@
#include "hb.hh" #include "hb.hh"
HB_INTERNAL bool HB_INTERNAL bool
hb_ot_metrics_get_position_common (hb_font_t *font, _hb_ot_metrics_get_position_common (hb_font_t *font,
hb_ot_metrics_t metrics_tag, hb_ot_metrics_t metrics_tag,
hb_position_t *position /* OUT. May be NULL. */); hb_position_t *position /* OUT. May be NULL. */);
#endif /* HB_OT_METRICS_HH */ #endif /* HB_OT_METRICS_HH */