diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-4 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
-rw-r--r-- | pango/pangoft2-fontmap.c | 13 |
6 files changed, 36 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2003-12-05 Sven Neumann <sven@gimp.org> + + * pango/pangoft2-fontmap.c: initialize the fontmap's resolution + to some sane default values. Fixes bug #123602. + 2003-12-04 Noah Levitt <nlevitt@columbia.edu> * pango/pango-context.c: diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 0c39a0da..07c3d204 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2003-12-05 Sven Neumann <sven@gimp.org> + + * pango/pangoft2-fontmap.c: initialize the fontmap's resolution + to some sane default values. Fixes bug #123602. + 2003-12-04 Noah Levitt <nlevitt@columbia.edu> * pango/pango-context.c: diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 0c39a0da..07c3d204 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +2003-12-05 Sven Neumann <sven@gimp.org> + + * pango/pangoft2-fontmap.c: initialize the fontmap's resolution + to some sane default values. Fixes bug #123602. + 2003-12-04 Noah Levitt <nlevitt@columbia.edu> * pango/pango-context.c: diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 0c39a0da..07c3d204 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +2003-12-05 Sven Neumann <sven@gimp.org> + + * pango/pangoft2-fontmap.c: initialize the fontmap's resolution + to some sane default values. Fixes bug #123602. + 2003-12-04 Noah Levitt <nlevitt@columbia.edu> * pango/pango-context.c: diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 0c39a0da..07c3d204 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +2003-12-05 Sven Neumann <sven@gimp.org> + + * pango/pangoft2-fontmap.c: initialize the fontmap's resolution + to some sane default values. Fixes bug #123602. + 2003-12-04 Noah Levitt <nlevitt@columbia.edu> * pango/pango-context.c: 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); |