From 230adf2c417bbb6b5f367eb857dd6f98bea3ef26 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 19 Jun 2019 18:49:52 -0700
Subject: [PATCH] [config] Add HB_NO_OT_FONT_GLYPH_NAMES

Part of https://github.com/harfbuzz/harfbuzz/issues/1652
---
 src/hb-config.hh             | 1 +
 src/hb-ot-face-table-list.hh | 4 +++-
 src/hb-ot-font.cc            | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/hb-config.hh b/src/hb-config.hh
index 3aa48b4..3f9a9ca 100644
--- a/src/hb-config.hh
+++ b/src/hb-config.hh
@@ -58,6 +58,7 @@
 #define HB_NO_CFF
 #define HB_NO_COLOR
 #define HB_NO_GETENV
+#define HB_NO_OT_FONT_GLYPH_NAMES
 #define HB_NO_LANGUAGE_PRIVATE_SUBTAG
 #define HB_NO_LAYOUT_UNUSED
 #define HB_NO_MATH
diff --git a/src/hb-ot-face-table-list.hh b/src/hb-ot-face-table-list.hh
index 4e73db5..348c3b2 100644
--- a/src/hb-ot-face-table-list.hh
+++ b/src/hb-ot-face-table-list.hh
@@ -49,8 +49,10 @@
 HB_OT_TABLE (OT, head)
 HB_OT_ACCELERATOR (OT, cmap)
 HB_OT_ACCELERATOR (OT, hmtx)
-HB_OT_ACCELERATOR (OT, post)
 HB_OT_TABLE (OT, OS2)
+#ifndef HB_NO_OT_FONT_GLYPH_NAMES
+HB_OT_ACCELERATOR (OT, post)
+#endif
 #ifndef HB_NO_NAME
 HB_OT_ACCELERATOR (OT, name)
 #endif
diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index 5895c7b..999bfac 100644
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -205,6 +205,7 @@ hb_ot_get_glyph_extents (hb_font_t *font,
   return ret;
 }
 
+#ifndef HB_NO_OT_FONT_GLYPH_NAMES
 static hb_bool_t
 hb_ot_get_glyph_name (hb_font_t *font HB_UNUSED,
                       void *font_data,
@@ -215,7 +216,6 @@ hb_ot_get_glyph_name (hb_font_t *font HB_UNUSED,
   const hb_ot_face_t *ot_face = (const hb_ot_face_t *) font_data;
   return ot_face->post->get_glyph_name (glyph, name, size);
 }
-
 static hb_bool_t
 hb_ot_get_glyph_from_name (hb_font_t *font HB_UNUSED,
                            void *font_data,
@@ -226,6 +226,7 @@ hb_ot_get_glyph_from_name (hb_font_t *font HB_UNUSED,
   const hb_ot_face_t *ot_face = (const hb_ot_face_t *) font_data;
   return ot_face->post->get_glyph_from_name (name, len, glyph);
 }
+#endif
 
 static hb_bool_t
 hb_ot_get_font_h_extents (hb_font_t *font,
@@ -278,8 +279,10 @@ static struct hb_ot_font_funcs_lazy_loader_t : hb_font_funcs_lazy_loader_t<hb_ot
     hb_font_funcs_set_glyph_v_origin_func (funcs, hb_ot_get_glyph_v_origin, nullptr, nullptr);
     hb_font_funcs_set_glyph_extents_func (funcs, hb_ot_get_glyph_extents, nullptr, nullptr);
     //hb_font_funcs_set_glyph_contour_point_func (funcs, hb_ot_get_glyph_contour_point, nullptr, nullptr);
+#ifndef HB_NO_OT_FONT_GLYPH_NAMES
     hb_font_funcs_set_glyph_name_func (funcs, hb_ot_get_glyph_name, nullptr, nullptr);
     hb_font_funcs_set_glyph_from_name_func (funcs, hb_ot_get_glyph_from_name, nullptr, nullptr);
+#endif
 
     hb_font_funcs_make_immutable (funcs);
 
-- 
2.7.4