xserver git update 11/6/2010

1 files changed, 10 insertions, 10 deletions

diff --git a/xorg-server/fb/fbpixmap.c b/xorg-server/fb/fbpixmap.c
index d9ee21391..155f1e134 100644
--- a/xorg-server/fb/fbpixmap.c
+++ b/xorg-server/fb/fbpixmap.c
@@ -67,6 +67,7 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
     pPixmap->devKind = paddedWidth;

     pPixmap->refcnt = 1;

     pPixmap->devPrivate.ptr = (pointer) ((char *)pPixmap + base + adjust);

+

 #ifdef FB_DEBUG

     pPixmap->devPrivate.ptr = (void *) ((char *) pPixmap->devPrivate.ptr + paddedWidth);

     fbInitializeDrawable (&pPixmap->drawable);

@@ -100,8 +101,7 @@ fbDestroyPixmap (PixmapPtr pPixmap)
 {

     if(--pPixmap->refcnt)

 	return TRUE;

-    dixFreePrivates(pPixmap->devPrivates);

-    free(pPixmap);

+    FreePixmap(pPixmap);

     return TRUE;

 }

 

@@ -115,8 +115,8 @@ if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&			\
 {								\

     if ((reg)->data->numRects == (reg)->data->size)		\

     {								\

-	miRectAlloc(reg, 1);					\

-	fr = REGION_BOXPTR(reg);				\

+	RegionRectAlloc(reg, 1);					\

+	fr = RegionBoxptr(reg);				\

 	r = fr + (reg)->data->numRects;				\

     }								\

     r->x1 = (rx1);						\

@@ -153,10 +153,10 @@ fbPixmapToRegion(PixmapPtr pPix)
     FbBits		*pwLine;

     int			nWidth;

     

-    pReg = REGION_CREATE(pPix->drawable.pScreen, NULL, 1);

+    pReg = RegionCreate(NULL, 1);

     if(!pReg)

 	return NullRegion;

-    FirstRect = REGION_BOXPTR(pReg);

+    FirstRect = RegionBoxptr(pReg);

     rects = FirstRect;

 

     fbPrepareAccess(&pPix->drawable);

@@ -304,8 +304,8 @@ fbPixmapToRegion(PixmapPtr pPix)
 	pReg->extents.x1 = pReg->extents.x2 = 0;

     else

     {

-	pReg->extents.y1 = REGION_BOXPTR(pReg)->y1;

-	pReg->extents.y2 = REGION_END(pReg)->y2;

+	pReg->extents.y1 = RegionBoxptr(pReg)->y1;

+	pReg->extents.y2 = RegionEnd(pReg)->y2;

 	if (pReg->data->numRects == 1)

 	{

 	    free(pReg->data);

@@ -315,10 +315,10 @@ fbPixmapToRegion(PixmapPtr pPix)
 

     fbFinishAccess(&pPix->drawable);

 #ifdef DEBUG

-    if (!miValidRegion(pReg))

+    if (!RegionIsValid(pReg))

 	FatalError("Assertion failed file %s, line %d: expr\n", __FILE__, __LINE__);

 #endif

-    return(pReg);

+    return pReg;

 }

 

 #ifdef FB_DEBUG