aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/mi/miwideline.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2018-02-27 02:56:01 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-27 02:56:01 +0100
commit3fffa5bd81650ffae994df1158d17c9e1d9410d2 (patch)
tree6cf8e93ad29709867617cb03b89bfbc6356126c5 /nx-X11/programs/Xserver/mi/miwideline.c
parenteaae96101dfb2b341c61060e7cf280bf3b9084e0 (diff)
parent7368b45408690620b8a9c051670888b684e44637 (diff)
downloadnx-libs-3fffa5bd81650ffae994df1158d17c9e1d9410d2.tar.gz
nx-libs-3fffa5bd81650ffae994df1158d17c9e1d9410d2.tar.bz2
nx-libs-3fffa5bd81650ffae994df1158d17c9e1d9410d2.zip
Merge branch 'uli42-pr/update_mi' into 3.6.x
Attributes GH PR #650: https://github.com/ArcticaProject/nx-libs/pull/650
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);
}
}