From 60ac12d21f9b5a97c33efc639c8204c39367292b Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Fri, 23 Sep 2022 14:17:12 +0900 Subject: [PATCH] Fix shaping with bitmap-only fonts on HarfBuzz 5.2.0 (Bug#57976) * src/ftcrfont.c (ftcrhbfont_begin_hb_font): Undo last change for HarfBuzz 5.2.0. --- src/ftcrfont.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ftcrfont.c b/src/ftcrfont.c index d5d3e440af6..97b68ac0137 100644 --- a/src/ftcrfont.c +++ b/src/ftcrfont.c @@ -570,8 +570,12 @@ ftcrhbfont_begin_hb_font (struct font *font, double *position_unit) hb_font_t *hb_font = fthbfont_begin_hb_font (font, position_unit); /* HarfBuzz 5 correctly scales bitmap-only fonts without position unit adjustment. - (https://github.com/harfbuzz/harfbuzz/issues/489) */ - if (!hb_version_atleast (5, 0, 0) + (https://github.com/harfbuzz/harfbuzz/issues/489) + + Update: HarfBuzz 5.2.0 no longer does this for an hb_font_t font + object created from a given FT_Face. + (https://github.com/harfbuzz/harfbuzz/issues/3788) */ + if ((hb_version_atleast (5, 2, 0) || !hb_version_atleast (5, 0, 0)) && ftcrfont_info->bitmap_position_unit) *position_unit = ftcrfont_info->bitmap_position_unit; -- 2.39.2