diff options
| -rw-r--r-- | mi/miarc.c | 2 | ||||
| -rw-r--r-- | mi/miline.h | 2 | ||||
| -rw-r--r-- | mi/miscrinit.c | 3 | ||||
| -rw-r--r-- | mi/mizerarc.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/mi/miarc.c b/mi/miarc.c index 12c360c7a..a3e258030 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -1884,7 +1884,7 @@ miComputeArcs ( int arcsJoin; int selfJoin; - int iDash = 0, dashRemaining; + int iDash = 0, dashRemaining = 0; int iDashStart = 0, dashRemainingStart = 0, iphaseStart; int startAngle, spanAngle, endAngle, backwards = 0; int prevDashAngle, dashAngle; diff --git a/mi/miline.h b/mi/miline.h index e1dd6d553..b5f706dbf 100644 --- a/mi/miline.h +++ b/mi/miline.h @@ -120,7 +120,7 @@ extern _X_EXPORT void miSetZeroLineBias( t = y1; y1 = y2; y2 = t;\ } -#define miGetZeroLineBias(_pScreen) ((unsigned long) \ +#define miGetZeroLineBias(_pScreen) ((unsigned long) (unsigned long*)\ dixLookupPrivate(&(_pScreen)->devPrivates, miZeroLineScreenKey)) #define CalcLineDeltas(_x1,_y1,_x2,_y2,_adx,_ady,_sx,_sy,_SX,_SY,_octant) \ diff --git a/mi/miscrinit.c b/mi/miscrinit.c index 93a6c4bda..fe768f4a9 100644 --- a/mi/miscrinit.c +++ b/mi/miscrinit.c @@ -308,5 +308,6 @@ DevPrivateKey miZeroLineScreenKey = &miZeroLineScreenKeyIndex; void miSetZeroLineBias(ScreenPtr pScreen, unsigned int bias) { - dixSetPrivate(&pScreen->devPrivates, miZeroLineScreenKey, (pointer)bias); + dixSetPrivate(&pScreen->devPrivates, miZeroLineScreenKey, + (unsigned long *)(unsigned long)bias); } diff --git a/mi/mizerarc.c b/mi/mizerarc.c index 9c8df3415..ad84c0123 100644 --- a/mi/mizerarc.c +++ b/mi/mizerarc.c @@ -709,7 +709,7 @@ miZeroPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) int n, maxw = 0; xArc *arc; int i; - DDXPointPtr points, pts, oddPts; + DDXPointPtr points, pts, oddPts = NULL; DDXPointPtr pt; int numPts; Bool dospans; |