diff options
| author | Theppitak Karoonboonyanan <thep@linux.thai.net> | 2004-10-12 12:14:43 +0000 |
|---|---|---|
| committer | Theppitak Karoonboonyanan <tkaroonb@src.gnome.org> | 2004-10-12 12:14:43 +0000 |
| commit | c0adc5e0ca12440d0d9e21c37888256378b6e092 (patch) | |
| tree | da8e0a17a4e641c44b21c83e8cd40880fc002907 | |
| parent | 9b0aef862faa8959dce96825dff23a373442c03f (diff) | |
| download | pango-c0adc5e0ca12440d0d9e21c37888256378b6e092.tar.gz | |
Use guchar instead of gchar as argument type.
2004-10-12 Theppitak Karoonboonyanan <thep@linux.thai.net>
* modules/thai/thai-shaper.h (thai_get_glyph_tis,
thai_make_glyph_tis): Use guchar instead of gchar as argument type.
* modules/thai/thai-fc.c (thai_get_glyph_tis, thai_make_glyph_tis):
Make *_tis functions wrappers to *_uni functions.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 8 | ||||
| -rw-r--r-- | modules/thai/thai-fc.c | 22 | ||||
| -rw-r--r-- | modules/thai/thai-shaper.h | 4 |
5 files changed, 32 insertions, 18 deletions
@@ -1,3 +1,11 @@ +2004-10-12 Theppitak Karoonboonyanan <thep@linux.thai.net> + + * modules/thai/thai-shaper.h (thai_get_glyph_tis, + thai_make_glyph_tis): Use guchar instead of gchar as argument type. + + * modules/thai/thai-fc.c (thai_get_glyph_tis, thai_make_glyph_tis): + Make *_tis functions wrappers to *_uni functions. + 2004-10-09 Theppitak Karoonboonyanan <thep@linux.thai.net> Explicitly handle dangling upper/lower marks by optionally using diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index edf495fb..87f1fc73 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,11 @@ +2004-10-12 Theppitak Karoonboonyanan <thep@linux.thai.net> + + * modules/thai/thai-shaper.h (thai_get_glyph_tis, + thai_make_glyph_tis): Use guchar instead of gchar as argument type. + + * modules/thai/thai-fc.c (thai_get_glyph_tis, thai_make_glyph_tis): + Make *_tis functions wrappers to *_uni functions. + 2004-10-09 Theppitak Karoonboonyanan <thep@linux.thai.net> Explicitly handle dangling upper/lower marks by optionally using diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index edf495fb..87f1fc73 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,11 @@ +2004-10-12 Theppitak Karoonboonyanan <thep@linux.thai.net> + + * modules/thai/thai-shaper.h (thai_get_glyph_tis, + thai_make_glyph_tis): Use guchar instead of gchar as argument type. + + * modules/thai/thai-fc.c (thai_get_glyph_tis, thai_make_glyph_tis): + Make *_tis functions wrappers to *_uni functions. + 2004-10-09 Theppitak Karoonboonyanan <thep@linux.thai.net> Explicitly handle dangling upper/lower marks by optionally using diff --git a/modules/thai/thai-fc.c b/modules/thai/thai-fc.c index 324d3fbf..8fa0a3e3 100644 --- a/modules/thai/thai-fc.c +++ b/modules/thai/thai-fc.c @@ -169,8 +169,8 @@ thai_get_font_info (PangoFont *font) return font_info; } -static gint -thai_get_glyph_index (ThaiFontInfo *font_info, gchar c) +static gunichar +get_glyph_index_tis (ThaiFontInfo *font_info, guchar c) { switch (font_info->font_set) { case THAI_FONT_TIS: return (c & 0x80) ? tis620_0[c & 0x7f] : c; @@ -181,25 +181,15 @@ thai_get_glyph_index (ThaiFontInfo *font_info, gchar c) } PangoGlyph -thai_get_glyph_tis (ThaiFontInfo *font_info, gchar c) +thai_get_glyph_tis (ThaiFontInfo *font_info, guchar c) { - return pango_fc_font_get_glyph ((PangoFcFont *)font_info->font, - thai_get_glyph_index (font_info, c)); + return thai_get_glyph_uni (font_info, get_glyph_index_tis (font_info, c)); } PangoGlyph -thai_make_glyph_tis (ThaiFontInfo *font_info, gchar c) +thai_make_glyph_tis (ThaiFontInfo *font_info, guchar c) { - gint index; - PangoGlyph result; - PangoFcFont *fc_font = (PangoFcFont *)font_info->font; - - index = thai_get_glyph_index (font_info, c); - result = pango_fc_font_get_glyph (fc_font, index); - if (result) - return result; - else - return pango_fc_font_get_unknown_glyph (fc_font, index); + return thai_make_glyph_uni (font_info, get_glyph_index_tis (font_info, c)); } PangoGlyph diff --git a/modules/thai/thai-shaper.h b/modules/thai/thai-shaper.h index 19850730..f54814b8 100644 --- a/modules/thai/thai-shaper.h +++ b/modules/thai/thai-shaper.h @@ -34,10 +34,10 @@ ThaiFontInfo * thai_get_font_info (PangoFont *font); PangoGlyph -thai_get_glyph_tis (ThaiFontInfo *font_info, gchar c); +thai_get_glyph_tis (ThaiFontInfo *font_info, guchar c); PangoGlyph -thai_make_glyph_tis (ThaiFontInfo *font_info, gchar c); +thai_make_glyph_tis (ThaiFontInfo *font_info, guchar c); PangoGlyph thai_get_glyph_uni (ThaiFontInfo *font_info, gunichar uc); |