From 536b46c5c2531ceb7eb576c3c9f99e4ba57354a6 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Fri, 5 Dec 2003 15:45:05 +0000 Subject: initialize the fontmap's resolution to some sane default values. Fixes bug 2003-12-05 Sven Neumann * pango/pangoft2-fontmap.c: initialize the fontmap's resolution to some sane default values. Fixes bug #123602. --- ChangeLog | 5 +++++ ChangeLog.pre-1-10 | 5 +++++ ChangeLog.pre-1-4 | 5 +++++ ChangeLog.pre-1-6 | 5 +++++ ChangeLog.pre-1-8 | 5 +++++ pango/pangoft2-fontmap.c | 13 +++++++++++-- 6 files changed, 36 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c39a0da..07c3d204 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-12-05 Sven Neumann + + * pango/pangoft2-fontmap.c: initialize the fontmap's resolution + to some sane default values. Fixes bug #123602. + 2003-12-04 Noah Levitt * 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 + + * pango/pangoft2-fontmap.c: initialize the fontmap's resolution + to some sane default values. Fixes bug #123602. + 2003-12-04 Noah Levitt * 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 + + * pango/pangoft2-fontmap.c: initialize the fontmap's resolution + to some sane default values. Fixes bug #123602. + 2003-12-04 Noah Levitt * 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 + + * pango/pangoft2-fontmap.c: initialize the fontmap's resolution + to some sane default values. Fixes bug #123602. + 2003-12-04 Noah Levitt * 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 + + * pango/pangoft2-fontmap.c: initialize the fontmap's resolution + to some sane default values. Fixes bug #123602. + 2003-12-04 Noah Levitt * 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); @@ -119,6 +120,14 @@ pango_ft2_font_map_class_init (PangoFT2FontMapClass *class) fcfontmap_class->new_font = pango_ft2_font_map_new_font; } +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) { -- cgit v1.2.1