Attachment 5133 Details for Bug 6438 – Proposed patch by IBM

[patch] Proposed patch by IBM

diff.vsw4failBE64 (text/plain), 2.48 KB, created by Egbert Eich on 2006-03-31 04:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2006-03-31 04:10:00 UTC

Size: 2.48 KB

patch

obsolete

>Index: xorg/include/colormapst.h
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/include/colormapst.h,v
>retrieving revision 1.3
>diff -u -r1.3 colormapst.h
>--- xorg/include/colormapst.h	24 Aug 2005 11:18:30 -0000	1.3
>+++ xorg/include/colormapst.h	30 Mar 2006 18:07:38 -0000
>@@ -97,7 +97,7 @@
> {
>     VisualPtr	pVisual;
>     short	class;		/* PseudoColor or DirectColor */
>-    long	mid;		/* client's name for colormap */
>+    XID		mid;		/* client's name for colormap */
>     ScreenPtr	pScreen;	/* screen map is associated with */
>     short	flags;		/* 1 = IsDefault
> 				 * 2 = AllAllocated */
>Index: xorg/include/pixmapstr.h
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/include/pixmapstr.h,v
>retrieving revision 1.5
>diff -u -r1.5 pixmapstr.h
>--- xorg/include/pixmapstr.h	24 Aug 2005 11:18:31 -0000	1.5
>+++ xorg/include/pixmapstr.h	30 Mar 2006 18:07:38 -0000
>@@ -58,7 +58,7 @@
>     unsigned char	class;	/* specific to type */
>     unsigned char	depth;
>     unsigned char	bitsPerPixel;
>-    unsigned long	id;	/* resource id */
>+    XID			id;	/* resource id */
>     short		x;	/* window: screen absolute, pixmap: 0 */
>     short		y;	/* window: screen absolute, pixmap: 0 */
>     unsigned short	width;
>Index: xorg/mi/miwideline.c
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/mi/miwideline.c,v
>retrieving revision 1.6
>diff -u -r1.6 miwideline.c
>--- xorg/mi/miwideline.c	15 Feb 2006 19:05:54 -0000	1.6
>+++ xorg/mi/miwideline.c	30 Mar 2006 18:07:38 -0000
>@@ -121,7 +121,8 @@
>     	oldPixel = pGC->fgPixel;
>     	if (pixel != oldPixel)
>     	{
>-    	    DoChangeGC (pGC, GCForeground, (XID *)&pixel, FALSE);
>+	    XID tmpPixel = (XID)pixel;
>+    	    DoChangeGC (pGC, GCForeground, tmpPixel, FALSE);
>     	    ValidateGC (pDrawable, pGC);
>     	}
>     }
>@@ -219,7 +220,8 @@
>     	oldPixel = pGC->fgPixel;
>     	if (pixel != oldPixel)
>     	{
>-    	    DoChangeGC (pGC, GCForeground, (XID *)&pixel, FALSE);
>+	    XID tmpPixel = (XID)pixel;
>+    	    DoChangeGC (pGC, GCForeground, tmpPixel, FALSE);
>     	    ValidateGC (pDrawable, pGC);
>     	}
> 	(*pGC->ops->PolyFillRect) (pDrawable, pGC, 1, &rect);
>@@ -1070,7 +1072,8 @@
>     	oldPixel = pGC->fgPixel;
>     	if (pixel != oldPixel)
>     	{
>-	    DoChangeGC(pGC, GCForeground, (XID *)&pixel, FALSE);
>+	    XID tmpPixel = (XID)pixel;
>+	    DoChangeGC(pGC, GCForeground, tmpPixel, FALSE);
> 	    ValidateGC (pDraw, pGC);
>     	}
>     }

Actions: View | Splinter Review

Attachments on bug 6438: 5133 | 7097

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.