From 4a6adffcdba1abc23235b297cf0a106ca257eafb Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 16 Dec 2004 04:25:10 +0000 Subject: Emergency fix for #151068... if uniscribe shaping comes up with no glyphs, Wed Dec 15 23:13:57 2004 Owen Taylor * modules/basic/basic-win32.c (uniscribe_shape): Emergency fix for #151068... if uniscribe shaping comes up with no glyphs, fall back to non-uniscribe shaping. --- ChangeLog | 6 ++++++ ChangeLog.pre-1-10 | 6 ++++++ ChangeLog.pre-1-8 | 6 ++++++ modules/basic/basic-win32.c | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2f519d6c..cf92e153 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Dec 15 23:13:57 2004 Owen Taylor + + * modules/basic/basic-win32.c (uniscribe_shape): Emergency + fix for #151068... if uniscribe shaping comes up with + no glyphs, fall back to non-uniscribe shaping. + Wed Dec 15 22:09:42 2004 Owen Taylor Add pixel sizes for fonts (#119081, patch from Chris Lahey) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 2f519d6c..cf92e153 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Wed Dec 15 23:13:57 2004 Owen Taylor + + * modules/basic/basic-win32.c (uniscribe_shape): Emergency + fix for #151068... if uniscribe shaping comes up with + no glyphs, fall back to non-uniscribe shaping. + Wed Dec 15 22:09:42 2004 Owen Taylor Add pixel sizes for fonts (#119081, patch from Chris Lahey) diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 2f519d6c..cf92e153 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Wed Dec 15 23:13:57 2004 Owen Taylor + + * modules/basic/basic-win32.c (uniscribe_shape): Emergency + fix for #151068... if uniscribe shaping comes up with + no glyphs, fall back to non-uniscribe shaping. + Wed Dec 15 22:09:42 2004 Owen Taylor Add pixel sizes for fonts (#119081, patch from Chris Lahey) diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c index 4b173f0d..236532c6 100644 --- a/modules/basic/basic-win32.c +++ b/modules/basic/basic-win32.c @@ -931,7 +931,7 @@ uniscribe_shape (PangoFont *font, if (hfont != NULL) pango_win32_font_cache_unload (font_cache, hfont); - return retval; + return retval && glyphs->num_glyphs > 0; } static gboolean -- cgit v1.2.1