aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/mi/miwideline.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-11-05 21:25:49 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-27 02:42:18 +0100
commit6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060 (patch)
tree4786ef47d0905699657939e469414ab1438ff2e8 /nx-X11/programs/Xserver/mi/miwideline.c
parent23dd2959ba5e87d078436b2389d084b76581d12f (diff)
downloadnx-libs-6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060.tar.gz
nx-libs-6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060.tar.bz2
nx-libs-6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060.zip
Lift mi to xorg-xserver-7.1/1.1.0 state
I left out glx changes to miinitext.c for now.
Diffstat (limited to 'nx-X11/programs/Xserver/mi/miwideline.c')
-rw-r--r--nx-X11/programs/Xserver/mi/miwideline.c9
1 files changed, 6 insertions, 3 deletions
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);
}
}