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

Fix vertical font metrics 

Ouch!
This commit is contained in:
Behdad Esfahbod 2016-10-26 17:19:07 +02:00
parent 966ac7ecd3
commit b3b0816d5f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-font-private.hh
View File

@ -303,14 +303,14 @@ struct hb_font_t {
if (!get_font_h_extents (extents)) if (!get_font_h_extents (extents))
{ {
extents->ascender = y_scale * .8; extents->ascender = y_scale * .8;
extents->descender = y_scale - extents->ascender; extents->descender = extents->ascender - y_scale;
extents->line_gap = 0; extents->line_gap = 0;
} }
} else { } else {
if (!get_font_v_extents (extents)) if (!get_font_v_extents (extents))
{ {
extents->ascender = x_scale / 2; extents->ascender = x_scale / 2;
extents->descender = x_scale - extents->ascender; extents->descender = extents->ascender - x_scale;
extents->line_gap = 0; extents->line_gap = 0;
} }
} }

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

@ -47,6 +47,7 @@ struct hb_ot_face_metrics_accelerator_t
unsigned short ascender; unsigned short ascender;
unsigned short descender; unsigned short descender;
unsigned short line_gap; unsigned short line_gap;
bool has_font_extents;
const OT::_mtx *table; const OT::_mtx *table;
hb_blob_t *blob; hb_blob_t *blob;
@ -82,9 +83,12 @@ struct hb_ot_face_metrics_accelerator_t
this->ascender = _hea->ascender; this->ascender = _hea->ascender;
this->descender = _hea->descender; this->descender = _hea->descender;
this->line_gap = _hea->lineGap; this->line_gap = _hea->lineGap;
got_font_extents = (this->ascender | this->descender) != 0;
} }
hb_blob_destroy (_hea_blob); hb_blob_destroy (_hea_blob);
this->has_font_extents = got_font_extents;
this->blob = OT::Sanitizer<OT::_mtx>::sanitize (face->reference_table (_mtx_tag)); this->blob = OT::Sanitizer<OT::_mtx>::sanitize (face->reference_table (_mtx_tag));
/* Cap num_metrics() and num_advances() based on table length. */ /* Cap num_metrics() and num_advances() based on table length. */
@ -475,7 +479,7 @@ hb_ot_get_font_h_extents (hb_font_t *font HB_UNUSED,
metrics->ascender = font->em_scale_y (ot_font->h_metrics.ascender); metrics->ascender = font->em_scale_y (ot_font->h_metrics.ascender);
metrics->descender = font->em_scale_y (ot_font->h_metrics.descender); metrics->descender = font->em_scale_y (ot_font->h_metrics.descender);
metrics->line_gap = font->em_scale_y (ot_font->h_metrics.line_gap); metrics->line_gap = font->em_scale_y (ot_font->h_metrics.line_gap);
return true; return ot_font->h_metrics.has_font_extents;
} }
static hb_bool_t static hb_bool_t
@ -488,7 +492,7 @@ hb_ot_get_font_v_extents (hb_font_t *font HB_UNUSED,
metrics->ascender = font->em_scale_x (ot_font->v_metrics.ascender); metrics->ascender = font->em_scale_x (ot_font->v_metrics.ascender);
metrics->descender = font->em_scale_x (ot_font->v_metrics.descender); metrics->descender = font->em_scale_x (ot_font->v_metrics.descender);
metrics->line_gap = font->em_scale_x (ot_font->v_metrics.line_gap); metrics->line_gap = font->em_scale_x (ot_font->v_metrics.line_gap);
return true; return ot_font->v_metrics.has_font_extents;
} }
static hb_font_funcs_t *static_ot_funcs = NULL; static hb_font_funcs_t *static_ot_funcs = NULL;