[config] HB_NO_OT_NAME_LANGUAGE AAT

diff --git a/src/hb-config.hh b/src/hb-config.hh
index 09f7115..40a0bae 100644 (file)
--- a/src/hb-config.hh
+++ b/src/hb-config.hh
@@ -49,7 +49,7 @@
 #define HB_NO_COLOR
 #define HB_NO_GETENV
 #define HB_NO_MATH
-#define HB_NO_NAME_TABLE_AAT
+#define HB_NO_OT_NAME_LANGUAGE
 #define HB_NO_OT_LAYOUT_UNUSED
 #endif
 
@@ -67,7 +67,7 @@
 #endif
 
 #ifdef HB_NO_AAT
-#define HB_NO_NAME_TABLE_AAT
+#define HB_NO_OT_NAME_LANGUAGE_AAT
 #define HB_NO_SHAPE_AAT
 #endif
 

diff --git a/src/hb-ot-name-language-static.hh b/src/hb-ot-name-language-static.hh
index fac3178..580e763 100644 (file)
--- a/src/hb-ot-name-language-static.hh
+++ b/src/hb-ot-name-language-static.hh
@@ -430,6 +430,9 @@ _hb_ot_name_language_for (unsigned int code,
                          const hb_ot_language_map_t *array,
                          unsigned int len)
 {
+#ifdef HB_NO_OT_NAME_LANGUAGE
+  return HB_LANGUAGE_INVALID;
+#endif
   const hb_ot_language_map_t *entry = (const hb_ot_language_map_t *)
                                      hb_bsearch (&code,
                                                  array,

diff --git a/src/hb-ot-name-table.hh b/src/hb-ot-name-table.hh
index e7e32ec..332f485 100644 (file)
--- a/src/hb-ot-name-table.hh
+++ b/src/hb-ot-name-table.hh
@@ -51,6 +51,7 @@ struct NameRecord
 {
   hb_language_t language (hb_face_t *face) const
   {
+#ifndef HB_NO_OT_NAME_LANGUAGE
     unsigned int p = platformID;
     unsigned int l = languageID;
 
@@ -60,11 +61,12 @@ struct NameRecord
     if (p == 1)
       return _hb_ot_name_language_for_mac_code (l);
 
-#ifndef HB_NO_NAME_TABLE_AAT
+#ifndef HB_NO_OT_NAME_LANGUAGE_AAT
     if (p == 0)
       return _hb_aat_language_get (face, l);
 #endif
 
+#endif
     return HB_LANGUAGE_INVALID;
   }