pixman: Branch 'wide-composite'

[Aaron Plattner]

 pixman/pixman-compose.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e3e25cb48e8f2e6a5e62497ac0eb843a38171b82
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Oct 22 18:23:56 2007 -0700

    Fix a dumb search & replace mistake.

diff --git a/pixman/pixman-compose.c b/pixman/pixman-compose.c
index 2f465d5..2ebb439 100644
--- a/pixman/pixman-compose.c
+++ b/pixman/pixman-compose.c
@@ -240,7 +240,7 @@ fbCombineSaturateU (full_t *dest, const full_t *src, int width)
 #define CombineAOut 1
 #define CombineAIn  2
 #define CombineBOut 4
-#define CombineBIn  SHIFT
+#define CombineBIn  8
 
 #define CombineClear	0
 #define CombineA	(CombineAOut|CombineAIn)