[ft] Guard FT_LOAD_NO_SVG

Also pass FT_LOAD_NO_BITMAP.
pull/4939/head
Behdad Esfahbod 3 months ago
parent 965790764a
commit d759ee5a8d
  1. 8
      src/hb-ft.cc

@ -931,11 +931,15 @@ hb_ft_paint_glyph (hb_font_t *font,
hb_lock_t lock (ft_font->lock); hb_lock_t lock (ft_font->lock);
FT_Face ft_face = ft_font->ft_face; FT_Face ft_face = ft_font->ft_face;
FT_Long load_flags = ft_font->load_flags | FT_LOAD_NO_BITMAP | FT_LOAD_COLOR;
#if (FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) >= 21301
load_flags |= FT_LOAD_NO_SVG;
#endif
/* We release the lock before calling into glyph callbacks, such that /* We release the lock before calling into glyph callbacks, such that
* eg. draw API can call back into the face.*/ * eg. draw API can call back into the face.*/
if (unlikely (FT_Load_Glyph (ft_face, gid, if (unlikely (FT_Load_Glyph (ft_face, gid, load_flags)))
ft_font->load_flags | FT_LOAD_COLOR | FT_LOAD_NO_SVG)))
return; return;
if (ft_face->glyph->format == FT_GLYPH_FORMAT_OUTLINE) if (ft_face->glyph->format == FT_GLYPH_FORMAT_OUTLINE)

Loading…
Cancel
Save