From ce1ddc3cc88b0fccd76e3ce80cb6d95e2166dd34 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Fri, 5 Dec 2003 16:06:38 +0000 Subject: merged fix for bug #123602 from HEAD branch (initialize fontmap 2003-12-05 Sven Neumann * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): merged fix for bug #123602 from HEAD branch (initialize fontmap resolution). --- 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 | 3 +++ 6 files changed, 28 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7259a607..edbd00be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-12-05 Sven Neumann + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): merged fix + for bug #123602 from HEAD branch (initialize fontmap resolution). + 2003-11-25 Noah Levitt * pango-utils.c (lang_texts[]): Italian is "it"; "iw" is deprecated diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 7259a607..edbd00be 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2003-12-05 Sven Neumann + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): merged fix + for bug #123602 from HEAD branch (initialize fontmap resolution). + 2003-11-25 Noah Levitt * pango-utils.c (lang_texts[]): Italian is "it"; "iw" is deprecated diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 7259a607..edbd00be 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +2003-12-05 Sven Neumann + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): merged fix + for bug #123602 from HEAD branch (initialize fontmap resolution). + 2003-11-25 Noah Levitt * pango-utils.c (lang_texts[]): Italian is "it"; "iw" is deprecated diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 7259a607..edbd00be 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +2003-12-05 Sven Neumann + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): merged fix + for bug #123602 from HEAD branch (initialize fontmap resolution). + 2003-11-25 Noah Levitt * pango-utils.c (lang_texts[]): Italian is "it"; "iw" is deprecated diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 7259a607..edbd00be 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +2003-12-05 Sven Neumann + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): merged fix + for bug #123602 from HEAD branch (initialize fontmap resolution). + 2003-11-25 Noah Levitt * pango-utils.c (lang_texts[]): Italian is "it"; "iw" is deprecated diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index df643b64..fa3fd0fb 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -147,6 +147,9 @@ pango_ft2_font_map_new (void) ft2fontmap = g_object_new (PANGO_TYPE_FT2_FONT_MAP, NULL); + ft2fontmap->dpi_x = 72.0; + ft2fontmap->dpi_y = 72.0; + error = FT_Init_FreeType (&ft2fontmap->library); if (error != FT_Err_Ok) { -- cgit v1.2.1