svn merge ^/branches/released .

1 files changed, 3 insertions, 4 deletions

diff --git a/xorg-server/exa/exa_unaccel.c b/xorg-server/exa/exa_unaccel.c
index 9c22fc5f1..1ed08d5b1 100644
--- a/xorg-server/exa/exa_unaccel.c
+++ b/xorg-server/exa/exa_unaccel.c
@@ -127,11 +127,10 @@ ExaCheckCopyNtoN (DrawablePtr pSrc, DrawablePtr pDst,  GCPtr pGC,
     EXA_FALLBACK(("from %p to %p (%c,%c)\n", pSrc, pDst,

 		  exaDrawableLocation(pSrc), exaDrawableLocation(pDst)));

 

-    if (pExaScr->prepare_access_reg) {

+    if (pExaScr->prepare_access_reg && RegionInitBoxes(&reg, pbox, nbox)) {

 	PixmapPtr pPixmap = exaGetDrawablePixmap(pSrc);

 

 	exaGetDrawableDeltas(pSrc, pPixmap, &xoff, &yoff);

-	RegionInit(&reg, pbox, nbox);

 	RegionTranslate(&reg, xoff + dx, yoff + dy);

 	pExaScr->prepare_access_reg(pPixmap, EXA_PREPARE_SRC, &reg);

 	RegionUninit(&reg);

@@ -140,11 +139,11 @@ ExaCheckCopyNtoN (DrawablePtr pSrc, DrawablePtr pDst,  GCPtr pGC,
 

     if (pExaScr->prepare_access_reg &&

 	!exaGCReadsDestination(pDst, pGC->planemask, pGC->fillStyle,

-			       pGC->alu, pGC->clientClipType)) {

+			       pGC->alu, pGC->clientClipType) &&

+	RegionInitBoxes (&reg, pbox, nbox)) {

 	PixmapPtr pPixmap = exaGetDrawablePixmap(pDst);

 

 	exaGetDrawableDeltas(pSrc, pPixmap, &xoff, &yoff);

-	RegionInit(&reg, pbox, nbox);

 	RegionTranslate(&reg, xoff, yoff);

 	pExaScr->prepare_access_reg(pPixmap, EXA_PREPARE_DEST, &reg);

 	RegionUninit(&reg);