Parcourir la source

Remove CloseScreen() wrapper

The memory leak this worked around was fixed in X.org 1.16.
tags/v1.11.90
Pierre Ossman il y a 2 ans
Parent
révision
a52d8757df
1 fichiers modifiés avec 0 ajouts et 22 suppressions
  1. 0
    22
      unix/xserver/hw/vnc/xvnc.c

+ 0
- 22
unix/xserver/hw/vnc/xvnc.c Voir le fichier

@@ -113,8 +113,6 @@ typedef struct {

unsigned int lineBias;

CloseScreenProcPtr closeScreen;

vfbFramebufferInfo fb;

Bool pixelFormatDefined;
@@ -1108,23 +1106,6 @@ vncRandRInit(ScreenPtr pScreen)
return TRUE;
}

static Bool
vfbCloseScreen(ScreenPtr pScreen)
{
vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];

pScreen->CloseScreen = pvfb->closeScreen;

/*
* fb overwrites miCloseScreen, so do this here
*/
if (pScreen->devPrivate)
(*pScreen->DestroyPixmap) ((PixmapPtr) pScreen->devPrivate);
pScreen->devPrivate = NULL;

return pScreen->CloseScreen(pScreen);
}

static Bool
vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
{
@@ -1250,9 +1231,6 @@ vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)

miSetZeroLineBias(pScreen, pvfb->lineBias);

pvfb->closeScreen = pScreen->CloseScreen;
pScreen->CloseScreen = vfbCloseScreen;

return TRUE;

} /* end vfbScreenInit */

Chargement…
Annuler
Enregistrer