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

[metrics] Ouch. Fix slant code

This commit is contained in:
Behdad Esfahbod 2022-01-02 11:26:45 -07:00
parent f7d49d9c2b
commit 4ab94443bb
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,15 +174,32 @@ hb_ot_metrics_get_position (hb_font_t *font,
} }
if (metrics_tag == HB_OT_METRICS_TAG_HORIZONTAL_CARET_RISE) if (metrics_tag == HB_OT_METRICS_TAG_HORIZONTAL_CARET_RISE)
return mult * GET_METRIC_Y (hhea, caretSlopeRise); {
bool ret = GET_METRIC_Y (hhea, caretSlopeRise);
if (position)
*position *= mult;
return ret;
}
else else
{ {
unsigned run = mult * GET_METRIC_X (hhea, caretSlopeRun); hb_position_t rise = 0;
if (font->slant) if (font->slant && position && GET_METRIC_Y (hhea, caretSlopeRise))
run += _hb_roundf (mult * GET_METRIC_Y (hhea, caretSlopeRise) * font->slant); rise = *position;
return run; bool ret = GET_METRIC_X (hhea, caretSlopeRun);
if (position)
{
*position *= mult;
if (font->slant)
*position += _hb_roundf (mult * rise * font->slant);
}
return ret;
} }
} }
case HB_OT_METRICS_TAG_HORIZONTAL_CARET_OFFSET: return GET_METRIC_X (hhea, caretOffset); case HB_OT_METRICS_TAG_HORIZONTAL_CARET_OFFSET: return GET_METRIC_X (hhea, caretOffset);