mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 08:04:30 +00:00
Merge remote branch 'whot/for-keith'
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user