diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-0 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-2 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
-rw-r--r-- | pango/pangoxft-font.c | 21 |
8 files changed, 61 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Fri Mar 1 14:37:47 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoxft-font.c (pango_xft_font_get_glyph_extents): + Treat glyph 0 as an 0 size, non-drawn glyph consistent + with other backends. (#71931) + Fri Mar 1 14:25:22 2002 Owen Taylor <otaylor@redhat.com> * pango/modules.c: Don't crash on out-of-BMP values. diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 8655761a..4aba9959 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,9 @@ +Fri Mar 1 14:37:47 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoxft-font.c (pango_xft_font_get_glyph_extents): + Treat glyph 0 as an 0 size, non-drawn glyph consistent + with other backends. (#71931) + Fri Mar 1 14:25:22 2002 Owen Taylor <otaylor@redhat.com> * pango/modules.c: Don't crash on out-of-BMP values. diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 8655761a..4aba9959 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Fri Mar 1 14:37:47 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoxft-font.c (pango_xft_font_get_glyph_extents): + Treat glyph 0 as an 0 size, non-drawn glyph consistent + with other backends. (#71931) + Fri Mar 1 14:25:22 2002 Owen Taylor <otaylor@redhat.com> * pango/modules.c: Don't crash on out-of-BMP values. diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 8655761a..4aba9959 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,9 @@ +Fri Mar 1 14:37:47 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoxft-font.c (pango_xft_font_get_glyph_extents): + Treat glyph 0 as an 0 size, non-drawn glyph consistent + with other backends. (#71931) + Fri Mar 1 14:25:22 2002 Owen Taylor <otaylor@redhat.com> * pango/modules.c: Don't crash on out-of-BMP values. diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 8655761a..4aba9959 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Fri Mar 1 14:37:47 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoxft-font.c (pango_xft_font_get_glyph_extents): + Treat glyph 0 as an 0 size, non-drawn glyph consistent + with other backends. (#71931) + Fri Mar 1 14:25:22 2002 Owen Taylor <otaylor@redhat.com> * pango/modules.c: Don't crash on out-of-BMP values. diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 8655761a..4aba9959 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Fri Mar 1 14:37:47 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoxft-font.c (pango_xft_font_get_glyph_extents): + Treat glyph 0 as an 0 size, non-drawn glyph consistent + with other backends. (#71931) + Fri Mar 1 14:25:22 2002 Owen Taylor <otaylor@redhat.com> * pango/modules.c: Don't crash on out-of-BMP values. diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 8655761a..4aba9959 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Fri Mar 1 14:37:47 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoxft-font.c (pango_xft_font_get_glyph_extents): + Treat glyph 0 as an 0 size, non-drawn glyph consistent + with other backends. (#71931) + Fri Mar 1 14:25:22 2002 Owen Taylor <otaylor@redhat.com> * pango/modules.c: Don't crash on out-of-BMP values. diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index fef5e06a..30246d39 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -306,7 +306,7 @@ pango_xft_real_render (Display *display, } } - else + else if (glyph) { if (draw) XftDrawString32 (draw, color, xft_font, @@ -521,7 +521,7 @@ pango_xft_font_get_glyph_extents (PangoFont *font, logical_rect->height = (xft_font->ascent + xft_font->descent) * PANGO_SCALE; } } - else + else if (glyph) { XftTextExtents32 (display, xft_font, &glyph, 1, &extents); @@ -541,6 +541,23 @@ pango_xft_font_get_glyph_extents (PangoFont *font, logical_rect->height = (xft_font->ascent + xft_font->descent) * PANGO_SCALE; } } + else + { + if (ink_rect) + { + ink_rect->x = 0; + ink_rect->width = 0; + ink_rect->y = 0; + ink_rect->height = 0; + } + if (logical_rect) + { + logical_rect->x = 0; + logical_rect->width = 0; + logical_rect->y = 0; + logical_rect->height = 0; + } + } } static PangoMap * |