Fix compiler warnings with -pedantic
[framework/uifw/harfbuzz.git] / src / hb-glib.cc
index 5bebf5e..109b9ba 100644 (file)
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2009  Red Hat, Inc.
+ * Copyright © 2009  Red Hat, Inc.
+ * Copyright © 2011  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  * Red Hat Author(s): Behdad Esfahbod
+ * Google Author(s): Behdad Esfahbod
  */
 
-#include "hb-private.h"
+#include "hb-private.hh"
 
 #include "hb-glib.h"
 
 
 HB_BEGIN_DECLS
 
+static const hb_script_t
+glib_script_to_script[] =
+{
+  HB_SCRIPT_COMMON,
+  HB_SCRIPT_INHERITED,
+  HB_SCRIPT_ARABIC,
+  HB_SCRIPT_ARMENIAN,
+  HB_SCRIPT_BENGALI,
+  HB_SCRIPT_BOPOMOFO,
+  HB_SCRIPT_CHEROKEE,
+  HB_SCRIPT_COPTIC,
+  HB_SCRIPT_CYRILLIC,
+  HB_SCRIPT_DESERET,
+  HB_SCRIPT_DEVANAGARI,
+  HB_SCRIPT_ETHIOPIC,
+  HB_SCRIPT_GEORGIAN,
+  HB_SCRIPT_GOTHIC,
+  HB_SCRIPT_GREEK,
+  HB_SCRIPT_GUJARATI,
+  HB_SCRIPT_GURMUKHI,
+  HB_SCRIPT_HAN,
+  HB_SCRIPT_HANGUL,
+  HB_SCRIPT_HEBREW,
+  HB_SCRIPT_HIRAGANA,
+  HB_SCRIPT_KANNADA,
+  HB_SCRIPT_KATAKANA,
+  HB_SCRIPT_KHMER,
+  HB_SCRIPT_LAO,
+  HB_SCRIPT_LATIN,
+  HB_SCRIPT_MALAYALAM,
+  HB_SCRIPT_MONGOLIAN,
+  HB_SCRIPT_MYANMAR,
+  HB_SCRIPT_OGHAM,
+  HB_SCRIPT_OLD_ITALIC,
+  HB_SCRIPT_ORIYA,
+  HB_SCRIPT_RUNIC,
+  HB_SCRIPT_SINHALA,
+  HB_SCRIPT_SYRIAC,
+  HB_SCRIPT_TAMIL,
+  HB_SCRIPT_TELUGU,
+  HB_SCRIPT_THAANA,
+  HB_SCRIPT_THAI,
+  HB_SCRIPT_TIBETAN,
+  HB_SCRIPT_CANADIAN_ABORIGINAL,
+  HB_SCRIPT_YI,
+  HB_SCRIPT_TAGALOG,
+  HB_SCRIPT_HANUNOO,
+  HB_SCRIPT_BUHID,
+  HB_SCRIPT_TAGBANWA,
+
+  /* Unicode-4.0 additions */
+  HB_SCRIPT_BRAILLE,
+  HB_SCRIPT_CYPRIOT,
+  HB_SCRIPT_LIMBU,
+  HB_SCRIPT_OSMANYA,
+  HB_SCRIPT_SHAVIAN,
+  HB_SCRIPT_LINEAR_B,
+  HB_SCRIPT_TAI_LE,
+  HB_SCRIPT_UGARITIC,
+
+  /* Unicode-4.1 additions */
+  HB_SCRIPT_NEW_TAI_LUE,
+  HB_SCRIPT_BUGINESE,
+  HB_SCRIPT_GLAGOLITIC,
+  HB_SCRIPT_TIFINAGH,
+  HB_SCRIPT_SYLOTI_NAGRI,
+  HB_SCRIPT_OLD_PERSIAN,
+  HB_SCRIPT_KHAROSHTHI,
+
+  /* Unicode-5.0 additions */
+  HB_SCRIPT_UNKNOWN,
+  HB_SCRIPT_BALINESE,
+  HB_SCRIPT_CUNEIFORM,
+  HB_SCRIPT_PHOENICIAN,
+  HB_SCRIPT_PHAGS_PA,
+  HB_SCRIPT_NKO,
+
+  /* Unicode-5.1 additions */
+  HB_SCRIPT_KAYAH_LI,
+  HB_SCRIPT_LEPCHA,
+  HB_SCRIPT_REJANG,
+  HB_SCRIPT_SUNDANESE,
+  HB_SCRIPT_SAURASHTRA,
+  HB_SCRIPT_CHAM,
+  HB_SCRIPT_OL_CHIKI,
+  HB_SCRIPT_VAI,
+  HB_SCRIPT_CARIAN,
+  HB_SCRIPT_LYCIAN,
+  HB_SCRIPT_LYDIAN,
+
+  /* Unicode-5.2 additions */
+  HB_SCRIPT_AVESTAN,
+  HB_SCRIPT_BAMUM,
+  HB_SCRIPT_EGYPTIAN_HIEROGLYPHS,
+  HB_SCRIPT_IMPERIAL_ARAMAIC,
+  HB_SCRIPT_INSCRIPTIONAL_PAHLAVI,
+  HB_SCRIPT_INSCRIPTIONAL_PARTHIAN,
+  HB_SCRIPT_JAVANESE,
+  HB_SCRIPT_KAITHI,
+  HB_SCRIPT_TAI_THAM,
+  HB_SCRIPT_LISU,
+  HB_SCRIPT_MEETEI_MAYEK,
+  HB_SCRIPT_OLD_SOUTH_ARABIAN,
+  HB_SCRIPT_OLD_TURKIC,
+  HB_SCRIPT_SAMARITAN,
+  HB_SCRIPT_TAI_VIET,
+
+  /* Unicode-6.0 additions */
+  HB_SCRIPT_BATAK,
+  HB_SCRIPT_BRAHMI,
+  HB_SCRIPT_MANDAIC
+};
+
+hb_script_t
+hb_glib_script_to_script (GUnicodeScript script)
+{
+  if (likely ((unsigned int) script < ARRAY_LENGTH (glib_script_to_script)))
+    return glib_script_to_script[script];
+
+  if (unlikely (script == G_UNICODE_SCRIPT_INVALID_CODE))
+    return HB_SCRIPT_INVALID;
+
+  return HB_SCRIPT_UNKNOWN;
+}
+
+GUnicodeScript
+hb_glib_script_from_script (hb_script_t script)
+{
+  unsigned int count = ARRAY_LENGTH (glib_script_to_script);
+  for (unsigned int i = 0; i < count; i++)
+    if (glib_script_to_script[i] == script)
+      return (GUnicodeScript) i;
+
+  if (unlikely (script == HB_SCRIPT_INVALID))
+    return G_UNICODE_SCRIPT_INVALID_CODE;
+
+  return G_UNICODE_SCRIPT_UNKNOWN;
+}
+
 
 static unsigned int
-hb_glib_get_combining_class (hb_unicode_funcs_t *ufuncs,
+hb_glib_get_combining_class (hb_unicode_funcs_t *ufuncs HB_UNUSED,
                              hb_codepoint_t      unicode,
-                             void               *user_data)
+                             void               *user_data HB_UNUSED)
 
 {
   return g_unichar_combining_class (unicode);
 }
 
 static unsigned int
-hb_glib_get_eastasian_width (hb_unicode_funcs_t *ufuncs,
+hb_glib_get_eastasian_width (hb_unicode_funcs_t *ufuncs HB_UNUSED,
                              hb_codepoint_t      unicode,
-                             void               *user_data)
+                             void               *user_data HB_UNUSED)
 {
   return g_unichar_iswide (unicode) ? 2 : 1;
 }
 
 static hb_unicode_general_category_t
-hb_glib_get_general_category (hb_unicode_funcs_t *ufuncs,
+hb_glib_get_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED,
                               hb_codepoint_t      unicode,
-                              void               *user_data)
+                              void               *user_data HB_UNUSED)
 
 {
   /* hb_unicode_general_category_t and GUnicodeType are identical */
@@ -63,153 +204,26 @@ hb_glib_get_general_category (hb_unicode_funcs_t *ufuncs,
 }
 
 static hb_codepoint_t
-hb_glib_get_mirroring (hb_unicode_funcs_t *ufuncs,
+hb_glib_get_mirroring (hb_unicode_funcs_t *ufuncs HB_UNUSED,
                        hb_codepoint_t      unicode,
-                       void               *user_data)
+                       void               *user_data HB_UNUSED)
 {
   g_unichar_get_mirror_char (unicode, &unicode);
   return unicode;
 }
 
 static hb_script_t
-hb_glib_get_script (hb_unicode_funcs_t *ufuncs,
+hb_glib_get_script (hb_unicode_funcs_t *ufuncs HB_UNUSED,
                     hb_codepoint_t      unicode,
-                    void               *user_data)
+                    void               *user_data HB_UNUSED)
 {
-  GUnicodeScript script = g_unichar_get_script (unicode);
-  switch (script)
-  {
-#define MATCH_SCRIPT(C) case G_UNICODE_SCRIPT_##C: return HB_SCRIPT_##C
-#define MATCH_SCRIPT2(C1, C2) case G_UNICODE_SCRIPT_##C1: return HB_SCRIPT_##C2
-
-  MATCH_SCRIPT2(INVALID_CODE, INVALID);
-
-  MATCH_SCRIPT (COMMON);             /* Zyyy */
-  MATCH_SCRIPT (INHERITED);          /* Qaai */
-  MATCH_SCRIPT (ARABIC);             /* Arab */
-  MATCH_SCRIPT (ARMENIAN);           /* Armn */
-  MATCH_SCRIPT (BENGALI);            /* Beng */
-  MATCH_SCRIPT (BOPOMOFO);           /* Bopo */
-  MATCH_SCRIPT (CHEROKEE);           /* Cher */
-  MATCH_SCRIPT (COPTIC);             /* Qaac */
-  MATCH_SCRIPT (CYRILLIC);           /* Cyrl (Cyrs) */
-  MATCH_SCRIPT (DESERET);            /* Dsrt */
-  MATCH_SCRIPT (DEVANAGARI);         /* Deva */
-  MATCH_SCRIPT (ETHIOPIC);           /* Ethi */
-  MATCH_SCRIPT (GEORGIAN);           /* Geor (Geon); Geoa) */
-  MATCH_SCRIPT (GOTHIC);             /* Goth */
-  MATCH_SCRIPT (GREEK);              /* Grek */
-  MATCH_SCRIPT (GUJARATI);           /* Gujr */
-  MATCH_SCRIPT (GURMUKHI);           /* Guru */
-  MATCH_SCRIPT (HAN);                /* Hani */
-  MATCH_SCRIPT (HANGUL);             /* Hang */
-  MATCH_SCRIPT (HEBREW);             /* Hebr */
-  MATCH_SCRIPT (HIRAGANA);           /* Hira */
-  MATCH_SCRIPT (KANNADA);            /* Knda */
-  MATCH_SCRIPT (KATAKANA);           /* Kana */
-  MATCH_SCRIPT (KHMER);              /* Khmr */
-  MATCH_SCRIPT (LAO);                /* Laoo */
-  MATCH_SCRIPT (LATIN);              /* Latn (Latf); Latg) */
-  MATCH_SCRIPT (MALAYALAM);          /* Mlym */
-  MATCH_SCRIPT (MONGOLIAN);          /* Mong */
-  MATCH_SCRIPT (MYANMAR);            /* Mymr */
-  MATCH_SCRIPT (OGHAM);              /* Ogam */
-  MATCH_SCRIPT (OLD_ITALIC);         /* Ital */
-  MATCH_SCRIPT (ORIYA);              /* Orya */
-  MATCH_SCRIPT (RUNIC);              /* Runr */
-  MATCH_SCRIPT (SINHALA);            /* Sinh */
-  MATCH_SCRIPT (SYRIAC);             /* Syrc (Syrj, Syrn); Syre) */
-  MATCH_SCRIPT (TAMIL);              /* Taml */
-  MATCH_SCRIPT (TELUGU);             /* Telu */
-  MATCH_SCRIPT (THAANA);             /* Thaa */
-  MATCH_SCRIPT (THAI);               /* Thai */
-  MATCH_SCRIPT (TIBETAN);            /* Tibt */
-  MATCH_SCRIPT (CANADIAN_ABORIGINAL);/* Cans */
-  MATCH_SCRIPT (YI);                 /* Yiii */
-  MATCH_SCRIPT (TAGALOG);            /* Tglg */
-  MATCH_SCRIPT (HANUNOO);            /* Hano */
-  MATCH_SCRIPT (BUHID);              /* Buhd */
-  MATCH_SCRIPT (TAGBANWA);           /* Tagb */
-
-  /* Unicode-4.0 additions */
-  MATCH_SCRIPT (BRAILLE);            /* Brai */
-  MATCH_SCRIPT (CYPRIOT);            /* Cprt */
-  MATCH_SCRIPT (LIMBU);              /* Limb */
-  MATCH_SCRIPT (OSMANYA);            /* Osma */
-  MATCH_SCRIPT (SHAVIAN);            /* Shaw */
-  MATCH_SCRIPT (LINEAR_B);           /* Linb */
-  MATCH_SCRIPT (TAI_LE);             /* Tale */
-  MATCH_SCRIPT (UGARITIC);           /* Ugar */
-
-  /* Unicode-4.1 additions */
-  MATCH_SCRIPT (NEW_TAI_LUE);        /* Talu */
-  MATCH_SCRIPT (BUGINESE);           /* Bugi */
-  MATCH_SCRIPT (GLAGOLITIC);         /* Glag */
-  MATCH_SCRIPT (TIFINAGH);           /* Tfng */
-  MATCH_SCRIPT (SYLOTI_NAGRI);       /* Sylo */
-  MATCH_SCRIPT (OLD_PERSIAN);        /* Xpeo */
-  MATCH_SCRIPT (KHAROSHTHI);         /* Khar */
-
-  /* Unicode-5.0 additions */
-  MATCH_SCRIPT (UNKNOWN);            /* Zzzz */
-  MATCH_SCRIPT (BALINESE);           /* Bali */
-  MATCH_SCRIPT (CUNEIFORM);          /* Xsux */
-  MATCH_SCRIPT (PHOENICIAN);         /* Phnx */
-  MATCH_SCRIPT (PHAGS_PA);           /* Phag */
-  MATCH_SCRIPT (NKO);                /* Nkoo */
-
-  /* Unicode-5.1 additions */
-  MATCH_SCRIPT (KAYAH_LI);           /* Kali */
-  MATCH_SCRIPT (LEPCHA);             /* Lepc */
-  MATCH_SCRIPT (REJANG);             /* Rjng */
-  MATCH_SCRIPT (SUNDANESE);          /* Sund */
-  MATCH_SCRIPT (SAURASHTRA);         /* Saur */
-  MATCH_SCRIPT (CHAM);               /* Cham */
-  MATCH_SCRIPT (OL_CHIKI);           /* Olck */
-  MATCH_SCRIPT (VAI);                /* Vaii */
-  MATCH_SCRIPT (CARIAN);             /* Cari */
-  MATCH_SCRIPT (LYCIAN);             /* Lyci */
-  MATCH_SCRIPT (LYDIAN);             /* Lydi */
-
-  /* Unicode-5.2 additions */
-#if GLIB_CHECK_VERSION(2,26,0)
-  MATCH_SCRIPT (AVESTAN);                /* Avst */
-  MATCH_SCRIPT (BAMUM);                  /* Bamu */
-  MATCH_SCRIPT (EGYPTIAN_HIEROGLYPHS);   /* Egyp */
-  MATCH_SCRIPT (IMPERIAL_ARAMAIC);       /* Armi */
-  MATCH_SCRIPT (INSCRIPTIONAL_PAHLAVI);  /* Phli */
-  MATCH_SCRIPT (INSCRIPTIONAL_PARTHIAN); /* Prti */
-  MATCH_SCRIPT (JAVANESE);               /* Java */
-  MATCH_SCRIPT (KAITHI);                 /* Kthi */
-  MATCH_SCRIPT (TAI_THAM);               /* Lana */
-  MATCH_SCRIPT (LISU);                   /* Lisu */
-  MATCH_SCRIPT (MEETEI_MAYEK);           /* Mtei */
-  MATCH_SCRIPT (OLD_SOUTH_ARABIAN);      /* Sarb */
-#if GLIB_CHECK_VERSION(2,27,92)
-  MATCH_SCRIPT (OLD_TURKIC);             /* Orkh */
-#else
-  MATCH_SCRIPT2(OLD_TURKISH, OLD_TURKIC);/* Orkh */
-#endif
-  MATCH_SCRIPT (SAMARITAN);              /* Samr */
-  MATCH_SCRIPT (TAI_VIET);               /* Tavt */
-#endif
-
-  /* Unicode-6.0 additions */
-#if GLIB_CHECK_VERSION(2,28,0)
-  MATCH_SCRIPT (BATAK);                  /* Batk */
-  MATCH_SCRIPT (BRAHMI);                 /* Brah */
-  MATCH_SCRIPT (MANDAIC);                /* Mand */
-#endif
-
-#undef MATCH_SCRIPT
-#undef MATCH_SCRIPT2
-  }
-
-  return HB_SCRIPT_UNKNOWN;
+  return hb_glib_script_to_script (g_unichar_get_script (unicode));
 }
 
-static hb_unicode_funcs_t glib_ufuncs = {
-  HB_REFERENCE_COUNT_INVALID, /* ref_count */
+extern HB_INTERNAL hb_unicode_funcs_t _hb_unicode_funcs_glib;
+hb_unicode_funcs_t _hb_glib_unicode_funcs = {
+  HB_OBJECT_HEADER_STATIC,
+
   NULL, /* parent */
   TRUE, /* immutable */
   {
@@ -224,7 +238,7 @@ static hb_unicode_funcs_t glib_ufuncs = {
 hb_unicode_funcs_t *
 hb_glib_get_unicode_funcs (void)
 {
-  return &glib_ufuncs;
+  return &_hb_glib_unicode_funcs;
 }