frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

render: rename SetBit to RenderSetBit. 

Avoiding namespace collision with the SetBit macro soon to be used in the
input code.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2008-12-10 12:31:59 +00:00
parent 940a7aeebc
commit 8460425740
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
render/render.c
View File

@ -1505,7 +1505,7 @@ ProcRenderFillRectangles (ClientPtr client)
} }
static void static void
SetBit (unsigned char *line, int x, int bit) RenderSetBit (unsigned char *line, int x, int bit)
{ {
unsigned char mask; unsigned char mask;
@ -1676,8 +1676,8 @@ ProcRenderCreateCursor (ClientPtr client)
{ {
CARD32 a = ((p >> 24)); CARD32 a = ((p >> 24));
SetBit (mskline, x, a != 0); RenderSetBit (mskline, x, a != 0);
SetBit (srcline, x, a != 0 && p == twocolor[0]); RenderSetBit (srcline, x, a != 0 && p == twocolor[0]);
} }
else else
{ {
@ -1685,9 +1685,9 @@ ProcRenderCreateCursor (ClientPtr client)
CARD32 i = ((CvtR8G8B8toY15(p) >> 7) * DITHER_SIZE + 127) / 255; CARD32 i = ((CvtR8G8B8toY15(p) >> 7) * DITHER_SIZE + 127) / 255;
CARD32 d = orderedDither[y&(DITHER_DIM-1)][x&(DITHER_DIM-1)]; CARD32 d = orderedDither[y&(DITHER_DIM-1)][x&(DITHER_DIM-1)];
/* Set mask from dithered alpha value */ /* Set mask from dithered alpha value */
SetBit(mskline, x, a > d); RenderSetBit(mskline, x, a > d);
/* Set src from dithered intensity value */ /* Set src from dithered intensity value */
SetBit(srcline, x, a > d && i <= d); RenderSetBit(srcline, x, a > d && i <= d);
} }
} }
srcline += stride; srcline += stride;