diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-12-05 15:36:12 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-12-05 15:36:12 +0000 |
| commit | a90ee792d96752ad1b71b9ada922fa6afe478c99 (patch) | |
| tree | 6143b00f7646951d23dfe2a4fe2992ca40b77069 /xserver/mi/mipolypnt.c | |
| parent | bc97d4ecc0aa9e1b823565b07282f848700bd11a (diff) | |
Upgrade to xorg-server 1.9.2.
Tested by ajacoutot@, krw@, shadchin@ and jasper@ on various configurations
including multihead with both zaphod and xrandr.
Diffstat (limited to 'xserver/mi/mipolypnt.c')
| -rw-r--r-- | xserver/mi/mipolypnt.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xserver/mi/mipolypnt.c b/xserver/mi/mipolypnt.c index 12771ee4e..3e43a523e 100644 --- a/xserver/mi/mipolypnt.c +++ b/xserver/mi/mipolypnt.c @@ -68,12 +68,12 @@ miPolyPoint( int xorg; int yorg; int nptTmp; - XID fsOld, fsNew; + ChangeGCVal fsOld, fsNew; int *pwidthInit, *pwidth; int i; xPoint *ppt; - if(!(pwidthInit = xalloc(npt * sizeof(int)))) + if(!(pwidthInit = malloc(npt * sizeof(int)))) return; /* make pointlist origin relative */ @@ -103,11 +103,11 @@ miPolyPoint( } } - fsOld = pGC->fillStyle; - fsNew = FillSolid; + fsOld.val = pGC->fillStyle; + fsNew.val = FillSolid; if(pGC->fillStyle != FillSolid) { - DoChangeGC(pGC, GCFillStyle, &fsNew, 0); + ChangeGC(NullClient, pGC, GCFillStyle, &fsNew); ValidateGC(pDrawable, pGC); } pwidth = pwidthInit; @@ -115,11 +115,11 @@ miPolyPoint( *pwidth++ = 1; (*pGC->ops->FillSpans)(pDrawable, pGC, npt, pptInit, pwidthInit, FALSE); - if(fsOld != FillSolid) + if(fsOld.val != FillSolid) { - DoChangeGC(pGC, GCFillStyle, &fsOld, 0); + ChangeGC(NullClient, pGC, GCFillStyle, &fsOld); ValidateGC(pDrawable, pGC); } - xfree(pwidthInit); + free(pwidthInit); } |