diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-10-31 01:50:21 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-10-31 01:50:21 +0000 |
commit | 7c710faa1edd58109c4ac1972ae5aca10f1be87f (patch) | |
tree | 4abd52c5ccda75dea45d82965b5d244dfd868ab7 /pango/pangocairo-fcfont.c | |
parent | f33cbe522dbb5ccfff9e70ef108061813ed61cb8 (diff) | |
parent | ab776f328ba3540f6607ea0a9bc72a57b607b9ac (diff) | |
download | pango-7c710faa1edd58109c4ac1972ae5aca10f1be87f.tar.gz |
Merge branch 'glyph-extents-fixes' into 'main'
cairo: Produce meaningful logical glyph extents
See merge request GNOME/pango!490
Diffstat (limited to 'pango/pangocairo-fcfont.c')
-rw-r--r-- | pango/pangocairo-fcfont.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c index 85cc45c8..4453b5ab 100644 --- a/pango/pangocairo-fcfont.c +++ b/pango/pangocairo-fcfont.c @@ -75,14 +75,13 @@ static PangoFontMetrics * pango_cairo_fc_font_create_base_metrics_for_context (PangoCairoFont *cfont, PangoContext *context) { - PangoFcFont *fcfont = (PangoFcFont *) (cfont); + PangoCairoFcFont *cffont = (PangoCairoFcFont *) cfont; + PangoFcFont *fcfont = (PangoFcFont *) cfont; PangoFontMetrics *metrics; - const cairo_font_options_t *options; metrics = pango_fc_font_create_base_metrics_for_context (fcfont, context); - options = pango_cairo_context_get_font_options (context); - if (cairo_font_options_get_hint_metrics (options) == CAIRO_HINT_METRICS_ON) + if (_pango_cairo_font_private_is_metrics_hinted (&cffont->cf_priv)) { metrics->ascent = PANGO_PIXELS_CEIL (metrics->ascent) * PANGO_SCALE; metrics->descent = PANGO_PIXELS_CEIL (metrics->descent) * PANGO_SCALE; |