From b5d42012f9be87f3b45a089c596ce6dba8845794 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 7 Sep 2005 01:30:23 +0000 Subject: [PATCH] Fix typo resulting in failure to swap between RGB/BGR properly. (Stephen P. Becker) --- fb/fbcompose.c | 4 ++-- 1 file 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