diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-19 13:23:24 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-19 13:23:24 +0200 |
| commit | b2c925e360e2c366526de15b44603f855f94139c (patch) | |
| tree | 2a963073645913b7c6d43fa04dc0aa13bda57b80 /libXmu/src/StdCmap.c | |
| parent | 18ae1470a8dbcfe369ddf0d7e17e0ea665251ccd (diff) | |
| download | vcxsrv-b2c925e360e2c366526de15b44603f855f94139c.tar.gz vcxsrv-b2c925e360e2c366526de15b44603f855f94139c.tar.bz2 vcxsrv-b2c925e360e2c366526de15b44603f855f94139c.zip | |
xtrans libX11 libXext libXdmcp libXau libXft libXinerama libXmu libfontenc
mesa git update 19 sept 2011
Diffstat (limited to 'libXmu/src/StdCmap.c')
| -rw-r--r-- | libXmu/src/StdCmap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libXmu/src/StdCmap.c b/libXmu/src/StdCmap.c index 5d2ce6160..ccc822e17 100644 --- a/libXmu/src/StdCmap.c +++ b/libXmu/src/StdCmap.c @@ -1,4 +1,4 @@ -/* +/* Copyright 1989, 1998 The Open Group @@ -54,7 +54,7 @@ static Status valid_args(XVisualInfo*, unsigned long, unsigned long, * given standard property name. Return a pointer to an XStandardColormap * structure which describes the newly created colormap, upon success. * Upon failure, return NULL. - * + * * XmuStandardColormap() calls XmuCreateColormap() to create the map. * * Resources created by this function are not made permanent; that is the @@ -83,7 +83,7 @@ XmuStandardColormap(Display *dpy, int screen, VisualID visualid, int n; /* Match the required visual information to an actual visual */ - vinfo_template.visualid = visualid; + vinfo_template.visualid = visualid; vinfo_template.screen = screen; vinfo_template.depth = depth; vinfo_mask = VisualIDMask | VisualScreenMask | VisualDepthMask; @@ -120,7 +120,7 @@ XmuStandardColormap(Display *dpy, int screen, VisualID visualid, stdcmap->red_max = red_max; stdcmap->green_max = green_max; stdcmap->blue_max = blue_max; - if (property == XA_RGB_GRAY_MAP) + if (property == XA_RGB_GRAY_MAP) stdcmap->red_mult = stdcmap->green_mult = stdcmap->blue_mult = 1; else if (vinfo->class == TrueColor || vinfo->class == DirectColor) { stdcmap->red_mult = lowbit(vinfo->red_mask); @@ -149,7 +149,7 @@ XmuStandardColormap(Display *dpy, int screen, VisualID visualid, XFreeColormap(dpy, stdcmap->colormap); else if (stdcmap->killid != None) XFreePixmap(dpy, stdcmap->killid); - + XFree((char *) stdcmap); return (XStandardColormap *) NULL; } @@ -197,7 +197,7 @@ valid_args(XVisualInfo *vinfo, unsigned long red_max, unsigned long green_max, if (ncolors > vinfo->colormap_size) return 0; } - + /* Determine that the allocation and visual make sense for the property */ switch (property) @@ -214,7 +214,7 @@ valid_args(XVisualInfo *vinfo, unsigned long red_max, unsigned long green_max, if (green_max == 0) return 0; break; - case XA_RGB_BLUE_MAP: + case XA_RGB_BLUE_MAP: if (blue_max == 0) return 0; break; |