diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-08-10 20:52:03 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-08-10 20:52:03 +0000 |
| commit | 1f74d46424f493e9c8ff699688e1ce89f466fd72 (patch) | |
| tree | f9ed40d2a134b255ec85f8d4b52677f943336a27 | |
| parent | edc668df3d01296d5e281bdeff70a823e20d95d9 (diff) | |
| parent | d835004502c801a8a16cc436a38900e548ecde52 (diff) | |
| download | pango-1f74d46424f493e9c8ff699688e1ce89f466fd72.tar.gz | |
Merge branch 'master' into 'master'
Use latest version of metrics naming in pangofc-font
See merge request GNOME/pango!128
| -rw-r--r-- | pango/pangofc-font.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index 98e77288..21644b57 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -365,16 +365,16 @@ get_face_metrics (PangoFcFont *fcfont, #if HB_VERSION_ATLEAST(2,5,4) hb_position_t position; - if (hb_ot_metrics_get_position (hb_font, HB_OT_METRICS_UNDERLINE_SIZE, &position)) + if (hb_ot_metrics_get_position (hb_font, HB_OT_METRICS_TAG_UNDERLINE_SIZE, &position)) metrics->underline_thickness = position; - if (hb_ot_metrics_get_position (hb_font, HB_OT_METRICS_UNDERLINE_OFFSET, &position)) + if (hb_ot_metrics_get_position (hb_font, HB_OT_METRICS_TAG_UNDERLINE_OFFSET, &position)) metrics->underline_position = position; - if (hb_ot_metrics_get_position (hb_font, HB_OT_METRICS_STRIKEOUT_SIZE, &position)) + if (hb_ot_metrics_get_position (hb_font, HB_OT_METRICS_TAG_STRIKEOUT_SIZE, &position)) metrics->strikethrough_thickness = position; - if (hb_ot_metrics_get_position (hb_font, HB_OT_METRICS_STRIKEOUT_OFFSET, &position)) + if (hb_ot_metrics_get_position (hb_font, HB_OT_METRICS_TAG_STRIKEOUT_OFFSET, &position)) metrics->strikethrough_position = position; #endif } |