pixman: Branch 'master' - 2 commits

[Jeff Muizelaar]

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

New commits:
commit 01763ff76f7b0b1feabd83b8a14ee4d3ab0df223
Author: Jeff Muizelaar <jmuizelaar at mozilla.com>
Date:   Fri Dec 5 12:01:03 2008 -0500

    [arm-simd] Add a comment about aligning source and destination pointers.
commit 985829f26b15aaa3e336127412c771027577313f
Author: Jeff Muizelaar <jmuizelaar at mozilla.com>
Date:   Fri Dec 5 11:45:03 2008 -0500

    Check alignment of 'src' pointer in optimized ARM routines
    
    fbCompositeSrcAdd_8000x8000arm() tries to align 'dst' already but must check
    'src' too.  Otherwise, the next 4-byte copy loop might access an odd 'src' address
    causing an alignment trap.
    
    Patch from Enrico Scholz

diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
index 8aa81d2..f595325 100644
--- a/pixman/pixman-arm-simd.c
+++ b/pixman/pixman-arm-simd.c
@@ -60,7 +60,7 @@ fbCompositeSrcAdd_8000x8000arm (pixman_op_t op,
 	srcLine += srcStride;
 	w = width;
 
-	while (w && (unsigned long)dst & 3)
+	while (w && (((unsigned long)dst & 3) || ((unsigned long)src & 3)))
 	{
 	    s = *src;
 	    d = *dst;