diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-28 11:14:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-28 11:14:32 +0000 |
| commit | 1840c5631682e0a69ed11487a23a43d45f2d15e1 (patch) | |
| tree | fe954636044c0057b9f08e76d19489493ff09745 /pixman | |
| parent | 2ab09dc03e4ecc726ee7b5528306b0fe3e5b1837 (diff) | |
| parent | 57a879849643e79d9674198a3a77c59532fb79b4 (diff) | |
| download | vcxsrv-1840c5631682e0a69ed11487a23a43d45f2d15e1.tar.gz vcxsrv-1840c5631682e0a69ed11487a23a43d45f2d15e1.tar.bz2 vcxsrv-1840c5631682e0a69ed11487a23a43d45f2d15e1.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/pixman/pixman-trap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pixman/pixman/pixman-trap.c b/pixman/pixman/pixman-trap.c index 5c066614e..f57d0caa9 100644 --- a/pixman/pixman/pixman-trap.c +++ b/pixman/pixman/pixman-trap.c @@ -432,7 +432,7 @@ pixman_composite_trapezoids (pixman_op_t op, if (!pixman_trapezoid_valid (trap))
continue;
- pixman_rasterize_trapezoid (dst, trap, 0, 0);
+ pixman_rasterize_trapezoid (dst, trap, x_dst, y_dst);
}
}
else
@@ -495,9 +495,9 @@ pixman_composite_trapezoids (pixman_op_t op, }
pixman_image_composite (op, src, tmp, dst,
- x_src + box.x1 - x_dst, y_src + box.y1 - y_dst,
+ x_src + box.x1, y_src + box.y1,
0, 0,
- box.x1, box.y1,
+ x_dst + box.x1, y_dst + box.y1,
box.x2 - box.x1, box.y2 - box.y1);
pixman_image_unref (tmp);
|