pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-arm-neon.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 34ec50a4761cab50c6216b08ef5cfb36bf94209e
Author: Adrian Bunk <adrian.bunk at movial.com>
Date:   Fri Jul 10 00:11:15 2009 +0300

    Fix the NEON build after "Convert CamelCase names to underscore_names."
    
        This patch fixes the following build error caused
        by commit a98b71eff4041df58c9dcc2b1e25cefa38f364ff
        (Convert CamelCase names to underscore_names.):
    
        <--   snip  -->
    
        ...
        pixman-arm-neon.c: In function 'neon_composite_over_n_8_0565':
        pixman-arm-neon.c:1784: error: 'x_dst' undeclared (first use in this function)
        pixman-arm-neon.c:1784: error: (Each undeclared identifier is reported only once
        pixman-arm-neon.c:1784: error: for each function it appears in.)
        pixman-arm-neon.c:1785: error: 'p_dst' undeclared (first use in this function)
        pixman-arm-neon.c: In function 'neon_composite_over_n_0565':
        pixman-arm-neon.c:1937: error: 'x_dst' undeclared (first use in this function)
        pixman-arm-neon.c:1938: error: 'p_dst' undeclared (first use in this function)
        pixman-arm-neon.c: In function 'neon_composite_over_8888_0565':
        pixman-arm-neon.c:2074: error: 'x_dst' undeclared (first use in this function)
        pixman-arm-neon.c:2075: error: 'p_dst' undeclared (first use in this function)
        make[3]: *** [libpixman_arm_neon_la-pixman-arm-neon.lo] Error 1
        ...
    
        <--  snip  -->

diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
index eeecede..ba29230 100644
--- a/pixman/pixman-arm-neon.c
+++ b/pixman/pixman-arm-neon.c
@@ -1781,8 +1781,8 @@ neon_composite_over_n_8_0565 (
 		}
 
 		// We should avoid reading beyond scanline ends for safety
-		if(aligned_line < (dst_line - x_dst) ||
-			(aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - x_dst) + p_dst->bits.width))
+		if(aligned_line < (dst_line - dest_x) ||
+			(aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - dest_x) + dst_image->bits.width))
 		{
 			// switch to precise read
 			copy_offset = kernel_offset = 0;
@@ -1934,8 +1934,8 @@ neon_composite_over_n_0565 (
 		}
 
 		// We should avoid reading beyond scanline ends for safety
-		if(aligned_line < (dst_line - x_dst) ||
-			(aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - x_dst) + p_dst->bits.width))
+		if(aligned_line < (dst_line - dest_x) ||
+			(aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - dest_x) + dst_image->bits.width))
 		{
 			// switch to precise read
 			copy_offset = kernel_offset = 0;
@@ -2071,8 +2071,8 @@ neon_composite_over_8888_0565 (
 		}
 
 		// We should avoid reading beyond scanline ends for safety
-		if(aligned_line < (dst_line - x_dst) ||
-			(aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - x_dst) + p_dst->bits.width))
+		if(aligned_line < (dst_line - dest_x) ||
+			(aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - dest_x) + dst_image->bits.width))
 		{
 			// switch to precise read
 			copy_offset = kernel_offset = 0;