svn merge ^/branches/released .

1 files changed, 9 insertions, 12 deletions

diff --git a/xorg-server/Xext/xace.c b/xorg-server/Xext/xace.c
index 4381e553a..48c5fb644 100644
--- a/xorg-server/Xext/xace.c
+++ b/xorg-server/Xext/xace.c
@@ -245,24 +245,21 @@ XaceCensorImage(
 	unsigned int format,

 	char *pBuf)

 {

-    ScreenPtr pScreen;

     RegionRec imageRegion;  /* region representing x,y,w,h */

     RegionRec censorRegion; /* region to obliterate */

     BoxRec imageBox;

     int nRects;

 

-    pScreen = pDraw->pScreen;

-

     imageBox.x1 = x;

     imageBox.y1 = y;

     imageBox.x2 = x + w;

     imageBox.y2 = y + h;

-    REGION_INIT(pScreen, &imageRegion, &imageBox, 1);

-    REGION_NULL(pScreen, &censorRegion);

+    RegionInit(&imageRegion, &imageBox, 1);

+    RegionNull(&censorRegion);

 

     /* censorRegion = imageRegion - visibleRegion */

-    REGION_SUBTRACT(pScreen, &censorRegion, &imageRegion, pVisibleRegion);

-    nRects = REGION_NUM_RECTS(&censorRegion);

+    RegionSubtract(&censorRegion, &imageRegion, pVisibleRegion);

+    nRects = RegionNumRects(&censorRegion);

     if (nRects > 0)

     { /* we have something to censor */

 	GCPtr pScratchGC = NULL;

@@ -282,7 +279,7 @@ XaceCensorImage(
 	    failed = TRUE;

 	    goto failSafe;

 	}

-	for (pBox = REGION_RECTS(&censorRegion), i = 0;

+	for (pBox = RegionRects(&censorRegion), i = 0;

 	     i < nRects;

 	     i++, pBox++)

 	{

@@ -326,14 +323,14 @@ XaceCensorImage(
 	    /* Censoring was not completed above.  To be safe, wipe out

 	     * all the image data so that nothing trusted gets out.

 	     */

-	    bzero(pBuf, (int)(widthBytesLine * h));

+	    memset(pBuf, 0, (int)(widthBytesLine * h));

 	}

-	if (pRects)     free(pRects);

+	free(pRects);

 	if (pScratchGC) FreeScratchGC(pScratchGC);

 	if (pPix)       FreeScratchPixmapHeader(pPix);

     }

-    REGION_UNINIT(pScreen, &imageRegion);

-    REGION_UNINIT(pScreen, &censorRegion);

+    RegionUninit(&imageRegion);

+    RegionUninit(&censorRegion);

 } /* XaceCensorImage */

 

 /*