summaryrefslogtreecommitdiff
path: root/mi/mizerarc.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:49:22 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:49:22 +0000
commitd568221710959cf7d783e6ff0fb80fb43a231124 (patch)
tree8d6f039393294c6ffac8533639afdebe5d68bfc1 /mi/mizerarc.c
parent9508a382f8a9f241dab097d921b6d290c1c3a776 (diff)
XFree86 4.3.0.1
Diffstat (limited to 'mi/mizerarc.c')
-rw-r--r--mi/mizerarc.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/mi/mizerarc.c b/mi/mizerarc.c
index def8d8c51..971e2cb03 100644
--- a/mi/mizerarc.c
+++ b/mi/mizerarc.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.6 2001/12/14 20:00:28 dawes Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
@@ -502,12 +503,14 @@ miZeroArcPts(arc, pts)
}
static void
-miZeroArcDashPts(pGC, arc, dinfo, points, maxPts, evenPts, oddPts)
- GCPtr pGC;
- xArc *arc;
- DashInfo *dinfo;
- int maxPts;
- register DDXPointPtr points, *evenPts, *oddPts;
+miZeroArcDashPts(
+ GCPtr pGC,
+ xArc *arc,
+ DashInfo *dinfo,
+ register DDXPointPtr points,
+ int maxPts,
+ register DDXPointPtr *evenPts,
+ register DDXPointPtr *oddPts )
{
miZeroArcRec info;
register int x, y, a, b, d, mask;
@@ -710,14 +713,14 @@ miZeroPolyArc(pDraw, pGC, narcs, parcs)
xArc *parcs;
{
int maxPts = 0;
- register int n, maxw;
+ register int n, maxw = 0;
register xArc *arc;
register int i;
DDXPointPtr points, pts, oddPts;
register DDXPointPtr pt;
int numPts;
Bool dospans;
- int *widths;
+ int *widths = NULL;
XID fgPixel = pGC->fgPixel;
DashInfo dinfo;
@@ -738,7 +741,7 @@ miZeroPolyArc(pDraw, pGC, narcs, parcs)
if (!maxPts)
return;
numPts = maxPts << 2;
- dospans = (pGC->lineStyle != LineSolid) || (pGC->fillStyle != FillSolid);
+ dospans = (pGC->fillStyle != FillSolid);
if (dospans)
{
widths = (int *)ALLOCATE_LOCAL(sizeof(int) * numPts);