From 26b6024962b254b624d4f22088b6c87745074743 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 20 Jul 2011 21:58:14 -0400
Subject: [PATCH] [glib] Use g_unicode_script_to/from_iso15924() if available

---
 src/hb-glib.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/hb-glib.cc b/src/hb-glib.cc
index 7a177e4..6174498 100644
--- a/src/hb-glib.cc
+++ b/src/hb-glib.cc
@@ -36,6 +36,7 @@
 
 HB_BEGIN_DECLS
 
+#if !GLIB_CHECK_VERSION(2,29,14)
 static const hb_script_t
 glib_script_to_script[] =
 {
@@ -148,10 +149,14 @@ glib_script_to_script[] =
   HB_SCRIPT_BRAHMI,
   HB_SCRIPT_MANDAIC
 };
+#endif
 
 hb_script_t
 hb_glib_script_to_script (GUnicodeScript script)
 {
+#if GLIB_CHECK_VERSION(2,29,14)
+  return (hb_script_t) g_unicode_script_to_iso15924 (script);
+#else
   if (likely ((unsigned int) script < ARRAY_LENGTH (glib_script_to_script)))
     return glib_script_to_script[script];
 
@@ -159,11 +164,15 @@ hb_glib_script_to_script (GUnicodeScript script)
     return HB_SCRIPT_INVALID;
 
   return HB_SCRIPT_UNKNOWN;
+#endif
 }
 
 GUnicodeScript
 hb_glib_script_from_script (hb_script_t script)
 {
+#if GLIB_CHECK_VERSION(2,29,14)
+  return g_unicode_script_from_iso15924 (script);
+#else
   unsigned int count = ARRAY_LENGTH (glib_script_to_script);
   for (unsigned int i = 0; i < count; i++)
     if (glib_script_to_script[i] == script)
@@ -173,6 +182,7 @@ hb_glib_script_from_script (hb_script_t script)
     return G_UNICODE_SCRIPT_INVALID_CODE;
 
   return G_UNICODE_SCRIPT_UNKNOWN;
+#endif
 }
 
 
-- 
2.7.4