diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 07:53:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 07:53:41 +0100 |
| commit | 1738a6973deb03f33a71c9527594727cb8bb64b4 (patch) | |
| tree | 813603d381b5536ef7a1e2ffd3a137c4bc0623f7 /xorg-server/fb | |
| parent | 1cc98f5a48924d750fbef7ea6b05a1ba49c28589 (diff) | |
| download | vcxsrv-1738a6973deb03f33a71c9527594727cb8bb64b4.tar.gz vcxsrv-1738a6973deb03f33a71c9527594727cb8bb64b4.tar.bz2 vcxsrv-1738a6973deb03f33a71c9527594727cb8bb64b4.zip | |
xserver mesa xkbcomp git update 7 nov 2012
xserver: 011f8458805e443ac9130865d2840a929a00cabf
xkbcomp: bd1103ef3cfef9cfed645566f944a69e7ca568b4
mesa: f42518962a08ce927e4ddd233d19d2661e135834
Diffstat (limited to 'xorg-server/fb')
| -rw-r--r-- | xorg-server/fb/fbblt.c | 12 | ||||
| -rw-r--r-- | xorg-server/fb/fbbltone.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/xorg-server/fb/fbblt.c b/xorg-server/fb/fbblt.c index 17bd6986b..72a05f61a 100644 --- a/xorg-server/fb/fbblt.c +++ b/xorg-server/fb/fbblt.c @@ -73,21 +73,21 @@ fbBlt(FbBits * srcLine, if (alu == GXcopy && pm == FB_ALLONES && !careful && !(srcX & 7) && !(dstX & 7) && !(width & 7)) { int i; - CARD8 *src = (CARD8 *) srcLine; - CARD8 *dst = (CARD8 *) dstLine; + CARD8 *tmpsrc = (CARD8 *) srcLine; + CARD8 *tmpdst = (CARD8 *) dstLine; srcStride *= sizeof(FbBits); dstStride *= sizeof(FbBits); width >>= 3; - src += (srcX >> 3); - dst += (dstX >> 3); + tmpsrc += (srcX >> 3); + tmpdst += (dstX >> 3); if (!upsidedown) for (i = 0; i < height; i++) - MEMCPY_WRAPPED(dst + i * dstStride, src + i * srcStride, width); + MEMCPY_WRAPPED(tmpdst + i * dstStride, tmpsrc + i * srcStride, width); else for (i = height - 1; i >= 0; i--) - MEMCPY_WRAPPED(dst + i * dstStride, src + i * srcStride, width); + MEMCPY_WRAPPED(tmpdst + i * dstStride, tmpsrc + i * srcStride, width); return; } diff --git a/xorg-server/fb/fbbltone.c b/xorg-server/fb/fbbltone.c index eb7cf9483..bfcb5a263 100644 --- a/xorg-server/fb/fbbltone.c +++ b/xorg-server/fb/fbbltone.c @@ -739,12 +739,12 @@ fbBltPlane(FbBits * src, pm = fbReplicatePixel(planeMask, srcBpp); if (srcBpp == 24) { - int w = 24; + int tmpw = 24; rot0 = FbFirst24Rot(srcX); - if (srcX + w > FB_UNIT) - w = FB_UNIT - srcX; - srcMaskFirst = FbRot24(pm, rot0) & FbBitsMask(srcX, w); + if (srcX + tmpw > FB_UNIT) + tmpw = FB_UNIT - srcX; + srcMaskFirst = FbRot24(pm, rot0) & FbBitsMask(srcX, tmpw); } else { rot0 = 0; |