[cairo-commit] Branch '1.0' - pixman/src

[Carl Worth]

 pixman/src/fbpict.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree a5d13b472936b040755dd30624528cb7c6f52c73 (from 440bb68ef207b9101f355b2d1ccbaa5d1b166c4a)
Author: Carl Worth <cworth at cworth.org>
Date:   Mon Mar 13 13:20:29 2006 -0800

    fbCompositeTrans_0888xnx0888: Fix suspicious logical negation of pointer value.
    
    Surely, the ! instead of ~ here was just a typo. I'd feel better if I
    had a failing test case for this though, (time to break out gcov
    again).
    
    Fixes bug #6185:
    
    	Strange pointer operations in fbCompositeTrans_0888xnx0888 (pixman/src/fbpict.c)
    	https://bugs.freedesktop.org/show_bug.cgi?id=6185
    (cherry picked from 5d89faf6b37bb0367c8ba8f8637fc80bd745c888 commit)

diff --git a/pixman/src/fbpict.c b/pixman/src/fbpict.c
index bcb6cc8..b69e79a 100644
--- a/pixman/src/fbpict.c
+++ b/pixman/src/fbpict.c
@@ -1151,7 +1151,7 @@ fbCompositeTrans_0888xnx0888(pixman_oper
 				setupPackedReader(ws,wt,isrc,wsrc,workingSource);
 
 				/* get to word aligned */
-				switch(!(long)dst&3)
+				switch(~(long)dst&3)
 				{
 					case 1:
 						readPackedSource(rs);
@@ -1227,7 +1227,7 @@ fbCompositeTrans_0888xnx0888(pixman_oper
 				srcLine += srcStride;
 				w = width*3;
 				/* get to word aligned */
-				switch(!(long)src&3)
+				switch(~(long)src&3)
 				{
 					case 1:
 						rd=alphamaskCombine24(*src++, *dst)>>8;