Merge remote branch 'whot/for-keith'

This commit is contained in:
Keith Packard
2010-11-10 16:58:21 -08:00
28 changed files with 355 additions and 399 deletions

View File

@@ -322,16 +322,10 @@ void
miCloseIndexed (ScreenPtr pScreen,
PictFormatPtr pFormat)
{
if (pFormat->index.devPrivate)
{
free(pFormat->index.devPrivate);
pFormat->index.devPrivate = 0;
}
if (pFormat->index.pValues)
{
free(pFormat->index.pValues);
pFormat->index.pValues = 0;
}
free(pFormat->index.devPrivate);
pFormat->index.devPrivate = NULL;
free(pFormat->index.pValues);
pFormat->index.pValues = NULL;
}
void

View File

@@ -1391,11 +1391,8 @@ SetPictureTransform (PicturePtr pPicture,
}
else
{
if (pPicture->transform)
{
free(pPicture->transform);
pPicture->transform = 0;
}
free(pPicture->transform);
pPicture->transform = NULL;
}
pPicture->serialNumber |= GC_CHANGE_SERIAL_BIT;