[pango] Fix compiler warnings



commit a867698c7fdc11da8ecaaf1d6a32fafec7d11373
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jul 18 09:46:39 2019 -0700

    Fix compiler warnings

 pango/break.c         | 2 +-
 pango/pango-context.c | 2 +-
 pango/pango-ot-tag.c  | 2 +-
 pango/pango-script.c  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/pango/break.c b/pango/break.c
index 799d7b9f..8ed8e8c1 100644
--- a/pango/break.c
+++ b/pango/break.c
@@ -543,7 +543,7 @@ pango_default_break (const gchar   *text,
            PangoScript script;
            WordBreakType WB_type;
 
-           script = g_unichar_get_script (wc);
+           script = (PangoScript)g_unichar_get_script (wc);
 
            /* Find the WordBreakType of wc */
            WB_type = WB_Other;
diff --git a/pango/pango-context.c b/pango/pango-context.c
index ca4c33b6..44f3c3c0 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -1454,7 +1454,7 @@ string_from_script (PangoScript script)
 
   value = g_enum_get_value (class, script);
   if (!value)
-    return string_from_script (G_UNICODE_SCRIPT_INVALID_CODE);
+    return string_from_script (PANGO_SCRIPT_INVALID_CODE);
 
   return value->value_nick;
 }
diff --git a/pango/pango-ot-tag.c b/pango/pango-ot-tag.c
index 1cb58c88..c4f337e8 100644
--- a/pango/pango-ot-tag.c
+++ b/pango/pango-ot-tag.c
@@ -49,7 +49,7 @@ pango_ot_tag_from_script (PangoScript script)
   unsigned int count = 1;
   hb_tag_t tags[1];
 
-  hb_ot_tags_from_script_and_language (hb_glib_script_to_script (script),
+  hb_ot_tags_from_script_and_language (hb_glib_script_to_script ((GUnicodeScript)script),
                                        HB_LANGUAGE_INVALID,
                                        &count,
                                        tags,
diff --git a/pango/pango-script.c b/pango/pango-script.c
index a164ef70..f7854239 100644
--- a/pango/pango-script.c
+++ b/pango/pango-script.c
@@ -91,7 +91,7 @@
 PangoScript
 pango_script_for_unichar (gunichar ch)
 {
-  return g_unichar_get_script (ch);
+  return (PangoScript)g_unichar_get_script (ch);
 }
 
 /**********************************************************************/
@@ -315,7 +315,7 @@ pango_script_iter_next (PangoScriptIter *iter)
       PangoScript sc;
       int pair_index;
 
-      sc = g_unichar_get_script (ch);
+      sc = (PangoScript)g_unichar_get_script (ch);
       if (sc != PANGO_SCRIPT_COMMON)
        pair_index = -1;
       else


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]