From 6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 5 Nov 2017 21:25:49 +0100 Subject: Lift mi to xorg-xserver-7.1/1.1.0 state I left out glx changes to miinitext.c for now. --- nx-X11/programs/Xserver/mi/miwideline.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/mi/miwideline.c') diff --git a/nx-X11/programs/Xserver/mi/miwideline.c b/nx-X11/programs/Xserver/mi/miwideline.c index 8fcf351a7..8d73eb979 100644 --- a/nx-X11/programs/Xserver/mi/miwideline.c +++ b/nx-X11/programs/Xserver/mi/miwideline.c @@ -119,7 +119,8 @@ miFillPolyHelper (pDrawable, pGC, pixel, spanData, y, overall_height, oldPixel = pGC->fgPixel; if (pixel != oldPixel) { - DoChangeGC (pGC, GCForeground, (XID *)&pixel, FALSE); + XID tmpPixel = (XID)pixel; + DoChangeGC (pGC, GCForeground, &tmpPixel, FALSE); ValidateGC (pDrawable, pGC); } } @@ -217,7 +218,8 @@ miFillRectPolyHelper ( 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); @@ -1068,7 +1070,8 @@ miLineArc ( oldPixel = pGC->fgPixel; if (pixel != oldPixel) { - DoChangeGC(pGC, GCForeground, (XID *)&pixel, FALSE); + XID tmpPixel = (XID)pixel; + DoChangeGC(pGC, GCForeground, &tmpPixel, FALSE); ValidateGC (pDraw, pGC); } } -- cgit v1.2.3