diff options
| author | Adrian Johnson <ajohnson@redneon.com> | 2023-03-07 19:22:04 +0000 |
|---|---|---|
| committer | Adrian Johnson <ajohnson@redneon.com> | 2023-03-07 19:22:04 +0000 |
| commit | d4d027d35362c3e5c0b30d0db5a6aaaae2ccd354 (patch) | |
| tree | 584485d9c8de81921d1ada172cc9c9dd031e799c | |
| parent | af5a25a7f19e8fe6242c50f17bd246f98b6fdf87 (diff) | |
| parent | 2766d9feeccd5d66e346b0abab38726b8e0aa1e9 (diff) | |
| download | cairo-d4d027d35362c3e5c0b30d0db5a6aaaae2ccd354.tar.gz | |
Merge branch 'issue-643' into 'master'
Fix missing glyphs in ft-font
Closes #643
See merge request cairo/cairo!467
| -rw-r--r-- | src/cairo-ft-font.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c index 22a6a622b..89af6193d 100644 --- a/src/cairo-ft-font.c +++ b/src/cairo-ft-font.c @@ -3314,11 +3314,13 @@ _cairo_ft_scaled_glyph_init_metrics (cairo_ft_scaled_font_t *scaled_font, if (scaled_font->unscaled->have_color && scaled_font->base.options.color_mode != CAIRO_COLOR_MODE_NO_COLOR) color_flag = FT_LOAD_COLOR; #endif + /* Ensure use_em_size = FALSE as the format (bitmap or outline) + * may change with the size. */ status = _cairo_ft_scaled_glyph_load_glyph (scaled_font, scaled_glyph, face, load_flags | color_flag, - !hint_metrics, + FALSE, vertical_layout); if (unlikely (status)) return status; @@ -3344,6 +3346,18 @@ _cairo_ft_scaled_glyph_init_metrics (cairo_ft_scaled_font_t *scaled_font, glyph_priv->format = CAIRO_FT_GLYPH_TYPE_BITMAP; } + /* If hinting is off, load the glyph with font size set the the em size. */ + if (!hint_metrics) { + status = _cairo_ft_scaled_glyph_load_glyph (scaled_font, + scaled_glyph, + face, + load_flags | color_flag, + TRUE, + vertical_layout); + if (unlikely (status)) + return status; + } + _cairo_ft_scaled_glyph_get_metrics (scaled_font, face, vertical_layout, @@ -3369,6 +3383,7 @@ _cairo_ft_scaled_glyph_init_metrics (cairo_ft_scaled_font_t *scaled_font, } if (glyph_priv->format == CAIRO_FT_GLYPH_TYPE_COLR_V1) { + /* Restore font size if previously loaded at em_size. */ if (!hint_metrics) { status = _cairo_ft_scaled_glyph_load_glyph (scaled_font, scaled_glyph, |