Attachment 51 Details for Bug 106 – Patch for fix the bug with Xft 2.0

[patch] Patch for fix the bug with Xft 2.0

xft-2.0-garbage.patch (text/plain), 1.29 KB, created by Frederic Crozat on 2003-08-19 07:36:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Crozat

Created: 2003-08-19 07:36:18 UTC

Size: 1.29 KB

patch

obsolete

>Index: xftrender.c
>===================================================================
>RCS file: /home/x-cvs/xc/lib/Xft/xftrender.c,v
>retrieving revision 1.15
>diff -u -r1.15 xftrender.c
>--- xftrender.c	14 Dec 2002 01:59:38 -0000	1.15
>+++ xftrender.c	10 Mar 2003 16:40:58 -0000
>@@ -416,6 +416,7 @@
>     FcBool	    glyphs_loaded;
>     int		    nelt;
>     int		    x, y;
>+    XRenderPictFormat	*format = 0;
>     
>     if (!nglyphs)
> 	return;
>@@ -443,6 +444,8 @@
> 	    goto bail1;
> 	if (!font->glyphset)
> 	    goto bail1;
>+	if (!format || font->format->depth > format->depth)
>+	    format = font->format;
>     }
>     
>     /*
>@@ -586,17 +589,17 @@
>     }
>     switch (width) {
>     case 1:
>-	XRenderCompositeText8 (dpy, op, src, dst, firstFont->format,
>+	XRenderCompositeText8 (dpy, op, src, dst, format,
> 			       srcx, srcy, glyphs[0].x, glyphs[0].y,
> 			       elts, nelt);
> 	break;
>     case 2:
>-	XRenderCompositeText16 (dpy, op, src, dst, firstFont->format,
>+	XRenderCompositeText16 (dpy, op, src, dst, format,
> 				srcx, srcy, glyphs[0].x, glyphs[0].y,
> 				(XGlyphElt16 *) elts, nelt);
> 	break;
>     case 4:
>-	XRenderCompositeText32 (dpy, op, src, dst, firstFont->format,
>+	XRenderCompositeText32 (dpy, op, src, dst, format,
> 				srcx, srcy, glyphs[0].x, glyphs[0].y,
> 				(XGlyphElt32 *) elts, nelt);
> 	break;
>

Actions: View | Splinter Review

Attachments on bug 106: 51

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.