[cairo-commit] Branch '1.0' - src/cairo-xlib-surface.c

[Carl Worth]

 src/cairo-xlib-surface.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 71e9372bbdc5c85e14dfc1156269ae6f74802f4d (from e94251861565ed154e15ca3a7198ffe3828536fe)
Author: Carl Worth <cworth at cworth.org>
Date:   Wed Jul 26 13:04:25 2006 -0700

    Fix text disappearing after space (bug #6617)
    
    What happened here is that when fixing bug #5734 we cahnged the
    glyph image cache lookup to never return a NULL pointer, but to
    instead return a 0x0 image surface. We didn't also update code
    that was looking for a NULL pointer here, and as such we were
    calling XRenderAddGlyphs with a 0x0 image which apparently
    tickles a bug in some X servers.

diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index 0efabf4..10ecbe5 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -2063,7 +2063,7 @@ _xlib_glyphset_cache_create_entry (void 
     entry->key = *key;
     _cairo_unscaled_font_reference (entry->key.unscaled);
 
-    if (!im->image) {
+    if (im->image->width == 0 || im->image->height == 0) {
 	entry->glyph = None;
 	entry->glyphset = None;
 	entry->key.base.memory = 0;