[PATCH] render: rename SetBit to RenderSetBit.
Peter Hutterer
peter.hutterer at who-t.net
Wed Jan 28 19:09:25 PST 2009
Avoiding namespace collision with the SetBit macro soon to be used in the
input code.
---
render/render.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/render/render.c b/render/render.c
index b6e9567..658b170 100644
--- a/render/render.c
+++ b/render/render.c
@@ -1505,7 +1505,7 @@ ProcRenderFillRectangles (ClientPtr client)
}
static void
-SetBit (unsigned char *line, int x, int bit)
+RenderSetBit (unsigned char *line, int x, int bit)
{
unsigned char mask;
@@ -1676,8 +1676,8 @@ ProcRenderCreateCursor (ClientPtr client)
{
CARD32 a = ((p >> 24));
- SetBit (mskline, x, a != 0);
- SetBit (srcline, x, a != 0 && p == twocolor[0]);
+ RenderSetBit (mskline, x, a != 0);
+ RenderSetBit (srcline, x, a != 0 && p == twocolor[0]);
}
else
{
@@ -1685,9 +1685,9 @@ ProcRenderCreateCursor (ClientPtr client)
CARD32 i = ((CvtR8G8B8toY15(p) >> 7) * DITHER_SIZE + 127) / 255;
CARD32 d = orderedDither[y&(DITHER_DIM-1)][x&(DITHER_DIM-1)];
/* Set mask from dithered alpha value */
- SetBit(mskline, x, a > d);
+ RenderSetBit(mskline, x, a > d);
/* Set src from dithered intensity value */
- SetBit(srcline, x, a > d && i <= d);
+ RenderSetBit(srcline, x, a > d && i <= d);
}
}
srcline += stride;
--
1.6.0.6
More information about the xorg
mailing list