diff options
author | Owen Taylor <otaylor@redhat.com> | 2002-07-27 13:48:14 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2002-07-27 13:48:14 +0000 |
commit | 422370667f0b035d9d214ac0e93c877a78d32562 (patch) | |
tree | 57cf6e0c1f704243ceb7b216a5496ef9115e2d48 /modules/thai | |
parent | 7a298eeb1590f0a7e233ff6d7d9fa9df9d03276f (diff) | |
download | pango-422370667f0b035d9d214ac0e93c877a78d32562.tar.gz |
Fix problem where pango_xft_get_unknown_glyph() was being used for X
Sat Jul 27 09:46:51 2002 Owen Taylor <otaylor@redhat.com>
* modules/thai/{thai-shaper.[ch],thai-x.c,thai-xft.c}
(make_unknown_glyph): Fix problem where
pango_xft_get_unknown_glyph() was being used for X
fonts. (reported by Jacob Berkman)
Diffstat (limited to 'modules/thai')
-rw-r--r-- | modules/thai/thai-fc.c | 7 | ||||
-rw-r--r-- | modules/thai/thai-shaper.c | 3 | ||||
-rw-r--r-- | modules/thai/thai-shaper.h | 4 | ||||
-rw-r--r-- | modules/thai/thai-x.c | 6 | ||||
-rw-r--r-- | modules/thai/thai-xft.c | 7 |
5 files changed, 24 insertions, 3 deletions
diff --git a/modules/thai/thai-fc.c b/modules/thai/thai-fc.c index 6b9d7aaf..169aa66d 100644 --- a/modules/thai/thai-fc.c +++ b/modules/thai/thai-fc.c @@ -31,6 +31,7 @@ #include <glib.h> #include "pango-engine.h" +#include "pangoxft.h" #include "thai-shaper.h" #define SCRIPT_ENGINE_NAME "ThaiScriptEngineXft" @@ -176,6 +177,12 @@ make_glyph (ThaiFontInfo *font_info, unsigned char c) return pango_xft_font_get_glyph (font_info->font, index); } +PangoGlyph +make_unknown_glyph (ThaiFontInfo *font_info, unsigned char c) +{ + return pango_xft_font_get_unknown_glyph (font_info->font, c); +} + static PangoCoverage * thai_engine_get_coverage (PangoFont *font, PangoLanguage *lang) diff --git a/modules/thai/thai-shaper.c b/modules/thai/thai-shaper.c index 1c1a9785..c5f8dfa4 100644 --- a/modules/thai/thai-shaper.c +++ b/modules/thai/thai-shaper.c @@ -30,7 +30,6 @@ #include <string.h> #include <glib.h> -#include "pangoxft.h" #include "pango-engine.h" #include "thai-shaper.h" @@ -570,7 +569,7 @@ get_glyphs_list (ThaiFontInfo *font_info, { case THAI_FONT_NONE: for (i=0; i < num_chrs; i++) - glyph_lists[i] = pango_xft_font_get_unknown_glyph (font_info->font, glyph_lists[i]); + glyph_lists[i] = make_unknown_glyph (font_info, glyph_lists[i]); return num_chrs; case THAI_FONT_XTIS: diff --git a/modules/thai/thai-shaper.h b/modules/thai/thai-shaper.h index 7d465d5e..57f4f929 100644 --- a/modules/thai/thai-shaper.h +++ b/modules/thai/thai-shaper.h @@ -2,7 +2,6 @@ #define __THAI_SHAPER_H__ #include "pangox.h" -#include "pangoxft.h" #define ucs2tis(wc) (unsigned int)((unsigned int)(wc) - 0x0E00 + 0xA0) #define tis2uni(c) ((gunichar)(c) - 0xA0 + 0x0E00) @@ -41,6 +40,9 @@ get_font_info (PangoFont *font); PangoGlyph make_glyph (ThaiFontInfo *font_info, unsigned char c); +PangoGlyph +make_unknown_glyph (ThaiFontInfo *font_info, unsigned char c); + /* * Public functions */ diff --git a/modules/thai/thai-x.c b/modules/thai/thai-x.c index b07c29b9..9890e64f 100644 --- a/modules/thai/thai-x.c +++ b/modules/thai/thai-x.c @@ -131,6 +131,12 @@ make_glyph (ThaiFontInfo *font_info, unsigned char c) return PANGO_X_MAKE_GLYPH (font_info->subfont, c); } +PangoGlyph +make_unknown_glyph (ThaiFontInfo *font_info, unsigned char c) +{ + return pango_x_get_unknown_glyph (font_info->font); +} + static PangoCoverage * thai_engine_get_coverage (PangoFont *font, PangoLanguage *lang) diff --git a/modules/thai/thai-xft.c b/modules/thai/thai-xft.c index 6b9d7aaf..169aa66d 100644 --- a/modules/thai/thai-xft.c +++ b/modules/thai/thai-xft.c @@ -31,6 +31,7 @@ #include <glib.h> #include "pango-engine.h" +#include "pangoxft.h" #include "thai-shaper.h" #define SCRIPT_ENGINE_NAME "ThaiScriptEngineXft" @@ -176,6 +177,12 @@ make_glyph (ThaiFontInfo *font_info, unsigned char c) return pango_xft_font_get_glyph (font_info->font, index); } +PangoGlyph +make_unknown_glyph (ThaiFontInfo *font_info, unsigned char c) +{ + return pango_xft_font_get_unknown_glyph (font_info->font, c); +} + static PangoCoverage * thai_engine_get_coverage (PangoFont *font, PangoLanguage *lang) |