← Back to branch summary

~ubuntu-branches/ubuntu/precise/xorg-server/precise-updates

« back to all changes in this revision

Viewing changes to hw/xnest/Color.c

Tags: 2:1.10.1-2
* Build xserver-xorg-core-udeb on hurd-i386.  Thanks, Samuel Thibault!
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xnest/Color.c
34
34
#include "XNWindow.h"
35
35
#include "Args.h"
36
36
 
 
37
DevPrivateKeyRec xnestColormapPrivateKeyRec;
 
38
 
37
39
static DevPrivateKeyRec cmapScrPrivateKeyRec;
38
40
#define cmapScrPrivateKey (&cmapScrPrivateKeyRec)
39
41
 
52
54
  pVisual = pCmap->pVisual;
53
55
  ncolors = pVisual->ColormapEntries;
54
56
 
55
 
  pCmap->devPriv = (pointer)malloc(sizeof(xnestPrivColormap));
56
 
  
57
57
  xnestColormapPriv(pCmap)->colormap = 
58
58
    XCreateColormap(xnestDisplay,
59
59
                    xnestDefaultWindows[pCmap->pScreen->myNum],
130
130
xnestDestroyColormap(ColormapPtr pCmap)
131
131
{
132
132
  XFreeColormap(xnestDisplay, xnestColormap(pCmap));
133
 
  free(pCmap->devPriv);
134
133
}
135
134
 
136
135
#define SEARCH_PREDICATE \