diff options
author | Behdad Esfahbod <behdad@gnome.org> | 2008-12-26 05:09:48 +0000 |
---|---|---|
committer | Behdad Esfahbod <behdad@src.gnome.org> | 2008-12-26 05:09:48 +0000 |
commit | 056aa0ca3f32ef8963e05bcf4afb70d0a3b28788 (patch) | |
tree | 71cfe518d74bc2481d65b8cf65ed6f5bee40b700 /modules/thai | |
parent | 635d8e7adde95bfab42aec70f2f01c647b9587b1 (diff) | |
download | pango-056aa0ca3f32ef8963e05bcf4afb70d0a3b28788.tar.gz |
Fix all warnings in modules/.
2008-12-25 Behdad Esfahbod <behdad@gnome.org>
* modules/arabic/arabic-fc.c (arabic_engine_shape):
* modules/arabic/arabic-lang.c (arabic_engine_break):
* modules/basic/basic-fc.c (basic_engine_shape):
* modules/basic/basic-x.c (find_char), (conv_8bit), (conv_eucjp),
(conv_16bit), (conv_16bit_MSB_on), (conv_gb18030_1), (conv_euctw),
(conv_ucs4), (basic_engine_shape), (basic_engine_covers):
* modules/hangul/hangul-fc.c (hangul_engine_shape):
* modules/hebrew/hebrew-fc.c (add_cluster), (fallback_shape):
* modules/indic/indic-lang.c (indic_engine_break):
* modules/khmer/khmer-fc.c (khmer_engine_shape):
* modules/syriac/syriac-fc.c (syriac_engine_shape):
* modules/thai/thai-fc.c (get_glyph_index_tis),
(thai_engine_shape), (thai_make_unknown_glyph):
* modules/thai/thai-lang.c (thai_engine_break):
* modules/thai/thai-shaper.c (get_glyphs_list):
* modules/tibetan/tibetan-fc.c (tibetan_engine_shape):
Fix all warnings in modules/.
svn path=/trunk/; revision=2771
Diffstat (limited to 'modules/thai')
-rw-r--r-- | modules/thai/thai-fc.c | 7 | ||||
-rw-r--r-- | modules/thai/thai-lang.c | 10 | ||||
-rw-r--r-- | modules/thai/thai-shaper.c | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/modules/thai/thai-fc.c b/modules/thai/thai-fc.c index 40f3acc5..66dccbb4 100644 --- a/modules/thai/thai-fc.c +++ b/modules/thai/thai-fc.c @@ -200,10 +200,11 @@ get_glyph_index_tis (ThaiFontInfo *font_info, guchar c) return lao_0[c]; switch (font_info->font_set) { + default: + case THAI_FONT_NONE: return 0; case THAI_FONT_TIS: return tis620_0[c & 0x7f]; case THAI_FONT_TIS_MAC: return tis620_1[c & 0x7f]; case THAI_FONT_TIS_WIN: return tis620_2[c & 0x7f]; - default: return 0; } } @@ -253,7 +254,7 @@ static const PangoOTFeatureMap gpos_features[] = }; static void -thai_engine_shape (PangoEngineShape *engine, +thai_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED, PangoFont *font, const char *text, gint length, @@ -312,7 +313,7 @@ thai_engine_shape (PangoEngineShape *engine, } PangoGlyph -thai_make_unknown_glyph (ThaiFontInfo *font_info, gunichar uc) +thai_make_unknown_glyph (ThaiFontInfo *font_info G_GNUC_UNUSED, gunichar uc) { return PANGO_GET_UNKNOWN_GLYPH (uc); } diff --git a/modules/thai/thai-lang.c b/modules/thai/thai-lang.c index c27ce0ba..31571445 100644 --- a/modules/thai/thai-lang.c +++ b/modules/thai/thai-lang.c @@ -65,12 +65,12 @@ utf8_to_tis (const char *text, int len, thchar_t *tis_text, int *tis_cnt) } static void -thai_engine_break (PangoEngineLang *engine, +thai_engine_break (PangoEngineLang *engine G_GNUC_UNUSED, const char *text, int len, - PangoAnalysis *analysis, + PangoAnalysis *analysis G_GNUC_UNUSED, PangoLogAttr *attrs, - int attrs_len) + int attrs_len G_GNUC_UNUSED) { thchar_t tis_stack[512]; int brk_stack[512]; @@ -83,13 +83,13 @@ thai_engine_break (PangoEngineLang *engine, cnt = g_utf8_strlen (text, len) + 1; tis_text = tis_stack; - if (cnt > G_N_ELEMENTS (tis_stack)) + if (cnt > (int) G_N_ELEMENTS (tis_stack)) tis_text = g_new (thchar_t, cnt); utf8_to_tis (text, len, tis_text, &cnt); brk_pnts = brk_stack; - if (cnt > G_N_ELEMENTS (brk_stack)) + if (cnt > (int) G_N_ELEMENTS (brk_stack)) brk_pnts = g_new (int, cnt); /* find line break positions */ diff --git a/modules/thai/thai-shaper.c b/modules/thai/thai-shaper.c index e80bb3c2..4ed173c8 100644 --- a/modules/thai/thai-shaper.c +++ b/modules/thai/thai-shaper.c @@ -398,7 +398,7 @@ get_glyphs_list (ThaiFontInfo *font_info, { gint i; - switch (script) + switch ((int) script) { case PANGO_SCRIPT_THAI: switch (font_info->font_set) |