diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-11-17 00:40:08 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-11-17 00:40:08 +0000 |
| commit | 7c3378594b362ec744e7f96e889b45775d13ee26 (patch) | |
| tree | 1518bc336718b64e730770795413ab6bb61072e8 | |
| parent | ac8f01fe00b57c511c1caf8dcef01bff249ea8f9 (diff) | |
| parent | b3dd3103eff027344413af1b8572d906c79a6868 (diff) | |
| download | pango-7c3378594b362ec744e7f96e889b45775d13ee26.tar.gz | |
Merge branch 'matthiasc/for-main' into 'main'
build: Bump the harfbuzz req
See merge request GNOME/pango!511
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | pango/pangofc-font.c | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/meson.build b/meson.build index 3caec030..37bcf6cb 100644 --- a/meson.build +++ b/meson.build @@ -228,7 +228,7 @@ pango_deps = [] glib_req_version = '>= 2.62' fribidi_req_version = '>= 1.0.6' libthai_req_version = '>= 0.1.9' -harfbuzz_req_version = '>= 2.2.0' +harfbuzz_req_version = '>= 2.6.0' fontconfig_req_version = '>= 2.13.0' xft_req_version = '>= 2.0.0' cairo_req_version = '>= 1.12.10' diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index bcb14d7d..74503b91 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -331,10 +331,11 @@ pango_fc_font_get_coverage (PangoFont *font, */ static void get_face_metrics (PangoFcFont *fcfont, - PangoFontMetrics *metrics) + PangoFontMetrics *metrics) { hb_font_t *hb_font = pango_font_get_hb_font (PANGO_FONT (fcfont)); hb_font_extents_t extents; + hb_position_t position; FcMatrix *fc_matrix; gboolean have_transform = FALSE; @@ -342,10 +343,10 @@ get_face_metrics (PangoFcFont *fcfont, hb_font_get_extents_for_direction (hb_font, HB_DIRECTION_LTR, &extents); if (FcPatternGetMatrix (fcfont->font_pattern, - FC_MATRIX, 0, &fc_matrix) == FcResultMatch) + FC_MATRIX, 0, &fc_matrix) == FcResultMatch) { have_transform = (fc_matrix->xx != 1 || fc_matrix->xy != 0 || - fc_matrix->yx != 0 || fc_matrix->yy != 1); + fc_matrix->yx != 0 || fc_matrix->yy != 1); } if (have_transform) @@ -366,10 +367,6 @@ get_face_metrics (PangoFcFont *fcfont, metrics->strikethrough_thickness = PANGO_SCALE; metrics->strikethrough_position = metrics->ascent / 2; - /* FIXME: use the right hb version */ -#if HB_VERSION_ATLEAST(2,5,4) - hb_position_t position; - if (hb_ot_metrics_get_position (hb_font, HB_OT_METRICS_TAG_UNDERLINE_SIZE, &position)) metrics->underline_thickness = position; @@ -381,7 +378,6 @@ get_face_metrics (PangoFcFont *fcfont, if (hb_ot_metrics_get_position (hb_font, HB_OT_METRICS_TAG_STRIKEOUT_OFFSET, &position)) metrics->strikethrough_position = position; -#endif } PangoFontMetrics * |