From bf28a372ab6aad2d18e0417ac85a4aad14e4a9d7 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Tue, 28 Mar 2023 16:34:50 +0800 Subject: [PATCH] Update Android port * src/sfnt.c (sfnt_vary_simple_glyph, sfnt_vary_compound_glyph): Fix application of intermediate tuples. * src/sfntfont.c (sfntfont_open): Set xlfd name after applying distortion. --- src/sfnt.c | 4 ++-- src/sfntfont.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sfnt.c b/src/sfnt.c index 2762f3df457..d2d3500a18d 100644 --- a/src/sfnt.c +++ b/src/sfnt.c @@ -14331,7 +14331,7 @@ sfnt_vary_simple_glyph (struct sfnt_blend *blend, sfnt_glyph id, /* See whether or not the tuple applies to the current variation configuration, and how much to scale them by. */ - scale = sfnt_compute_tuple_scale (blend, index & 0x1000, + scale = sfnt_compute_tuple_scale (blend, index & 0x4000, coords, intermediate_start, intermediate_end); @@ -14705,7 +14705,7 @@ sfnt_vary_compound_glyph (struct sfnt_blend *blend, sfnt_glyph id, /* See whether or not the tuple applies to the current variation configuration, and how much to scale them by. */ - scale = sfnt_compute_tuple_scale (blend, index & 0x1000, + scale = sfnt_compute_tuple_scale (blend, index & 0x4000, coords, intermediate_start, intermediate_end); diff --git a/src/sfntfont.c b/src/sfntfont.c index f9965ef13f1..daf8f54c03c 100644 --- a/src/sfntfont.c +++ b/src/sfntfont.c @@ -3045,9 +3045,6 @@ sfntfont_open (struct frame *f, Lisp_Object font_entity, font_info->font.underline_position = -1; font_info->font.underline_thickness = 0; - /* Calculate the xfld name. */ - font->props[FONT_NAME_INDEX] = Ffont_xlfd_name (font_object, Qnil); - /* Now try to set up grid fitting for this font. */ dpyinfo = FRAME_DISPLAY_INFO (f); point_size = PIXEL_TO_POINT (pixel_size, (dpyinfo->resx @@ -3099,6 +3096,9 @@ sfntfont_open (struct frame *f, Lisp_Object font_entity, } } + /* Calculate the xfld name. */ + font->props[FONT_NAME_INDEX] = Ffont_xlfd_name (font_object, Qnil); + #ifdef HAVE_HARFBUZZ /* HarfBuzz will potentially read font tables after the font has been opened by Emacs. Keep the font open, and record its offset -- 2.39.2