diff options
author | Sven Neumann <sven@gimp.org> | 2003-12-05 16:06:38 +0000 |
---|---|---|
committer | Sven Neumann <neo@src.gnome.org> | 2003-12-05 16:06:38 +0000 |
commit | ce1ddc3cc88b0fccd76e3ce80cb6d95e2166dd34 (patch) | |
tree | 670d722b6698ef9362dfc15811aa7f05a30ab5e2 | |
parent | 04ff3bd803f35e8d944e72d78ac3249352935bbf (diff) | |
download | pango-ce1ddc3cc88b0fccd76e3ce80cb6d95e2166dd34.tar.gz |
merged fix for bug #123602 from HEAD branch (initialize fontmap
2003-12-05 Sven Neumann <sven@gimp.org>
* pango/pangoft2-fontmap.c (pango_ft2_font_map_new): merged fix
for bug #123602 from HEAD branch (initialize fontmap resolution).
-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 | 3 |
6 files changed, 28 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2003-12-05 Sven Neumann <sven@gimp.org> + + * 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 <nlevitt@columbia.edu> * 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 <sven@gimp.org> + + * 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 <nlevitt@columbia.edu> * 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 <sven@gimp.org> + + * 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 <nlevitt@columbia.edu> * 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 <sven@gimp.org> + + * 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 <nlevitt@columbia.edu> * 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 <sven@gimp.org> + + * 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 <nlevitt@columbia.edu> * 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) { |