summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHong Liu <hong.liu@intel.com>2007-09-04 08:46:46 +0100
committerDaniel Stone <daniel@fooishbar.org>2007-12-13 00:00:27 +0200
commit41f735fbe02f59bc7bcca335c6e743c72c2fc44c (patch)
treeff1dc0564961eb9ea1addb69426340551db2669b
parentf4bcb53e86bb103b6bcf8a3a170a36137c34d272 (diff)
bgPixel (unsigned long) is 64-bit on x86_64, so -1 != 0xffffffff
This patch should fix bug 8080. (cherry picked from commit 9adea807038b64292403ede982075fe1dcfd4c9a)
-rw-r--r--hw/xfree86/xaa/xaaGC.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c
index f3434c9f4..b3dc83ada 100644
--- a/hw/xfree86/xaa/xaaGC.c
+++ b/hw/xfree86/xaa/xaaGC.c
@@ -80,10 +80,11 @@ XAAValidateGC(
}
if(pGC->depth != 32) {
- if(pGC->bgPixel == -1) /* -1 is reserved for transparency */
- pGC->bgPixel = 0x7fffffff;
- if(pGC->fgPixel == -1) /* -1 is reserved for transparency */
- pGC->fgPixel = 0x7fffffff;
+ /* 0xffffffff is reserved for transparency */
+ if(pGC->bgPixel == 0xffffffff)
+ pGC->bgPixel = 0x7fffffff;
+ if(pGC->fgPixel == 0xffffffff)
+ pGC->fgPixel = 0x7fffffff;
}
if((pDraw->type == DRAWABLE_PIXMAP) && !IS_OFFSCREEN_PIXMAP(pDraw)){