diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2008-12-10 12:31:59 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-10-02 18:14:34 -0700 |
| commit | d88d16730ed0a55382890adb6494d1b8d9faf6cf (patch) | |
| tree | 3def3ff22b23175179c380d12e184f20dc357433 | |
| parent | 9af39f090ab4a6bde225d3dd7a954ba866751b5b (diff) | |
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>
(cherry picked from commit 8460425740c72e58bcb897557f033e2836251160)
| -rw-r--r-- | render/render.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/render/render.c b/render/render.c index b53e878bd..a5bd9e816 100644 --- a/render/render.c +++ b/render/render.c @@ -1451,7 +1451,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; @@ -1623,8 +1623,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 { @@ -1632,9 +1632,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; |