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

Revert hhea fallback to OS/2 to its reverse way 

As searching number of hhea having fonts beats the number of OS/2
having ones in macOS 10.14.2
This commit is contained in:
Ebrahim Byagowi 2019-07-20 23:03:51 +04:30 committed by Behdad Esfahbod
parent c13ef9cc64
commit 00e13985fb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,14 +69,14 @@ hb_ot_metrics_get_position_common (hb_font_t *font,
(position && (*position = font->em_scalef_y (_fix_ascender_descender ( \ (position && (*position = font->em_scalef_y (_fix_ascender_descender ( \
face->table.TABLE->ATTR + GET_VAR, metrics_tag))), true)) face->table.TABLE->ATTR + GET_VAR, metrics_tag))), true))
case HB_OT_METRICS_HORIZONTAL_ASCENDER: case HB_OT_METRICS_HORIZONTAL_ASCENDER:
return (!face->table.OS2->use_typo_metrics () && GET_METRIC_Y (hhea, ascender)) || return (face->table.OS2->use_typo_metrics () && GET_METRIC_Y (OS2, sTypoAscender)) ||
GET_METRIC_Y (OS2, sTypoAscender); GET_METRIC_Y (hhea, ascender);
case HB_OT_METRICS_HORIZONTAL_DESCENDER: case HB_OT_METRICS_HORIZONTAL_DESCENDER:
return (!face->table.OS2->use_typo_metrics () && GET_METRIC_Y (hhea, descender)) || return (face->table.OS2->use_typo_metrics () && GET_METRIC_Y (OS2, sTypoDescender)) ||
GET_METRIC_Y (OS2, sTypoDescender); GET_METRIC_Y (hhea, descender);
case HB_OT_METRICS_HORIZONTAL_LINE_GAP: case HB_OT_METRICS_HORIZONTAL_LINE_GAP:
return (!face->table.OS2->use_typo_metrics () && GET_METRIC_Y (hhea, lineGap)) || return (face->table.OS2->use_typo_metrics () && GET_METRIC_Y (OS2, sTypoLineGap)) ||
GET_METRIC_Y (OS2, sTypoLineGap); GET_METRIC_Y (hhea, lineGap);
case HB_OT_METRICS_VERTICAL_ASCENDER: return GET_METRIC_X (vhea, ascender); 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_DESCENDER: return GET_METRIC_X (vhea, descender);
case HB_OT_METRICS_VERTICAL_LINE_GAP: return GET_METRIC_X (vhea, lineGap); case HB_OT_METRICS_VERTICAL_LINE_GAP: return GET_METRIC_X (vhea, lineGap);