summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiarhei Siamashka <siarhei.siamashka@gmail.com>2012-12-16 02:03:58 (GMT)
committerSiarhei Siamashka <siarhei.siamashka@gmail.com>2012-12-20 01:14:21 (GMT)
commit66c429282282176cdb5913b7396116c28725363e (patch)
treeb1eed5ff7a31cd12996cf19942820d9bd1986530
parent4dfda2adfe2eb1130fc27b1da35df778284afd91 (diff)
downloadpixman-66c429282282176cdb5913b7396116c28725363e.tar.gz
pixman-66c429282282176cdb5913b7396116c28725363e.tar.xz
Rename 'xor' variable to 'filler' (because 'xor' is a C++ keyword)
-rw-r--r--pixman/pixman-fast-path.c26
-rw-r--r--pixman/pixman-implementation.c4
-rw-r--r--pixman/pixman-mmx.c20
-rw-r--r--pixman/pixman-private.h4
-rw-r--r--pixman/pixman-sse2.c22
-rw-r--r--pixman/pixman.c4
6 files changed, 40 insertions, 40 deletions
diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
index 420a3d8..c625e0c 100644
--- a/pixman/pixman-fast-path.c
+++ b/pixman/pixman-fast-path.c
@@ -2067,12 +2067,12 @@ pixman_fill1 (uint32_t *bits,
int y,
int width,
int height,
- uint32_t xor)
+ uint32_t filler)
{
uint32_t *dst = bits + y * stride + (x >> 5);
int offs = x & 31;
- if (xor & 1)
+ if (filler & 1)
{
while (height--)
{
@@ -2097,11 +2097,11 @@ pixman_fill8 (uint32_t *bits,
int y,
int width,
int height,
- uint32_t xor)
+ uint32_t filler)
{
int byte_stride = stride * (int) sizeof (uint32_t);
uint8_t *dst = (uint8_t *) bits;
- uint8_t v = xor & 0xff;
+ uint8_t v = filler & 0xff;
int i;
dst = dst + y * byte_stride + x;
@@ -2122,12 +2122,12 @@ pixman_fill16 (uint32_t *bits,
int y,
int width,
int height,
- uint32_t xor)
+ uint32_t filler)
{
int short_stride =
(stride * (int)sizeof (uint32_t)) / (int)sizeof (uint16_t);
uint16_t *dst = (uint16_t *)bits;
- uint16_t v = xor & 0xffff;
+ uint16_t v = filler & 0xffff;
int i;
dst = dst + y * short_stride + x;
@@ -2148,7 +2148,7 @@ pixman_fill32 (uint32_t *bits,
int y,
int width,
int height,
- uint32_t xor)
+ uint32_t filler)
{
int i;
@@ -2157,7 +2157,7 @@ pixman_fill32 (uint32_t *bits,
while (height--)
{
for (i = 0; i < width; ++i)
- bits[i] = xor;
+ bits[i] = filler;
bits += stride;
}
@@ -2172,24 +2172,24 @@ fast_path_fill (pixman_implementation_t *imp,
int y,
int width,
int height,
- uint32_t xor)
+ uint32_t filler)
{
switch (bpp)
{
case 1:
- pixman_fill1 (bits, stride, x, y, width, height, xor);
+ pixman_fill1 (bits, stride, x, y, width, height, filler);
break;
case 8:
- pixman_fill8 (bits, stride, x, y, width, height, xor);
+ pixman_fill8 (bits, stride, x, y, width, height, filler);
break;
case 16:
- pixman_fill16 (bits, stride, x, y, width, height, xor);
+ pixman_fill16 (bits, stride, x, y, width, height, filler);
break;
case 32:
- pixman_fill32 (bits, stride, x, y, width, height, xor);
+ pixman_fill32 (bits, stride, x, y, width, height, filler);
break;
default:
diff --git a/pixman/pixman-implementation.c b/pixman/pixman-implementation.c
index a70892c..ec467a6 100644
--- a/pixman/pixman-implementation.c
+++ b/pixman/pixman-implementation.c
@@ -242,12 +242,12 @@ _pixman_implementation_fill (pixman_implementation_t *imp,
int y,
int width,
int height,
- uint32_t xor)
+ uint32_t filler)
{
while (imp)
{
if (imp->fill &&
- ((*imp->fill) (imp, bits, stride, bpp, x, y, width, height, xor)))
+ ((*imp->fill) (imp, bits, stride, bpp, x, y, width, height, filler)))
{
return TRUE;
}
diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index 5a7ea44..ca2ac83 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -2064,7 +2064,7 @@ mmx_fill (pixman_implementation_t *imp,
int y,
int width,
int height,
- uint32_t xor)
+ uint32_t filler)
{
uint64_t fill;
__m64 vfill;
@@ -2084,7 +2084,7 @@ mmx_fill (pixman_implementation_t *imp,
byte_line = (uint8_t *)(((uint8_t *)bits) + stride * y + x);
byte_width = width;
stride *= 1;
- xor = (xor & 0xff) * 0x01010101;
+ filler = (filler & 0xff) * 0x01010101;
}
else if (bpp == 16)
{
@@ -2092,7 +2092,7 @@ mmx_fill (pixman_implementation_t *imp,
byte_line = (uint8_t *)(((uint16_t *)bits) + stride * y + x);
byte_width = 2 * width;
stride *= 2;
- xor = (xor & 0xffff) * 0x00010001;
+ filler = (filler & 0xffff) * 0x00010001;
}
else
{
@@ -2102,7 +2102,7 @@ mmx_fill (pixman_implementation_t *imp,
stride *= 4;
}
- fill = ((uint64_t)xor << 32) | xor;
+ fill = ((uint64_t)filler << 32) | filler;
vfill = to_m64 (fill);
#if defined __GNUC__ && defined USE_X86_MMX
@@ -2129,21 +2129,21 @@ mmx_fill (pixman_implementation_t *imp,
if (w >= 1 && ((uintptr_t)d & 1))
{
- *(uint8_t *)d = (xor & 0xff);
+ *(uint8_t *)d = (filler & 0xff);
w--;
d++;
}
if (w >= 2 && ((uintptr_t)d & 3))
{
- *(uint16_t *)d = xor;
+ *(uint16_t *)d = filler;
w -= 2;
d += 2;
}
while (w >= 4 && ((uintptr_t)d & 7))
{
- *(uint32_t *)d = xor;
+ *(uint32_t *)d = filler;
w -= 4;
d += 4;
@@ -2182,20 +2182,20 @@ mmx_fill (pixman_implementation_t *imp,
while (w >= 4)
{
- *(uint32_t *)d = xor;
+ *(uint32_t *)d = filler;
w -= 4;
d += 4;
}
if (w >= 2)
{
- *(uint16_t *)d = xor;
+ *(uint16_t *)d = filler;
w -= 2;
d += 2;
}
if (w >= 1)
{
- *(uint8_t *)d = (xor & 0xff);
+ *(uint8_t *)d = (filler & 0xff);
w--;
d++;
}
diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index ea447aa..765ce55 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -455,7 +455,7 @@ typedef pixman_bool_t (*pixman_fill_func_t) (pixman_implementation_t *imp,
int y,
int width,
int height,
- uint32_t xor);
+ uint32_t filler);
typedef pixman_bool_t (*pixman_iter_init_func_t) (pixman_implementation_t *imp,
pixman_iter_t *iter);
@@ -542,7 +542,7 @@ _pixman_implementation_fill (pixman_implementation_t *imp,
int y,
int width,
int height,
- uint32_t xor);
+ uint32_t filler);
pixman_bool_t
_pixman_implementation_src_iter_init (pixman_implementation_t *imp,
diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
index b1cb73e..5a0e062 100644
--- a/pixman/pixman-sse2.c
+++ b/pixman/pixman-sse2.c
@@ -3321,7 +3321,7 @@ sse2_fill (pixman_implementation_t *imp,
int y,
int width,
int height,
- uint32_t xor)
+ uint32_t filler)
{
uint32_t byte_width;
uint8_t *byte_line;
@@ -3338,9 +3338,9 @@ sse2_fill (pixman_implementation_t *imp,
byte_width = width;
stride *= 1;
- b = xor & 0xff;
+ b = filler & 0xff;
w = (b << 8) | b;
- xor = (w << 16) | w;
+ filler = (w << 16) | w;
}
else if (bpp == 16)
{
@@ -3349,7 +3349,7 @@ sse2_fill (pixman_implementation_t *imp,
byte_width = 2 * width;
stride *= 2;
- xor = (xor & 0xffff) * 0x00010001;
+ filler = (filler & 0xffff) * 0x00010001;
}
else if (bpp == 32)
{
@@ -3363,7 +3363,7 @@ sse2_fill (pixman_implementation_t *imp,
return FALSE;
}
- xmm_def = create_mask_2x32_128 (xor, xor);
+ xmm_def = create_mask_2x32_128 (filler, filler);
while (height--)
{
@@ -3374,21 +3374,21 @@ sse2_fill (pixman_implementation_t *imp,
if (w >= 1 && ((uintptr_t)d & 1))
{
- *(uint8_t *)d = xor;
+ *(uint8_t *)d = filler;
w -= 1;
d += 1;
}
while (w >= 2 && ((uintptr_t)d & 3))
{
- *(uint16_t *)d = xor;
+ *(uint16_t *)d = filler;
w -= 2;
d += 2;
}
while (w >= 4 && ((uintptr_t)d & 15))
{
- *(uint32_t *)d = xor;
+ *(uint32_t *)d = filler;
w -= 4;
d += 4;
@@ -3439,7 +3439,7 @@ sse2_fill (pixman_implementation_t *imp,
while (w >= 4)
{
- *(uint32_t *)d = xor;
+ *(uint32_t *)d = filler;
w -= 4;
d += 4;
@@ -3447,14 +3447,14 @@ sse2_fill (pixman_implementation_t *imp,
if (w >= 2)
{
- *(uint16_t *)d = xor;
+ *(uint16_t *)d = filler;
w -= 2;
d += 2;
}
if (w >= 1)
{
- *(uint8_t *)d = xor;
+ *(uint8_t *)d = filler;
w -= 1;
d += 1;
}
diff --git a/pixman/pixman.c b/pixman/pixman.c
index d3ca3d8..3fabed1 100644
--- a/pixman/pixman.c
+++ b/pixman/pixman.c
@@ -766,10 +766,10 @@ pixman_fill (uint32_t *bits,
int y,
int width,
int height,
- uint32_t xor)
+ uint32_t filler)
{
return _pixman_implementation_fill (
- get_implementation(), bits, stride, bpp, x, y, width, height, xor);
+ get_implementation(), bits, stride, bpp, x, y, width, height, filler);
}
static uint32_t