diff options
| author | Sven Neumann <sven@gimp.org> | 2003-11-18 10:31:32 +0000 |
|---|---|---|
| committer | Sven Neumann <neo@src.gnome.org> | 2003-11-18 10:31:32 +0000 |
| commit | a28429606a92ef5757327d7020c98100d6c10366 (patch) | |
| tree | cac4ddfb914e20cc397758c4c863373991daf2b1 /pango/pangoft2-fontmap.c | |
| parent | b94f2c87e1e92cffd260b99b4d084d4e80cff96e (diff) | |
| download | pango-a28429606a92ef5757327d7020c98100d6c10366.tar.gz | |
removed the set_unicode_charmap() call. Made
2003-11-18 Sven Neumann <sven@gimp.org>
* pango/pangoft2-fontmap.c: removed the set_unicode_charmap() call.
Made pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex()
rather than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char()
use FcCharSetHasChar(). This allows to use PangoFT2 with all font
encodings supported by fontconfig and fixes bug #101856.
Diffstat (limited to 'pango/pangoft2-fontmap.c')
| -rw-r--r-- | pango/pangoft2-fontmap.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index 7efe0287..3460eee8 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -68,6 +68,7 @@ struct _PangoFT2FontMapClass }; static void pango_ft2_font_map_class_init (PangoFT2FontMapClass *class); +static void pango_ft2_font_map_init (PangoFT2FontMap *fontmap); static void pango_ft2_font_map_finalize (GObject *object); static void pango_ft2_font_map_default_substitute (PangoFcFontMap *fcfontmap, FcPattern *pattern); @@ -95,9 +96,9 @@ pango_ft2_font_map_get_type (void) NULL, /* class_data */ sizeof (PangoFT2FontMap), 0, /* n_preallocs */ - (GInstanceInitFunc) NULL, + (GInstanceInitFunc) pango_ft2_font_map_init, }; - + object_type = g_type_register_static (PANGO_TYPE_FC_FONT_MAP, "PangoFT2FontMap", &object_info, 0); @@ -120,6 +121,14 @@ pango_ft2_font_map_class_init (PangoFT2FontMapClass *class) } static void +pango_ft2_font_map_init (PangoFT2FontMap *fontmap) +{ + fontmap->library = NULL; + fontmap->dpi_x = 72.0; + fontmap->dpi_y = 72.0; +} + +static void pango_ft2_font_map_finalize (GObject *object) { PangoFT2FontMap *ft2fontmap = PANGO_FT2_FONT_MAP (object); |