From 5d4ccae966eef90a48d6e838a475bcf0c9c6122f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 15 Feb 2022 17:49:58 -0600 Subject: Use newer harfbuzz api Use pango_ot_metrics_get_position_with_fallback, where appropriate. --- pango/pango-layout.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'pango/pango-layout.c') diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 9167883c..062be57a 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -6627,17 +6627,12 @@ collect_baseline_shift (ParaBreakState *state, if (prev) { hb_font_t *hb_font = pango_font_get_hb_font (prev->analysis.font); - hb_ot_metrics_get_position (hb_font, HB_OT_METRICS_TAG_SUPERSCRIPT_EM_Y_OFFSET, &superscript_y_offset); - hb_ot_metrics_get_position (hb_font, HB_OT_METRICS_TAG_SUPERSCRIPT_EM_X_OFFSET, &superscript_x_offset); - hb_ot_metrics_get_position (hb_font, HB_OT_METRICS_TAG_SUBSCRIPT_EM_Y_OFFSET, &subscript_y_offset); - hb_ot_metrics_get_position (hb_font, HB_OT_METRICS_TAG_SUBSCRIPT_EM_X_OFFSET, &subscript_x_offset); + hb_ot_metrics_get_position_with_fallback (hb_font, HB_OT_METRICS_TAG_SUPERSCRIPT_EM_Y_OFFSET, &superscript_y_offset); + hb_ot_metrics_get_position_with_fallback (hb_font, HB_OT_METRICS_TAG_SUPERSCRIPT_EM_X_OFFSET, &superscript_x_offset); + hb_ot_metrics_get_position_with_fallback (hb_font, HB_OT_METRICS_TAG_SUBSCRIPT_EM_Y_OFFSET, &subscript_y_offset); + hb_ot_metrics_get_position_with_fallback (hb_font, HB_OT_METRICS_TAG_SUBSCRIPT_EM_X_OFFSET, &subscript_x_offset); } - if (superscript_y_offset == 0) - superscript_y_offset = 5000; - if (subscript_y_offset == 0) - subscript_y_offset = 5000; - switch (value) { case PANGO_BASELINE_SHIFT_NONE: -- cgit v1.2.1