From e509d35cf1160f1449bc736b9445cdf61ab81d06 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 11 Jul 2013 14:56:45 -0400 Subject: [PATCH] [ft] hb_ft_get_glyph_from_name fails for the name of glyph id 0 Based on patch from Jonathan Kew, as reported on the mailing list. --- src/hb-ft.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/hb-ft.cc b/src/hb-ft.cc index d63eba2f0..a4f4bbdc0 100644 --- a/src/hb-ft.cc +++ b/src/hb-ft.cc @@ -260,6 +260,15 @@ hb_ft_get_glyph_from_name (hb_font_t *font HB_UNUSED, *glyph = FT_Get_Name_Index (ft_face, buf); } + if (*glyph == 0) + { + /* Check whether the given name was actually the name of glyph 0. */ + char buf[128]; + if (!FT_Get_Glyph_Name(ft_face, 0, buf, sizeof (buf)) && + len < 0 ? !strcmp (buf, name) : !strncmp (buf, name, len)) + return true; + } + return *glyph != 0; }