pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-compose.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

New commits:
diff-tree 07e73371ef096b42d3a983266105b71ea01b4cc8 (from d7f426806d25a9cea93a4c43a3f23e7ae9d67383)
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Tue Jun 19 11:19:43 2007 -0400

    Fix fbStore_b2g3r3(). Pointed out by Dan Amelang

diff --git a/pixman/pixman-compose.c b/pixman/pixman-compose.c
index 63b1677..d870b2a 100644
--- a/pixman/pixman-compose.c
+++ b/pixman/pixman-compose.c
@@ -1404,7 +1404,8 @@ fbStore_r3g3b2 (pixman_image_t *image,
     uint8_t   *pixel = ((uint8_t *) bits) + x;
     for (i = 0; i < width; ++i) {
 	Split(READ(values + i));
-	WRITE(pixel++, ((r     ) & 0xe0) |
+	WRITE(pixel++,
+	      ((r     ) & 0xe0) |
 	      ((g >> 3) & 0x1c) |
 	      ((b >> 6)       ));
     }
@@ -1418,9 +1419,10 @@ fbStore_b2g3r3 (pixman_image_t *image,
     uint8_t   *pixel = ((uint8_t *) bits) + x;
     for (i = 0; i < width; ++i) {
 	Split(READ(values + i));
-	WRITE(pixel++, ((b     ) & 0xe0) |
+	WRITE(pixel++,
+	      ((b     ) & 0xc0) |
 	      ((g >> 3) & 0x1c) |
-	      ((r >> 6)       ));
+	      ((r >> 5)       ));
     }
 }