commit bce095524b3e69a47f8e88a2fb02d6ab537f9b0a
author Behdad Esfahbod <behdad@behdad.org> Sun May 27 11:29:21 2012 -0400
committer Behdad Esfahbod <behdad@behdad.org> Mon May 28 10:45:50 2012 -0400
tree 599dc65b264d26037ff9d79b8fabdd563a011257
parent bc145658bdaeaeea0cdbd719e2756f09a2dbfb48

Add hb_font_get_glyph_name() and hb_font_get_glyph_from_name()

util/options.cc

diff --git a/util/options.cc b/util/options.cc
index 463daee..c404b8a 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -725,8 +725,6 @@
 				    hb_bool_t    utf8_clusters,
 				    GString     *gs)
 {
-  FT_Face ft_face = show_glyph_names ? hb_ft_font_get_face (font) : NULL;
-
   unsigned int num_glyphs = hb_buffer_get_length (buffer);
   hb_glyph_info_t *info = hb_buffer_get_glyph_infos (buffer, NULL);
   hb_glyph_position_t *pos = hb_buffer_get_glyph_positions (buffer, NULL);
@@ -737,12 +735,10 @@
     if (i)
       g_string_append_c (gs, '|');
 
-    char glyph_name[30];
+    char glyph_name[32];
     if (show_glyph_names) {
-      if (!FT_Get_Glyph_Name (ft_face, info->codepoint, glyph_name, sizeof (glyph_name)))
-	g_string_append_printf (gs, "%s", glyph_name);
-      else
-	g_string_append_printf (gs, "gid%u", info->codepoint);
+      hb_font_get_glyph_name (font, info->codepoint, glyph_name, sizeof (glyph_name));
+      g_string_append_printf (gs, "%s", glyph_name);
     } else
       g_string_append_printf (gs, "%u", info->codepoint);