aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/render
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver/render')
-rw-r--r--nx-X11/programs/Xserver/render/animcur.c2
-rw-r--r--nx-X11/programs/Xserver/render/filter.c12
-rw-r--r--nx-X11/programs/Xserver/render/glyph.c16
-rw-r--r--nx-X11/programs/Xserver/render/miindex.c6
-rw-r--r--nx-X11/programs/Xserver/render/mipict.c2
-rw-r--r--nx-X11/programs/Xserver/render/picture.c42
-rw-r--r--nx-X11/programs/Xserver/render/render.c44
7 files changed, 62 insertions, 62 deletions
diff --git a/nx-X11/programs/Xserver/render/animcur.c b/nx-X11/programs/Xserver/render/animcur.c
index 27e5ab949..993800c7e 100644
--- a/nx-X11/programs/Xserver/render/animcur.c
+++ b/nx-X11/programs/Xserver/render/animcur.c
@@ -128,7 +128,7 @@ AnimCurCloseScreen (int index, ScreenPtr pScreen)
Unwrap(as, pScreen, RecolorCursor);
SetAnimCurScreen(pScreen,0);
ret = (*pScreen->CloseScreen) (index, pScreen);
- xfree (as);
+ free (as);
if (index == 0)
AnimCurScreenPrivateIndex = -1;
return ret;
diff --git a/nx-X11/programs/Xserver/render/filter.c b/nx-X11/programs/Xserver/render/filter.c
index 57a21a8c0..31d5481c9 100644
--- a/nx-X11/programs/Xserver/render/filter.c
+++ b/nx-X11/programs/Xserver/render/filter.c
@@ -73,7 +73,7 @@ PictureGetFilterId (char *filter, int len, Bool makeit)
names = xalloc (sizeof (char *));
if (!names)
{
- xfree (name);
+ free (name);
return -1;
}
filterNames = names;
@@ -119,8 +119,8 @@ PictureFreeFilterIds (void)
int i;
for (i = 0; i < nfilterNames; i++)
- xfree (filterNames[i]);
- xfree (filterNames);
+ free (filterNames[i]);
+ free (filterNames);
nfilterNames = 0;
filterNames = 0;
}
@@ -272,8 +272,8 @@ PictureResetFilters (ScreenPtr pScreen)
{
PictureScreenPtr ps = GetPictureScreen(pScreen);
- xfree (ps->filters);
- xfree (ps->filterAliases);
+ free (ps->filters);
+ free (ps->filterAliases);
PictureFreeFilterIds ();
}
@@ -340,7 +340,7 @@ SetPicturePictFilter (PicturePtr pPicture, PictFilterPtr pFilter,
if (!new_params && nparams)
return BadAlloc;
- xfree (pPicture->filter_params);
+ free (pPicture->filter_params);
pPicture->filter_params = new_params;
pPicture->filter_nparams = nparams;
}
diff --git a/nx-X11/programs/Xserver/render/glyph.c b/nx-X11/programs/Xserver/render/glyph.c
index 854a9069d..f956c44b2 100644
--- a/nx-X11/programs/Xserver/render/glyph.c
+++ b/nx-X11/programs/Xserver/render/glyph.c
@@ -264,7 +264,7 @@ FreeGlyph (GlyphPtr glyph, int format)
gr->signature = 0;
globalGlyphs[format].tableEntries--;
}
- xfree (glyph);
+ free (glyph);
}
}
@@ -281,7 +281,7 @@ AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id)
gr = FindGlyphRef (&globalGlyphs[glyphSet->fdepth], hash, TRUE, glyph);
if (gr->glyph && gr->glyph != DeletedGlyph)
{
- xfree (glyph);
+ free (glyph);
glyph = gr->glyph;
}
else
@@ -404,7 +404,7 @@ ResizeGlyphHash (GlyphHashPtr hash, CARD32 change, Bool global)
++newHash.tableEntries;
}
}
- xfree (hash->table);
+ free (hash->table);
}
*hash = newHash;
if (global)
@@ -444,7 +444,7 @@ AllocateGlyphSet (int fdepth, PictFormatPtr format)
if (!AllocateGlyphHash (&glyphSet->hash, &glyphHashSets[0]))
{
- xfree (glyphSet);
+ free (glyphSet);
return FALSE;
}
glyphSet->refcnt = 1;
@@ -473,19 +473,19 @@ FreeGlyphSet (void *value,
}
if (!globalGlyphs[glyphSet->fdepth].tableEntries)
{
- xfree (globalGlyphs[glyphSet->fdepth].table);
+ free (globalGlyphs[glyphSet->fdepth].table);
globalGlyphs[glyphSet->fdepth].table = 0;
globalGlyphs[glyphSet->fdepth].hashSet = 0;
}
else
ResizeGlyphHash (&globalGlyphs[glyphSet->fdepth], 0, TRUE);
- xfree (table);
+ free (table);
if (glyphSet->devPrivates &&
glyphSet->devPrivates != (void *)(&glyphSet[1]))
- xfree(glyphSet->devPrivates);
+ free(glyphSet->devPrivates);
- xfree (glyphSet);
+ free (glyphSet);
}
return Success;
}
diff --git a/nx-X11/programs/Xserver/render/miindex.c b/nx-X11/programs/Xserver/render/miindex.c
index 03e2857a2..ad2653c14 100644
--- a/nx-X11/programs/Xserver/render/miindex.c
+++ b/nx-X11/programs/Xserver/render/miindex.c
@@ -267,7 +267,7 @@ miInitIndexed (ScreenPtr pScreen,
pFormat->index.pValues = xalloc (num * sizeof (xIndexValue));
if (!pFormat->index.pValues)
{
- xfree (pIndexed);
+ free (pIndexed);
return FALSE;
}
@@ -323,12 +323,12 @@ miCloseIndexed (ScreenPtr pScreen,
{
if (pFormat->index.devPrivate)
{
- xfree (pFormat->index.devPrivate);
+ free (pFormat->index.devPrivate);
pFormat->index.devPrivate = 0;
}
if (pFormat->index.pValues)
{
- xfree (pFormat->index.pValues);
+ free (pFormat->index.pValues);
pFormat->index.pValues = 0;
}
}
diff --git a/nx-X11/programs/Xserver/render/mipict.c b/nx-X11/programs/Xserver/render/mipict.c
index ae7cf5a6d..5bd449d44 100644
--- a/nx-X11/programs/Xserver/render/mipict.c
+++ b/nx-X11/programs/Xserver/render/mipict.c
@@ -107,7 +107,7 @@ miChangePictureClip (PicturePtr pPicture,
if (!clientClip)
return BadAlloc;
clientClipType = CT_REGION;
- xfree(value);
+ free(value);
break;
}
(*ps->DestroyPictureClip) (pPicture);
diff --git a/nx-X11/programs/Xserver/render/picture.c b/nx-X11/programs/Xserver/render/picture.c
index a29a9568c..1e653b0c3 100644
--- a/nx-X11/programs/Xserver/render/picture.c
+++ b/nx-X11/programs/Xserver/render/picture.c
@@ -141,9 +141,9 @@ PictureCloseScreen (int index, ScreenPtr pScreen)
(*ps->CloseIndexed) (pScreen, &ps->formats[n]);
SetPictureScreen(pScreen, 0);
if (ps->PicturePrivateSizes)
- xfree (ps->PicturePrivateSizes);
- xfree (ps->formats);
- xfree (ps);
+ free (ps->PicturePrivateSizes);
+ free (ps->formats);
+ free (ps);
return ret;
}
@@ -660,7 +660,7 @@ PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
{
if (!AddResource (formats[n].id, PictFormatType, (void *) (formats+n)))
{
- xfree (formats);
+ free (formats);
return FALSE;
}
if (formats[n].type == PictTypeIndexed)
@@ -692,15 +692,15 @@ PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
ps = (PictureScreenPtr) xalloc (sizeof (PictureScreenRec));
if (!ps)
{
- xfree (formats);
+ free (formats);
return FALSE;
}
SetPictureScreen(pScreen, ps);
if (!GlyphInit (pScreen))
{
SetPictureScreen(pScreen, 0);
- xfree (formats);
- xfree (ps);
+ free (formats);
+ free (ps);
return FALSE;
}
@@ -730,8 +730,8 @@ PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
{
PictureResetFilters (pScreen);
SetPictureScreen(pScreen, 0);
- xfree (formats);
- xfree (ps);
+ free (formats);
+ free (ps);
return FALSE;
}
@@ -1003,7 +1003,7 @@ CreateSolidPicture (Picture pid, xRenderColor *color, int *error)
pPicture->pSourcePict = (SourcePictPtr) xalloc(sizeof(PictSolidFill));
if (!pPicture->pSourcePict) {
*error = BadAlloc;
- xfree(pPicture);
+ free(pPicture);
return 0;
}
pPicture->pSourcePict->type = SourcePictTypeSolidFill;
@@ -1037,7 +1037,7 @@ CreateLinearGradientPicture (Picture pid, xPointFixed *p1, xPointFixed *p2,
pPicture->pSourcePict = (SourcePictPtr) xalloc(sizeof(PictLinearGradient));
if (!pPicture->pSourcePict) {
*error = BadAlloc;
- xfree(pPicture);
+ free(pPicture);
return 0;
}
@@ -1047,7 +1047,7 @@ CreateLinearGradientPicture (Picture pid, xPointFixed *p1, xPointFixed *p2,
initGradient(pPicture->pSourcePict, nStops, stops, colors, error);
if (*error) {
- xfree(pPicture);
+ free(pPicture);
return 0;
}
return pPicture;
@@ -1086,7 +1086,7 @@ CreateRadialGradientPicture (Picture pid, xPointFixed *inner, xPointFixed *outer
pPicture->pSourcePict = (SourcePictPtr) xalloc(sizeof(PictRadialGradient));
if (!pPicture->pSourcePict) {
*error = BadAlloc;
- xfree(pPicture);
+ free(pPicture);
return 0;
}
radial = &pPicture->pSourcePict->radial;
@@ -1110,7 +1110,7 @@ CreateRadialGradientPicture (Picture pid, xPointFixed *inner, xPointFixed *outer
initGradient(pPicture->pSourcePict, nStops, stops, colors, error);
if (*error) {
- xfree(pPicture);
+ free(pPicture);
return 0;
}
return pPicture;
@@ -1137,7 +1137,7 @@ CreateConicalGradientPicture (Picture pid, xPointFixed *center, xFixed angle,
pPicture->pSourcePict = (SourcePictPtr) xalloc(sizeof(PictConicalGradient));
if (!pPicture->pSourcePict) {
*error = BadAlloc;
- xfree(pPicture);
+ free(pPicture);
return 0;
}
@@ -1147,7 +1147,7 @@ CreateConicalGradientPicture (Picture pid, xPointFixed *center, xFixed angle,
initGradient(pPicture->pSourcePict, nStops, stops, colors, error);
if (*error) {
- xfree(pPicture);
+ free(pPicture);
return 0;
}
return pPicture;
@@ -1487,7 +1487,7 @@ SetPictureTransform (PicturePtr pPicture,
{
if (pPicture->transform)
{
- xfree (pPicture->transform);
+ free (pPicture->transform);
pPicture->transform = 0;
}
}
@@ -1611,12 +1611,12 @@ FreePicture (void * value,
if (--pPicture->refcnt == 0)
{
if (pPicture->transform)
- xfree (pPicture->transform);
+ free (pPicture->transform);
if (!pPicture->pDrawable) {
if (pPicture->pSourcePict) {
if (pPicture->pSourcePict->type != SourcePictTypeSolidFill)
- xfree(pPicture->pSourcePict->linear.stops);
- xfree(pPicture->pSourcePict);
+ free(pPicture->pSourcePict->linear.stops);
+ free(pPicture->pSourcePict);
}
} else {
ScreenPtr pScreen = pPicture->pDrawable->pScreen;
@@ -1647,7 +1647,7 @@ FreePicture (void * value,
(*pScreen->DestroyPixmap) ((PixmapPtr)pPicture->pDrawable);
}
}
- xfree (pPicture);
+ free (pPicture);
}
return Success;
}
diff --git a/nx-X11/programs/Xserver/render/render.c b/nx-X11/programs/Xserver/render/render.c
index 5a4114adc..58b3dbc88 100644
--- a/nx-X11/programs/Xserver/render/render.c
+++ b/nx-X11/programs/Xserver/render/render.c
@@ -552,7 +552,7 @@ ProcRenderQueryPictFormats (ClientPtr client)
swapl (&reply->numSubpixel, n);
}
WriteToClient(client, rlength, (char *) reply);
- xfree (reply);
+ free (reply);
return client->noClientException;
}
#endif /* NXAGENT_SERVER */
@@ -617,7 +617,7 @@ ProcRenderQueryPictIndexValues (ClientPtr client)
}
WriteToClient(client, rlength, (char *) reply);
- xfree(reply);
+ free(reply);
return (client->noClientException);
}
@@ -1196,16 +1196,16 @@ ProcRenderAddGlyphs (ClientPtr client)
}
if (glyphsBase != glyphsLocal)
- Xfree (glyphsBase);
+ free (glyphsBase);
return client->noClientException;
bail:
while (glyphs != glyphsBase)
{
--glyphs;
- xfree (glyphs->glyph);
+ free (glyphs->glyph);
}
if (glyphsBase != glyphsLocal)
- Xfree (glyphsBase);
+ free (glyphsBase);
return err;
}
@@ -1542,14 +1542,14 @@ ProcRenderCreateCursor (ClientPtr client)
srcbits = (unsigned char *)xalloc(nbytes_mono);
if (!srcbits)
{
- xfree (argbbits);
+ free (argbbits);
return (BadAlloc);
}
mskbits = (unsigned char *)xalloc(nbytes_mono);
if (!mskbits)
{
- xfree(argbbits);
- xfree(srcbits);
+ free(argbbits);
+ free(srcbits);
return (BadAlloc);
}
bzero ((char *) mskbits, nbytes_mono);
@@ -1571,26 +1571,26 @@ ProcRenderCreateCursor (ClientPtr client)
pFormat = PictureMatchFormat (pScreen, 32, PICT_a8r8g8b8);
if (!pFormat)
{
- xfree (argbbits);
- xfree (srcbits);
- xfree (mskbits);
+ free (argbbits);
+ free (srcbits);
+ free (mskbits);
return (BadImplementation);
}
pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, 32);
if (!pPixmap)
{
- xfree (argbbits);
- xfree (srcbits);
- xfree (mskbits);
+ free (argbbits);
+ free (srcbits);
+ free (mskbits);
return (BadAlloc);
}
pPicture = CreatePicture (0, &pPixmap->drawable, pFormat, 0, 0,
client, &error);
if (!pPicture)
{
- xfree (argbbits);
- xfree (srcbits);
- xfree (mskbits);
+ free (argbbits);
+ free (srcbits);
+ free (mskbits);
return error;
}
(*pScreen->DestroyPixmap) (pPixmap);
@@ -1674,7 +1674,7 @@ ProcRenderCreateCursor (ClientPtr client)
}
else
{
- xfree (argbbits);
+ free (argbbits);
argbbits = 0;
}
@@ -1819,7 +1819,7 @@ ProcRenderQueryFilters (ClientPtr client)
swapl(&reply->numFilters, n);
}
WriteToClient(client, total_bytes, (char *) reply);
- xfree (reply);
+ free (reply);
return(client->noClientException);
}
@@ -1873,7 +1873,7 @@ ProcRenderCreateAnimCursor (ClientPtr client)
RT_CURSOR, SecurityReadAccess);
if (!cursors[i])
{
- xfree (cursors);
+ free (cursors);
client->errorValue = elt->cursor;
return BadCursor;
}
@@ -1881,7 +1881,7 @@ ProcRenderCreateAnimCursor (ClientPtr client)
elt++;
}
ret = AnimCursorCreate (cursors, deltas, ncursor, &pCursor);
- xfree (cursors);
+ free (cursors);
if (ret != Success)
return ret;
@@ -2707,7 +2707,7 @@ PanoramiXRenderCreatePicture (ClientPtr client)
if (result == Success)
AddResource(newPict->info[0].id, XRT_PICTURE, newPict);
else
- xfree(newPict);
+ free(newPict);
return (result);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 05:28:11 +0000