frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fb: Remove usage of alloca 

Replace with heap storage.
This commit is contained in:
Daniel Stone 2007-11-05 14:12:22 +00:00
parent 733d42065f
commit 34cdf06e4c
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fb/fbcopy.c
View File

@ -326,7 +326,7 @@ fbCopyRegion (DrawablePtr pSrcDrawable,
if (nbox > 1) if (nbox > 1)
{ {
/* keep ordering in each band, reverse order of bands */ /* keep ordering in each band, reverse order of bands */
pboxNew1 = (BoxPtr)ALLOCATE_LOCAL(sizeof(BoxRec) * nbox); pboxNew1 = (BoxPtr)xalloc(sizeof(BoxRec) * nbox);
if(!pboxNew1) if(!pboxNew1)
return; return;
pboxBase = pboxNext = pbox+nbox-1; pboxBase = pboxNext = pbox+nbox-1;
@ -363,11 +363,11 @@ fbCopyRegion (DrawablePtr pSrcDrawable,
if (nbox > 1) if (nbox > 1)
{ {
/* reverse order of rects in each band */ /* reverse order of rects in each band */
pboxNew2 = (BoxPtr)ALLOCATE_LOCAL(sizeof(BoxRec) * nbox); pboxNew2 = (BoxPtr)xalloc(sizeof(BoxRec) * nbox);
if(!pboxNew2) if(!pboxNew2)
{ {
if (pboxNew1) if (pboxNew1)
DEALLOCATE_LOCAL(pboxNew1); xfree(pboxNew1);
return; return;
} }
pboxBase = pboxNext = pbox; pboxBase = pboxNext = pbox;
@ -402,9 +402,9 @@ fbCopyRegion (DrawablePtr pSrcDrawable,
reverse, upsidedown, bitPlane, closure); reverse, upsidedown, bitPlane, closure);
if (pboxNew1) if (pboxNew1)
DEALLOCATE_LOCAL (pboxNew1); xfree (pboxNew1);
if (pboxNew2) if (pboxNew2)
DEALLOCATE_LOCAL (pboxNew2); xfree (pboxNew2);
} }
RegionPtr RegionPtr

16
fb/fbpseudocolor.c
View File

@ -500,7 +500,7 @@ xxStoreColors(ColormapPtr pmap, int nColors, xColorItem *pColors)
DBG("StoreColors\n"); DBG("StoreColors\n");
expanddefs = ALLOCATE_LOCAL(sizeof(xColorItem) expanddefs = xalloc(sizeof(xColorItem)
* (1 << pScrPriv->myDepth)); * (1 << pScrPriv->myDepth));
if (!expanddefs) return; if (!expanddefs) return;
@ -527,7 +527,7 @@ xxStoreColors(ColormapPtr pmap, int nColors, xColorItem *pColors)
pColors++; pColors++;
} }
DEALLOCATE_LOCAL(expanddefs); xfree(expanddefs);
pCmapPriv->dirty = TRUE; pCmapPriv->dirty = TRUE;
pScrPriv->colormapDirty = TRUE; pScrPriv->colormapDirty = TRUE;
@ -565,9 +565,9 @@ xxInstallColormap(ColormapPtr pmap)
wrap(pScrPriv,pmap->pScreen,InstallColormap,xxInstallColormap); wrap(pScrPriv,pmap->pScreen,InstallColormap,xxInstallColormap);
} }
pixels = ALLOCATE_LOCAL(sizeof(Pixel) * (1 << pScrPriv->myDepth)); pixels = xalloc(sizeof(Pixel) * (1 << pScrPriv->myDepth));
colors = ALLOCATE_LOCAL(sizeof(xrgb) * (1 << pScrPriv->myDepth)); colors = xalloc(sizeof(xrgb) * (1 << pScrPriv->myDepth));
defs = ALLOCATE_LOCAL(sizeof(xColorItem) * (1 << pScrPriv->myDepth)); defs = xalloc(sizeof(xColorItem) * (1 << pScrPriv->myDepth));
if (!pixels || !colors) if (!pixels || !colors)
return; return;
@ -595,9 +595,9 @@ xxInstallColormap(ColormapPtr pmap)
} }
xxStoreColors(pmap,(1 << pScrPriv->myDepth),defs); xxStoreColors(pmap,(1 << pScrPriv->myDepth),defs);
DEALLOCATE_LOCAL(pixels); xfree(pixels);
DEALLOCATE_LOCAL(colors); xfree(colors);
DEALLOCATE_LOCAL(defs); xfree(defs);
return; return;
} }