Attachment 6352 Details for Bug 6617 – Patch for cairo 1.0.4

[patch] Patch for cairo 1.0.4

6617.patch (text/plain), 1019 bytes, created by Carl Worth on 2006-07-26 13:45:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Worth

Created: 2006-07-26 13:45:43 UTC

Size: 1019 bytes

patch

obsolete

>commit 71e9372bbdc5c85e14dfc1156269ae6f74802f4d
>Author: Carl Worth <cworth@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;

Actions: View | Splinter Review

Attachments on bug 6617: 5906 | 6034 | 6041 | 6209 | 6351 | 6352

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.