pixman: Branch 'master'

[Adam Jackson]

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

New commits:
commit 29a8ae4185bf65dbafe0dd7aff3b83bef1bbffbc
Author: Kamalneet Singh <kamalneet.s at samsung.com>
Date:   Wed Mar 19 10:02:11 2008 -0400

    Fix computation of x_offset in pixman_add_traps.

diff --git a/pixman/pixman-trap.c b/pixman/pixman-trap.c
index 28e755a..468324e 100644
--- a/pixman/pixman-trap.c
+++ b/pixman/pixman-trap.c
@@ -49,7 +49,7 @@ pixman_add_traps (pixman_image_t *	image,
     height = image->bits.height;
     bpp = PIXMAN_FORMAT_BPP (image->bits.format);
     
-    x_off_fixed = pixman_int_to_fixed(y_off);
+    x_off_fixed = pixman_int_to_fixed(x_off);
     y_off_fixed = pixman_int_to_fixed(y_off);
 
     while (ntrap--)