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

saver: Don't open-code IsMapInstalled 

Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2014-06-10 13:00:11 -04:00
parent dd0e8491f7
commit 2db71b232c
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Xext/saver.c
View File

@ -467,9 +467,6 @@ CreateSaverWindow(ScreenPtr pScreen)
WindowPtr pWin; WindowPtr pWin;
int result; int result;
unsigned long mask; unsigned long mask;
Colormap *installedMaps;
int numInstalled;
int i;
Colormap wantMap; Colormap wantMap;
ColormapPtr pCmap; ColormapPtr pCmap;
@ -545,18 +542,7 @@ CreateSaverWindow(ScreenPtr pScreen)
/* check and install our own colormap if it isn't installed now */ /* check and install our own colormap if it isn't installed now */
wantMap = wColormap(pWin); wantMap = wColormap(pWin);
if (wantMap == None) if (wantMap == None || IsMapInstalled(wantMap, pWin))
return TRUE;
installedMaps = malloc(pScreen->maxInstalledCmaps * sizeof(Colormap));
numInstalled = (*pWin->drawable.pScreen->ListInstalledColormaps)
(pScreen, installedMaps);
for (i = 0; i < numInstalled; i++)
if (installedMaps[i] == wantMap)
break;
free((char *) installedMaps);
if (i < numInstalled)
return TRUE; return TRUE;
result = dixLookupResourceByType((void **) &pCmap, wantMap, RT_COLORMAP, result = dixLookupResourceByType((void **) &pCmap, wantMap, RT_COLORMAP,