summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
Diffstat (limited to 'pango')
-rw-r--r--pango/pangoxft-font.c21
1 files changed, 19 insertions, 2 deletions
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 *