diff options
Diffstat (limited to 'nx-X11/programs')
| -rw-r--r-- | nx-X11/programs/Xserver/mi/mibitblt.c | 6 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/mi/mispans.c | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/mi/mibitblt.c b/nx-X11/programs/Xserver/mi/mibitblt.c index 67d36a742..7b1aca794 100644 --- a/nx-X11/programs/Xserver/mi/mibitblt.c +++ b/nx-X11/programs/Xserver/mi/mibitblt.c @@ -666,7 +666,7 @@ miGetImage(pDraw, sx, sy, w, h, format, planeMask, pDst) { if ( (((1<<depth)-1)&planeMask) != (1<<depth)-1 ) { - xPoint pt; + xPoint xpt; pGC = GetScratchGC(depth, pDraw->pScreen); if (!pGC) @@ -683,9 +683,9 @@ miGetImage(pDraw, sx, sy, w, h, format, planeMask, pDst) * Clear the pixmap before doing anything else */ ValidateGC((DrawablePtr)pPixmap, pGC); - pt.x = pt.y = 0; + xpt.x = xpt.y = 0; width = w; - (*pGC->ops->FillSpans)((DrawablePtr)pPixmap, pGC, 1, &pt, &width, + (*pGC->ops->FillSpans)((DrawablePtr)pPixmap, pGC, 1, &xpt, &width, TRUE); /* alu is already GXCopy */ diff --git a/nx-X11/programs/Xserver/mi/mispans.c b/nx-X11/programs/Xserver/mi/mispans.c index a8762d323..c731f2a03 100644 --- a/nx-X11/programs/Xserver/mi/mispans.c +++ b/nx-X11/programs/Xserver/mi/mispans.c @@ -462,12 +462,12 @@ void miFillUniqueSpanGroup(pDraw, pGC, spanGroup) ysizes[index] * sizeof(int)); if (!newpoints || !newwidths) { - int i; + int k; - for (i = 0; i < ylength; i++) + for (k = 0; k < ylength; k++) { - free (yspans[i].points); - free (yspans[i].widths); + free (yspans[k].points); + free (yspans[k].widths); } free (yspans); free (ysizes); @@ -494,8 +494,6 @@ void miFillUniqueSpanGroup(pDraw, pGC, spanGroup) widths = (int *) malloc(count * sizeof(int)); if (!points || !widths) { - int i; - for (i = 0; i < ylength; i++) { free (yspans[i].points); |