aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/mi/miwideline.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-11 15:11:55 +0000
committermarha <marha@users.sourceforge.net>2010-05-11 15:11:55 +0000
commit820f57fadfe7d14e01e0284ff8a23298a0f59b20 (patch)
tree14b8a09656a95a710b976895d89f02e79ad30298 /xorg-server/mi/miwideline.h
parent20a84cc5bb91a8708cd9e9ebcd1715ceeab8dae2 (diff)
downloadvcxsrv-820f57fadfe7d14e01e0284ff8a23298a0f59b20.tar.gz
vcxsrv-820f57fadfe7d14e01e0284ff8a23298a0f59b20.tar.bz2
vcxsrv-820f57fadfe7d14e01e0284ff8a23298a0f59b20.zip
svn merge -r581:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/mi/miwideline.h')
-rw-r--r--xorg-server/mi/miwideline.h64
1 files changed, 0 insertions, 64 deletions
diff --git a/xorg-server/mi/miwideline.h b/xorg-server/mi/miwideline.h
index 1f615d689..1665ebfb1 100644
--- a/xorg-server/mi/miwideline.h
+++ b/xorg-server/mi/miwideline.h
@@ -31,30 +31,6 @@ from The Open Group.
#include "mispans.h"
#include "mifpoly.h" /* for ICEIL */
-/*
- * interface data to span-merging polygon filler
- */
-
-typedef struct _SpanData {
- SpanGroup fgGroup, bgGroup;
-} SpanDataRec, *SpanDataPtr;
-
-#define AppendSpanGroup(pGC, pixel, spanPtr, spanData) { \
- SpanGroup *group, *othergroup = NULL; \
- if (pixel == pGC->fgPixel) \
- { \
- group = &spanData->fgGroup; \
- if (pGC->lineStyle == LineDoubleDash) \
- othergroup = &spanData->bgGroup; \
- } \
- else \
- { \
- group = &spanData->bgGroup; \
- othergroup = &spanData->fgGroup; \
- } \
- miAppendSpans (group, othergroup, spanPtr); \
-}
-
/*
* Polygon edge description for integer wide-line routines
*/
@@ -99,46 +75,6 @@ typedef struct _LineFace {
* macros for polygon fillers
*/
-#define MIPOLYRELOADLEFT if (!left_height && left_count) { \
- left_height = left->height; \
- left_x = left->x; \
- left_stepx = left->stepx; \
- left_signdx = left->signdx; \
- left_e = left->e; \
- left_dy = left->dy; \
- left_dx = left->dx; \
- --left_count; \
- ++left; \
- }
-
-#define MIPOLYRELOADRIGHT if (!right_height && right_count) { \
- right_height = right->height; \
- right_x = right->x; \
- right_stepx = right->stepx; \
- right_signdx = right->signdx; \
- right_e = right->e; \
- right_dy = right->dy; \
- right_dx = right->dx; \
- --right_count; \
- ++right; \
- }
-
-#define MIPOLYSTEPLEFT left_x += left_stepx; \
- left_e += left_dx; \
- if (left_e > 0) \
- { \
- left_x += left_signdx; \
- left_e -= left_dy; \
- }
-
-#define MIPOLYSTEPRIGHT right_x += right_stepx; \
- right_e += right_dx; \
- if (right_e > 0) \
- { \
- right_x += right_signdx; \
- right_e -= right_dy; \
- }
-
#define MILINESETPIXEL(pDrawable, pGC, pixel, oldPixel) { \
oldPixel = pGC->fgPixel; \
if (pixel != oldPixel) { \