aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/mi/mifillarc.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 20:12:58 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 20:12:58 +0000
commit2553bdd7c359cd87525d367761c86932cec5adff (patch)
treeae71245933c98474a699d3e392de5820879b2018 /xorg-server/mi/mifillarc.c
parente2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff)
parent4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff)
downloadvcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz
vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2
vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/mi/mifillarc.c')
-rw-r--r--xorg-server/mi/mifillarc.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/xorg-server/mi/mifillarc.c b/xorg-server/mi/mifillarc.c
index f68ddf468..f2ab5ceb1 100644
--- a/xorg-server/mi/mifillarc.c
+++ b/xorg-server/mi/mifillarc.c
@@ -53,9 +53,7 @@ Author: Bob Scheifler, MIT X Consortium
#define Dcos(d) cos((double)d*(M_PI/11520.0))
_X_EXPORT void
-miFillArcSetup(arc, info)
- xArc *arc;
- miFillArcRec *info;
+miFillArcSetup(xArc *arc, miFillArcRec *info)
{
info->y = arc->height >> 1;
info->dy = arc->height & 1;
@@ -307,10 +305,7 @@ miGetPieEdge(
}
_X_EXPORT void
-miFillArcSliceSetup(arc, slice, pGC)
- xArc *arc;
- miArcSliceRec *slice;
- GCPtr pGC;
+miFillArcSliceSetup(xArc *arc, miArcSliceRec *slice, GCPtr pGC)
{
int angle1, angle2;
@@ -776,11 +771,7 @@ miFillArcSliceD(
* fill each arc as it comes.
*/
_X_EXPORT void
-miPolyFillArc(pDraw, pGC, narcs, parcs)
- DrawablePtr pDraw;
- GCPtr pGC;
- int narcs;
- xArc *parcs;
+miPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
{
int i;
xArc *arc;
@@ -788,7 +779,7 @@ miPolyFillArc(pDraw, pGC, narcs, parcs)
for(i = narcs, arc = parcs; --i >= 0; arc++)
{
if (miFillArcEmpty(arc))
- continue;;
+ continue;
if ((arc->angle2 >= FULLCIRCLE) || (arc->angle2 <= -FULLCIRCLE))
{
if (miCanFillArc(arc))