pango r2771 - in trunk: . modules/arabic modules/basic modules/hangul modules/hebrew modules/indic modules/khmer modules/syriac modules/thai modules/tibetan
- From: behdad svn gnome org
- To: svn-commits-list gnome org
- Subject: pango r2771 - in trunk: . modules/arabic modules/basic modules/hangul modules/hebrew modules/indic modules/khmer modules/syriac modules/thai modules/tibetan
- Date: Fri, 26 Dec 2008 05:09:48 +0000 (UTC)
Author: behdad
Date: Fri Dec 26 05:09:48 2008
New Revision: 2771
URL: http://svn.gnome.org/viewvc/pango?rev=2771&view=rev
Log:
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/.
Modified:
trunk/ChangeLog
trunk/modules/arabic/arabic-fc.c
trunk/modules/arabic/arabic-lang.c
trunk/modules/basic/basic-fc.c
trunk/modules/basic/basic-x.c
trunk/modules/hangul/hangul-fc.c
trunk/modules/hebrew/hebrew-fc.c
trunk/modules/indic/indic-lang.c
trunk/modules/khmer/khmer-fc.c
trunk/modules/syriac/syriac-fc.c
trunk/modules/thai/thai-fc.c
trunk/modules/thai/thai-lang.c
trunk/modules/thai/thai-shaper.c
trunk/modules/tibetan/tibetan-fc.c
Modified: trunk/modules/arabic/arabic-fc.c
==============================================================================
--- trunk/modules/arabic/arabic-fc.c (original)
+++ trunk/modules/arabic/arabic-fc.c Fri Dec 26 05:09:48 2008
@@ -78,7 +78,7 @@
};
static void
-arabic_engine_shape (PangoEngineShape *engine,
+arabic_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
PangoFont *font,
const char *text,
gint length,
Modified: trunk/modules/arabic/arabic-lang.c
==============================================================================
--- trunk/modules/arabic/arabic-lang.c (original)
+++ trunk/modules/arabic/arabic-lang.c Fri Dec 26 05:09:48 2008
@@ -71,12 +71,12 @@
#define IS_COMPOSITE_WITH_ALEF(c) (MADDAH_ABOVE <= (c) && (c) <= HAMZA_BELOW)
static void
-arabic_engine_break (PangoEngineLang *engine,
+arabic_engine_break (PangoEngineLang *engine G_GNUC_UNUSED,
const char *text,
int length,
- PangoAnalysis *analysis,
+ PangoAnalysis *analysis G_GNUC_UNUSED,
PangoLogAttr *attrs,
- int attrs_len)
+ int attrs_len G_GNUC_UNUSED)
{
int i;
const char *p;
Modified: trunk/modules/basic/basic-fc.c
==============================================================================
--- trunk/modules/basic/basic-fc.c (original)
+++ trunk/modules/basic/basic-fc.c Fri Dec 26 05:09:48 2008
@@ -120,7 +120,7 @@
};
static void
-basic_engine_shape (PangoEngineShape *engine,
+basic_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
PangoFont *font,
const char *text,
gint length,
Modified: trunk/modules/basic/basic-x.c
==============================================================================
--- trunk/modules/basic/basic-x.c (original)
+++ trunk/modules/basic/basic-x.c Fri Dec 26 05:09:48 2008
@@ -239,7 +239,7 @@
}
}
- mask_table->n_subfonts = pango_x_list_subfonts (font, (char**)charset_names, n_charsets, &mask_table->subfonts, &subfont_charsets);
+ mask_table->n_subfonts = pango_x_list_subfonts (font, (char**)(void*)charset_names, n_charsets, &mask_table->subfonts, &subfont_charsets);
mask_table->charsets = g_new (Charset *, mask_table->n_subfonts);
for (i=0; i<mask_table->n_subfonts; i++)
@@ -302,7 +302,7 @@
}
static PangoGlyph
-conv_8bit (CharCache *cache,
+conv_8bit (CharCache *cache G_GNUC_UNUSED,
GIConv cd,
const char *input)
{
@@ -321,7 +321,7 @@
}
static PangoGlyph
-conv_eucjp (CharCache *cache,
+conv_eucjp (CharCache *cache G_GNUC_UNUSED,
GIConv cd,
const char *input)
{
@@ -347,7 +347,7 @@
}
static PangoGlyph
-conv_16bit (CharCache *cache,
+conv_16bit (CharCache *cache G_GNUC_UNUSED,
GIConv cd,
const char *input)
{
@@ -369,7 +369,7 @@
}
static PangoGlyph
-conv_16bit_MSB_on (CharCache *cache,
+conv_16bit_MSB_on (CharCache *cache G_GNUC_UNUSED,
GIConv cd,
const char *input)
{
@@ -391,7 +391,7 @@
}
static PangoGlyph
-conv_gb18030_1 (CharCache *cache,
+conv_gb18030_1 (CharCache *cache G_GNUC_UNUSED,
GIConv cd,
const char *input)
{
@@ -414,7 +414,7 @@
}
static PangoGlyph
-conv_euctw (CharCache *cache,
+conv_euctw (CharCache *cache G_GNUC_UNUSED,
GIConv cd,
const char *input)
{
@@ -439,8 +439,8 @@
}
static PangoGlyph
-conv_ucs4 (CharCache *cache,
- GIConv cd,
+conv_ucs4 (CharCache *cache G_GNUC_UNUSED,
+ GIConv cd G_GNUC_UNUSED,
const char *input)
{
return g_utf8_get_char (input);
@@ -554,7 +554,7 @@
}
static void
-basic_engine_shape (PangoEngineShape *engine,
+basic_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
PangoFont *font,
const char *text,
gint length,
@@ -668,7 +668,7 @@
}
static PangoCoverageLevel
-basic_engine_covers (PangoEngineShape *engine,
+basic_engine_covers (PangoEngineShape *engine G_GNUC_UNUSED,
PangoFont *font,
PangoLanguage *lang,
gunichar wc)
Modified: trunk/modules/hangul/hangul-fc.c
==============================================================================
--- trunk/modules/hangul/hangul-fc.c (original)
+++ trunk/modules/hangul/hangul-fc.c Fri Dec 26 05:09:48 2008
@@ -396,11 +396,11 @@
}
static void
-hangul_engine_shape (PangoEngineShape *engine,
+hangul_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
PangoFont *font,
const char *text,
gint length,
- const PangoAnalysis *analysis,
+ const PangoAnalysis *analysis G_GNUC_UNUSED,
PangoGlyphString *glyphs)
{
int n_chars = g_utf8_strlen (text, length);
Modified: trunk/modules/hebrew/hebrew-fc.c
==============================================================================
--- trunk/modules/hebrew/hebrew-fc.c (original)
+++ trunk/modules/hebrew/hebrew-fc.c Fri Dec 26 05:09:48 2008
@@ -127,11 +127,9 @@
}
static void
-add_cluster(PangoFont *font,
- PangoGlyphString *glyphs,
+add_cluster(PangoGlyphString *glyphs,
int cluster_size,
int cluster_start,
- int glyph_num[],
PangoGlyph glyph[],
int width[],
int x_offset[],
@@ -147,7 +145,7 @@
}
static void
-fallback_shape (PangoEngineShape *engine,
+fallback_shape (PangoEngineShape *engine G_GNUC_UNUSED,
PangoFont *font,
const char *text,
gint length,
@@ -192,11 +190,9 @@
x_offset,
y_offset);
- add_cluster(font,
- glyphs,
+ add_cluster(glyphs,
cluster_size,
log_cluster - text,
- glyph_num,
glyph,
glyph_width,
x_offset,
Modified: trunk/modules/indic/indic-lang.c
==============================================================================
--- trunk/modules/indic/indic-lang.c (original)
+++ trunk/modules/indic/indic-lang.c Fri Dec 26 05:09:48 2008
@@ -92,12 +92,12 @@
}
static void
-indic_engine_break (PangoEngineLang *engine,
+indic_engine_break (PangoEngineLang *engine G_GNUC_UNUSED,
const char *text,
int length,
PangoAnalysis *analysis,
PangoLogAttr *attrs,
- int attrs_len)
+ int attrs_len G_GNUC_UNUSED)
{
const gchar *p, *next = NULL, *next_next;
gunichar prev_wc, this_wc, next_wc, next_next_wc;
Modified: trunk/modules/khmer/khmer-fc.c
==============================================================================
--- trunk/modules/khmer/khmer-fc.c (original)
+++ trunk/modules/khmer/khmer-fc.c Fri Dec 26 05:09:48 2008
@@ -450,7 +450,7 @@
static void
-khmer_engine_shape (PangoEngineShape *engine,
+khmer_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
PangoFont *font,
const char *text,
int length,
Modified: trunk/modules/syriac/syriac-fc.c
==============================================================================
--- trunk/modules/syriac/syriac-fc.c (original)
+++ trunk/modules/syriac/syriac-fc.c Fri Dec 26 05:09:48 2008
@@ -78,7 +78,7 @@
};
static void
-syriac_engine_shape (PangoEngineShape *engine,
+syriac_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
PangoFont *font,
const char *text,
gint length,
Modified: trunk/modules/thai/thai-fc.c
==============================================================================
--- trunk/modules/thai/thai-fc.c (original)
+++ trunk/modules/thai/thai-fc.c Fri Dec 26 05:09:48 2008
@@ -200,10 +200,11 @@
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 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 @@
}
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);
}
Modified: trunk/modules/thai/thai-lang.c
==============================================================================
--- trunk/modules/thai/thai-lang.c (original)
+++ trunk/modules/thai/thai-lang.c Fri Dec 26 05:09:48 2008
@@ -65,12 +65,12 @@
}
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 @@
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 */
Modified: trunk/modules/thai/thai-shaper.c
==============================================================================
--- trunk/modules/thai/thai-shaper.c (original)
+++ trunk/modules/thai/thai-shaper.c Fri Dec 26 05:09:48 2008
@@ -398,7 +398,7 @@
{
gint i;
- switch (script)
+ switch ((int) script)
{
case PANGO_SCRIPT_THAI:
switch (font_info->font_set)
Modified: trunk/modules/tibetan/tibetan-fc.c
==============================================================================
--- trunk/modules/tibetan/tibetan-fc.c (original)
+++ trunk/modules/tibetan/tibetan-fc.c Fri Dec 26 05:09:48 2008
@@ -412,7 +412,7 @@
static void
-tibetan_engine_shape (PangoEngineShape *engine,
+tibetan_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
PangoFont *font,
const char *text,
int length,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
