summaryrefslogtreecommitdiff
path: root/fb
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-09-07 01:30:23 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-09-07 01:30:23 +0000
commitb5d42012f9be87f3b45a089c596ce6dba8845794 (patch)
tree1c11f424caa250ae75e4ecdf60bf714174008ea8 /fb
parentc8de8c23fbccb3296747f429a02c0c0682b74bf5 (diff)
Fix typo resulting in failure to swap between RGB/BGR properly. (Stephen P.
Becker)
Diffstat (limited to 'fb')
-rw-r--r--fb/fbcompose.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fb/fbcompose.c b/fb/fbcompose.c
index cbb5b5797..66483501c 100644
--- a/fb/fbcompose.c
+++ b/fb/fbcompose.c
@@ -1022,7 +1022,7 @@ fbStore_a8b8g8r8 (FbBits *bits, const CARD32 *values, int x, int width, miIndexe
int i;
CARD32 *pixel = (CARD32 *)bits + x;
for (i = 0; i < width; ++i)
- *pixel++ = (values[i] & 0xff00ff00) | ((values[i] >> 16) && 0xff) | ((values[i] & 0xff) << 16);
+ *pixel++ = (values[i] & 0xff00ff00) | ((values[i] >> 16) & 0xff) | ((values[i] & 0xff) << 16);
}
static FASTCALL void
@@ -1031,7 +1031,7 @@ fbStore_x8b8g8r8 (FbBits *bits, const CARD32 *values, int x, int width, miIndexe
int i;
CARD32 *pixel = (CARD32 *)bits + x;
for (i = 0; i < width; ++i)
- *pixel++ = (values[i] & 0x0000ff00) | ((values[i] >> 16) && 0xff) | ((values[i] & 0xff) << 16);
+ *pixel++ = (values[i] & 0x0000ff00) | ((values[i] >> 16) & 0xff) | ((values[i] & 0xff) << 16);
}
static FASTCALL void