diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
| commit | 051d521f6e20761ba6831cecd91883da960fa931 (patch) | |
| tree | b28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/cmsCmap.c | |
| parent | 6dce607bad8711dd06a5a7b69ad1930386b4123b (diff) | |
| parent | b8de7bf654929c823080b211aeac56cd213f5a32 (diff) | |
| download | nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2 nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip | |
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214
Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/lib/X11/cmsCmap.c')
| -rw-r--r-- | nx-X11/lib/X11/cmsCmap.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/nx-X11/lib/X11/cmsCmap.c b/nx-X11/lib/X11/cmsCmap.c index e44e46794..00816ce03 100644 --- a/nx-X11/lib/X11/cmsCmap.c +++ b/nx-X11/lib/X11/cmsCmap.c @@ -2,7 +2,7 @@ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved - * + * * This file is a component of an X Window System-specific implementation * of Xcms based on the TekColor Color Management System. Permission is * hereby granted to use, copy, modify, sell, and otherwise distribute this @@ -10,10 +10,10 @@ * that this copyright, permission, and disclaimer notice is reproduced in * all copies of this software and in supporting documentation. TekColor * is a trademark of Tektronix, Inc. - * + * * Tektronix makes no representation about the suitability of this software * for any purpose. It is provided "as is" and with all faults. - * + * * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE, * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A * PARTICULAR PURPOSE. IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY @@ -32,7 +32,6 @@ * * */ -/* $XFree86$ */ #ifdef HAVE_CONFIG_H #include <config.h> @@ -143,7 +142,7 @@ CmapRecForColormap( visualTemplate.screen = i; visualList = XGetVisualInfo(dpy, VisualScreenMask, &visualTemplate, &nVisualsMatched); - if (nVisualsMatched == 0) { + if (visualList == NULL) { continue; } @@ -233,11 +232,11 @@ CmapRecForColormap( * SYNOPSIS */ XcmsCmapRec * -_XcmsAddCmapRec(dpy, cmap, windowID, visual) - Display *dpy; - Colormap cmap; - Window windowID; - Visual *visual; +_XcmsAddCmapRec( + Display *dpy, + Colormap cmap, + Window windowID, + Visual *visual) /* * DESCRIPTION * Create an XcmsCmapRec for the specified cmap, windowID, @@ -408,10 +407,10 @@ _XcmsFreeClientCmaps( * * SYNOPSIS */ -XcmsCCC -XcmsCCCOfColormap(dpy, cmap) - Display *dpy; - Colormap cmap; +XcmsCCC +XcmsCCCOfColormap( + Display *dpy, + Colormap cmap) /* * DESCRIPTION * Finds the XcmsCCC associated with the specified colormap. @@ -477,10 +476,10 @@ XcmsCCCOfColormap(dpy, cmap) return(NULL); } -XcmsCCC XcmsSetCCCOfColormap(dpy, cmap, ccc) - Display *dpy; - Colormap cmap; - XcmsCCC ccc; +XcmsCCC XcmsSetCCCOfColormap( + Display *dpy, + Colormap cmap, + XcmsCCC ccc) { XcmsCCC prev_ccc = NULL; XcmsCmapRec *pRec; |