summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base/xorg-server/files/1.4.0.90/0002-bgPixel-unsigned-long-is-64-bit-on-x86_64-so-1.patch')
-rw-r--r--x11-base/xorg-server/files/1.4.0.90/0002-bgPixel-unsigned-long-is-64-bit-on-x86_64-so-1.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/x11-base/xorg-server/files/1.4.0.90/0002-bgPixel-unsigned-long-is-64-bit-on-x86_64-so-1.patch b/x11-base/xorg-server/files/1.4.0.90/0002-bgPixel-unsigned-long-is-64-bit-on-x86_64-so-1.patch
new file mode 100644
index 000000000000..9ec86c51e4b0
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0002-bgPixel-unsigned-long-is-64-bit-on-x86_64-so-1.patch
@@ -0,0 +1,34 @@
+From 41f735fbe02f59bc7bcca335c6e743c72c2fc44c Mon Sep 17 00:00:00 2001
+From: Hong Liu <hong.liu@intel.com>
+Date: Tue, 4 Sep 2007 08:46:46 +0100
+Subject: [PATCH] bgPixel (unsigned long) is 64-bit on x86_64, so -1 != 0xffffffff
+
+This patch should fix bug 8080.
+(cherry picked from commit 9adea807038b64292403ede982075fe1dcfd4c9a)
+---
+ hw/xfree86/xaa/xaaGC.c | 9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c
+index f3434c9..b3dc83a 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)){
+--
+1.5.5.1
+