xserver: Branch 'master'

[Aaron Plattner]

 fb/fbcopy.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 32666d77227fcd2c066de16bf3c07366f92b0457 (from daee59b1703ac07c2def9e9fecc479e59b93f761)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Thu Aug 16 14:57:18 2007 -0700

    Bug #12015: Use the right offsets in the dst arguments of pixman_blt.

diff --git a/fb/fbcopy.c b/fb/fbcopy.c
index 3ad01bf..68f403f 100644
--- a/fb/fbcopy.c
+++ b/fb/fbcopy.c
@@ -64,8 +64,8 @@ fbCopyNtoN (DrawablePtr	pSrcDrawable,
 	    if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp,
 			     (pbox->x1 + dx + srcXoff),
 			     (pbox->y1 + dy + srcYoff),
-			     (pbox->x1 + srcXoff),
-			     (pbox->y1 + srcYoff),
+			     (pbox->x1 + dstXoff),
+			     (pbox->y1 + dstYoff),
 			     (pbox->x2 - pbox->x1),
 			     (pbox->y2 - pbox->y1)))
 		goto fallback;