diff options
author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/mi/mipolyutil.c | |
parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/mi/mipolyutil.c')
-rw-r--r-- | xorg-server/mi/mipolyutil.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/xorg-server/mi/mipolyutil.c b/xorg-server/mi/mipolyutil.c index 6ec860a25..ed41a7d1a 100644 --- a/xorg-server/mi/mipolyutil.c +++ b/xorg-server/mi/mipolyutil.c @@ -161,13 +161,8 @@ miInsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE, int scanline, */ Bool -miCreateETandAET(count, pts, ET, AET, pETEs, pSLLBlock) - int count; - DDXPointPtr pts; - EdgeTable *ET; - EdgeTableEntry *AET; - EdgeTableEntry *pETEs; - ScanLineListBlock *pSLLBlock; +miCreateETandAET(int count, DDXPointPtr pts, EdgeTable *ET, EdgeTableEntry *AET, + EdgeTableEntry *pETEs, ScanLineListBlock *pSLLBlock) { DDXPointPtr top, bottom; DDXPointPtr PrevPt, CurrPt; @@ -257,8 +252,7 @@ miCreateETandAET(count, pts, ET, AET, pETEs, pSLLBlock) */ void -miloadAET(AET, ETEs) - EdgeTableEntry *AET, *ETEs; +miloadAET(EdgeTableEntry *AET, EdgeTableEntry *ETEs) { EdgeTableEntry *pPrevAET; EdgeTableEntry *tmp; @@ -305,8 +299,7 @@ miloadAET(AET, ETEs) * */ void -micomputeWAET(AET) - EdgeTableEntry *AET; +micomputeWAET(EdgeTableEntry *AET) { EdgeTableEntry *pWETE; int inside = 1; @@ -344,8 +337,7 @@ micomputeWAET(AET) */ int -miInsertionSort(AET) - EdgeTableEntry *AET; +miInsertionSort(EdgeTableEntry *AET) { EdgeTableEntry *pETEchase; EdgeTableEntry *pETEinsert; @@ -381,8 +373,7 @@ miInsertionSort(AET) * Clean up our act. */ void -miFreeStorage(pSLLBlock) - ScanLineListBlock *pSLLBlock; +miFreeStorage(ScanLineListBlock *pSLLBlock) { ScanLineListBlock *tmpSLLBlock; |