summaryrefslogtreecommitdiff
path: root/src/ftcrfont.c
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>2022-09-23 14:17:12 +0900
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>2022-09-23 14:17:49 +0900
commit60ac12d21f9b5a97c33efc639c8204c39367292b (patch)
treee210a86bdc5462977c54de3880827e5d27c60c9c /src/ftcrfont.c
parent9f65e523623be48016a1ae9b72d9b1e1a827d1c6 (diff)
downloademacs-60ac12d21f9b5a97c33efc639c8204c39367292b.tar.gz
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.
Diffstat (limited to 'src/ftcrfont.c')
-rw-r--r--src/ftcrfont.c8
1 files 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;