diff options
| author | Siarhei Siamashka <siarhei.siamashka@gmail.com> | 2012-12-16 04:03:58 +0200 |
|---|---|---|
| committer | Siarhei Siamashka <siarhei.siamashka@gmail.com> | 2012-12-20 03:14:21 +0200 |
| commit | 66c429282282176cdb5913b7396116c28725363e (patch) | |
| tree | b1eed5ff7a31cd12996cf19942820d9bd1986530 /pixman/pixman-mmx.c | |
| parent | 4dfda2adfe2eb1130fc27b1da35df778284afd91 (diff) | |
| download | pixman-66c429282282176cdb5913b7396116c28725363e.tar.gz | |
Rename 'xor' variable to 'filler' (because 'xor' is a C++ keyword)
Diffstat (limited to 'pixman/pixman-mmx.c')
| -rw-r--r-- | pixman/pixman-mmx.c | 20 |
1 files changed, 10 insertions, 10 deletions
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++; } |