svn merge file:///D:/svnrepos/vcxsrv/branches/released .

65 files changed, 490 insertions, 441 deletions

diff --git a/libX11/src/xcms/AddDIC.c b/libX11/src/xcms/AddDIC.c
index 6f2987fd0..8ac9852fc 100644
--- a/libX11/src/xcms/AddDIC.c
+++ b/libX11/src/xcms/AddDIC.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/AddSF.c b/libX11/src/xcms/AddSF.c
index 395a23436..f7b1dd2da 100644
--- a/libX11/src/xcms/AddSF.c
+++ b/libX11/src/xcms/AddSF.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/CCC.c b/libX11/src/xcms/CCC.c
index 3ba62cd26..ba52f29d2 100644
--- a/libX11/src/xcms/CCC.c
+++ b/libX11/src/xcms/CCC.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -86,7 +86,7 @@ from The Open Group.
  *	SYNOPSIS
  */
 
-XcmsCCC 
+XcmsCCC
 XcmsCreateCCC(
     Display *dpy,
     int screenNumber,
@@ -115,7 +115,7 @@ XcmsCreateCCC(
     if (pDefaultCCC == NULL ||
 	    !(newccc = (XcmsCCC) Xcalloc(1, (unsigned) sizeof(XcmsCCCRec)))) {
 	return(NULL);
-    } 
+    }
 
     /*
      * Should inherit the following as result of a memmove():
@@ -172,7 +172,7 @@ XcmsCreateCCC(
  *
  *	SYNOPSIS
  */
-XcmsCCC 
+XcmsCCC
 XcmsDefaultCCC(
     Display *dpy,
     int screenNumber)
diff --git a/libX11/src/xcms/CvColW.c b/libX11/src/xcms/CvColW.c
index d57a7666f..50e95dea1 100644
--- a/libX11/src/xcms/CvColW.c
+++ b/libX11/src/xcms/CvColW.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/CvCols.c b/libX11/src/xcms/CvCols.c
index 0fcd55eb6..3a60b836d 100644
--- a/libX11/src/xcms/CvCols.c
+++ b/libX11/src/xcms/CvCols.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -239,7 +239,7 @@ ConvertMixedColors(
  *		batches:
  *			DI to DD
  *			DD to DI(not CIEXYZ)
- *		
+ *
  *		format_flag:
  *		    0x01 : convert Device-Dependent only specifications to the
  *			target format.
@@ -421,7 +421,7 @@ _XcmsDIConvertColors(
  *		3. The calling routine may want to convert only between
  *			CIExyY <-> CIEXYZ <-> CIEuvY
  *		    therefore, this routine allows pWhitePt to equal NULL.
- *		
+ *
  *
  *	RETURNS
  *		XcmsFailure if failed,
@@ -507,7 +507,7 @@ Continue:
 	 * complementary, i.e.,
 	 *	for an i, 0 <= i < n elements
 	 *	from_CIEXYZ[i] is not the inverse of to_CIEXYZ[i]
-	 *	
+	 *
 	 * Execute the functions all the way to CIEXYZ
 	 */
 	while (*src_to_CIEXYZ) {
@@ -603,7 +603,7 @@ _XcmsDDConvertColors(
 
     /*
      * Its ok if pColors_in_out->format == XcmsCIEXYZFormat
-     *	or 
+     *	or
      * if newFormat == XcmsCIEXYZFormat
      */
     if ( !( ValidDDColorSpaceID(ccc, pColors_in_out->format)
@@ -670,7 +670,7 @@ Continue:
 	 * complementary, i.e.,
 	 *	for an i, 0 <= i < n elements
 	 *	from_CIEXYZ[i] is not the inverse of to_CIEXYZ[i]
-	 *	
+	 *
 	 * Execute the functions all the way to CIEXYZ
 	 */
 	while (*src_to_CIEXYZ) {
diff --git a/libX11/src/xcms/HVC.c b/libX11/src/xcms/HVC.c
index c242bac77..60e5eb81b 100644
--- a/libX11/src/xcms/HVC.c
+++ b/libX11/src/xcms/HVC.c
@@ -4,7 +4,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.  TekColor is a
  * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
@@ -12,10 +12,10 @@
  * foreign patents pending).  Permission is hereby granted to use, copy,
  * modify, sell, and otherwise distribute this software and its
  * documentation for any purpose and without fee, provided that:
- * 
+ *
  * 1. This copyright, permission, and disclaimer notice is reproduced in
  *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
+ *    supporting documentation;
  * 2. Any color-handling application which displays TekHVC color
  *    cooordinates identifies these as TekHVC color coordinates in any
  *    interface that displays these coordinates and in any associated
@@ -25,10 +25,10 @@
  *    including those provided in this file and any equivalent pathways and
  *    mathematical derivations, regardless of digital (e.g., floating point
  *    or integer) representation.
- * 
+ *
  * 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
@@ -85,7 +85,7 @@
 /*************************************************************************
  * Note: The DBL_EPSILON for ANSI is 1e-5 so my checks need to take
  *       this into account.  If your DBL_EPSILON is different then
- *       adjust this define. 
+ *       adjust this define.
  *
  *       Also note that EPS is the error factor in the calculations
  *       This may need to be the same as XMY_DBL_EPSILON in
@@ -319,7 +319,7 @@ XcmsTekHVC_ValidSpec(
     }
     while (pColor->spec.TekHVC.H >= 360.0) {
 	pColor->spec.TekHVC.H -= 360.0;
-    } 
+    }
     return(XcmsSuccess);
 }
 
@@ -416,9 +416,9 @@ XcmsTekHVCToCIEuvY(
 	    tempHue = radians(tempHue);
 
 	    /* Calculate u'v' for the obtained hue */
-	    u = (XcmsFloat) ((XCMS_COS(tempHue) * pColor->spec.TekHVC.C) / 
+	    u = (XcmsFloat) ((XCMS_COS(tempHue) * pColor->spec.TekHVC.C) /
 		    (pColor->spec.TekHVC.V * (double)CHROMA_SCALE_FACTOR));
-	    v = (XcmsFloat) ((XCMS_SIN(tempHue) * pColor->spec.TekHVC.C) / 
+	    v = (XcmsFloat) ((XCMS_SIN(tempHue) * pColor->spec.TekHVC.C) /
 		    (pColor->spec.TekHVC.V * (double)CHROMA_SCALE_FACTOR));
 
 	    /* Based on the white point get the offset from best red */
@@ -623,6 +623,6 @@ _XcmsTekHVC_CheckModify(
     } else if (pColor->spec.TekHVC.H >= 360.0) {
 	n = pColor->spec.TekHVC.H / 360.0;
 	pColor->spec.TekHVC.H -= n * 360.0;
-    } 
+    }
     return(1);
 }
diff --git a/libX11/src/xcms/HVCGcC.c b/libX11/src/xcms/HVCGcC.c
index 35981d75e..142a127e0 100644
--- a/libX11/src/xcms/HVCGcC.c
+++ b/libX11/src/xcms/HVCGcC.c
@@ -3,7 +3,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.  TekColor is a
  * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
@@ -11,10 +11,10 @@
  * foreign patents pending).  Permission is hereby granted to use, copy,
  * modify, sell, and otherwise distribute this software and its
  * documentation for any purpose and without fee, provided that:
- * 
+ *
  * 1. This copyright, permission, and disclaimer notice is reproduced in
  *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
+ *    supporting documentation;
  * 2. Any color-handling application which displays TekHVC color
  *    cooordinates identifies these as TekHVC color coordinates in any
  *    interface that displays these coordinates and in any associated
@@ -24,10 +24,10 @@
  *    including those provided in this file and any equivalent pathways and
  *    mathematical derivations, regardless of digital (e.g., floating point
  *    or integer) representation.
- * 
+ *
  * 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
@@ -68,19 +68,19 @@
 /* ARGSUSED */
 Status
 XcmsTekHVCClipC (
-    XcmsCCC ccc, 
-    XcmsColor *pColors_in_out, 
+    XcmsCCC ccc,
+    XcmsColor *pColors_in_out,
     unsigned int nColors,
     unsigned int i,
     Bool *pCompressed)
 /*
  *	DESCRIPTION
  *		Reduce the Chroma for a specific hue and value to
- *		to bring the given color into the gamut of the 
+ *		to bring the given color into the gamut of the
  *		specified device.  As required of gamut compression
  *		functions in Xcms, this routine returns pColor_in_out
  *		in XcmsCIEXYZFormat on successful completion.
- *		
+ *
  *		Since this routine works with the value within
  *		pColor_in_out intermediate results may be returned
  *		even though it may be invalid.
diff --git a/libX11/src/xcms/HVCGcV.c b/libX11/src/xcms/HVCGcV.c
index b6761c8f6..80ff84ad0 100644
--- a/libX11/src/xcms/HVCGcV.c
+++ b/libX11/src/xcms/HVCGcV.c
@@ -3,7 +3,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.  TekColor is a
  * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
@@ -11,10 +11,10 @@
  * foreign patents pending).  Permission is hereby granted to use, copy,
  * modify, sell, and otherwise distribute this software and its
  * documentation for any purpose and without fee, provided that:
- * 
+ *
  * 1. This copyright, permission, and disclaimer notice is reproduced in
  *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
+ *    supporting documentation;
  * 2. Any color-handling application which displays TekHVC color
  *    cooordinates identifies these as TekHVC color coordinates in any
  *    interface that displays these coordinates and in any associated
@@ -24,10 +24,10 @@
  *    including those provided in this file and any equivalent pathways and
  *    mathematical derivations, regardless of digital (e.g., floating point
  *    or integer) representation.
- * 
+ *
  * 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
@@ -68,15 +68,15 @@
 /* ARGSUSED */
 Status
 XcmsTekHVCClipV (
-    XcmsCCC ccc, 
-    XcmsColor *pColors_in_out, 
+    XcmsCCC ccc,
+    XcmsColor *pColors_in_out,
     unsigned int nColors,
     unsigned int i,
     Bool *pCompressed)
 /*
  *	DESCRIPTION
  *		Return the closest value for a specific hue and chroma.
- *		This routine takes any color as input and outputs 
+ *		This routine takes any color as input and outputs
  *		a CIE XYZ color.
  *
  *		Since this routine works with the value within
@@ -116,7 +116,7 @@ XcmsTekHVCClipV (
      */
 
     pColor = pColors_in_out + i;
-    
+
     if (ccc->visual->class < StaticColor &&
 	    FunctionSetOfCCC(ccc) != (XPointer) &XcmsLinearRGBFunctionSet) {
 	/*
@@ -164,7 +164,7 @@ XcmsTekHVCClipV (
 	    /* When the value input is less than the maximum value point */
 	    /* compute the intersection of the line from 0,0 to max_V, max_C */
 	    /* using the chroma input. */
-	    pColor->spec.TekHVC.V = pColor->spec.TekHVC.C * 
+	    pColor->spec.TekHVC.V = pColor->spec.TekHVC.C *
 				    hvc_max.spec.TekHVC.V / hvc_max.spec.TekHVC.C;
 	    if (pColor->spec.TekHVC.V >= hvc_max.spec.TekHVC.V) {
 		pColor->spec.TekHVC.C = hvc_max.spec.TekHVC.C;
diff --git a/libX11/src/xcms/HVCGcVC.c b/libX11/src/xcms/HVCGcVC.c
index 4171c72d7..d7c5e40f2 100644
--- a/libX11/src/xcms/HVCGcVC.c
+++ b/libX11/src/xcms/HVCGcVC.c
@@ -3,7 +3,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.  TekColor is a
  * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
@@ -11,10 +11,10 @@
  * foreign patents pending).  Permission is hereby granted to use, copy,
  * modify, sell, and otherwise distribute this software and its
  * documentation for any purpose and without fee, provided that:
- * 
+ *
  * 1. This copyright, permission, and disclaimer notice is reproduced in
  *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
+ *    supporting documentation;
  * 2. Any color-handling application which displays TekHVC color
  *    cooordinates identifies these as TekHVC color coordinates in any
  *    interface that displays these coordinates and in any associated
@@ -24,10 +24,10 @@
  *    including those provided in this file and any equivalent pathways and
  *    mathematical derivations, regardless of digital (e.g., floating point
  *    or integer) representation.
- * 
+ *
  * 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
@@ -76,14 +76,14 @@
 /* ARGSUSED */
 Status
 XcmsTekHVCClipVC (
-    XcmsCCC ccc, 
-    XcmsColor *pColors_in_out, 
+    XcmsCCC ccc,
+    XcmsColor *pColors_in_out,
     unsigned int nColors,
     unsigned int i,
     Bool *pCompressed)
 /*
  *	DESCRIPTION
- *		This routine will find the closest value and chroma 
+ *		This routine will find the closest value and chroma
  *		for a specific hue.  The color input is converted to
  *		HVC format and returned as CIE XYZ format.
  *
@@ -176,7 +176,7 @@ XcmsTekHVCClipVC (
 	    /* the value and chroma given and the line from 0,0 and hvc_max. */
 	    Chroma = pColor->spec.TekHVC.C;
 	    Value = pColor->spec.TekHVC.V;
-	    pColor->spec.TekHVC.C = 
+	    pColor->spec.TekHVC.C =
 	       (Value + (hvc_max.spec.TekHVC.C / hvc_max.spec.TekHVC.V * Chroma)) /
 	       ((hvc_max.spec.TekHVC.V / hvc_max.spec.TekHVC.C) +
 		(hvc_max.spec.TekHVC.C / hvc_max.spec.TekHVC.V));
@@ -223,7 +223,7 @@ XcmsTekHVCClipVC (
 	    if (!_XcmsTekHVC_CheckModify(pColor)) {
 		return (XcmsFailure);
 	    }
-	    tmpDist = (XcmsFloat) XCMS_SQRT ((double) 
+	    tmpDist = (XcmsFloat) XCMS_SQRT ((double)
 			(((Chroma - pColor->spec.TekHVC.C) *
 			  (Chroma - pColor->spec.TekHVC.C)) +
 			 ((Value - pColor->spec.TekHVC.V) *
@@ -235,7 +235,7 @@ XcmsTekHVCClipVC (
 		nI = (nMaxCount + nI) / 2;
 		saveDist = tmpDist;
 		bestValue = pColor->spec.TekHVC.V;
-		bestChroma = pColor->spec.TekHVC.C;	    
+		bestChroma = pColor->spec.TekHVC.C;
 	    }
 	    if (nI == nILast || nI == 0) {
 		break;
diff --git a/libX11/src/xcms/HVCMnV.c b/libX11/src/xcms/HVCMnV.c
index fd33d2fac..719efcd4f 100644
--- a/libX11/src/xcms/HVCMnV.c
+++ b/libX11/src/xcms/HVCMnV.c
@@ -3,7 +3,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.  TekColor is a
  * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
@@ -11,10 +11,10 @@
  * foreign patents pending).  Permission is hereby granted to use, copy,
  * modify, sell, and otherwise distribute this software and its
  * documentation for any purpose and without fee, provided that:
- * 
+ *
  * 1. This copyright, permission, and disclaimer notice is reproduced in
  *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
+ *    supporting documentation;
  * 2. Any color-handling application which displays TekHVC color
  *    cooordinates identifies these as TekHVC color coordinates in any
  *    interface that displays these coordinates and in any associated
@@ -24,10 +24,10 @@
  *    including those provided in this file and any equivalent pathways and
  *    mathematical derivations, regardless of digital (e.g., floating point
  *    or integer) representation.
- * 
+ *
  * 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
@@ -97,7 +97,7 @@ XcmsTekHVCQueryMinV (
  *		XcmsFailure - Failure
  *		XcmsSuccess - Succeeded with no modifications
  *
- */ 
+ */
 {
     XcmsCCCRec myCCC;
     XcmsColor tmp;
diff --git a/libX11/src/xcms/HVCMxC.c b/libX11/src/xcms/HVCMxC.c
index 6e6923704..3389b8d29 100644
--- a/libX11/src/xcms/HVCMxC.c
+++ b/libX11/src/xcms/HVCMxC.c
@@ -3,7 +3,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.  TekColor is a
  * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
@@ -11,10 +11,10 @@
  * foreign patents pending).  Permission is hereby granted to use, copy,
  * modify, sell, and otherwise distribute this software and its
  * documentation for any purpose and without fee, provided that:
- * 
+ *
  * 1. This copyright, permission, and disclaimer notice is reproduced in
  *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
+ *    supporting documentation;
  * 2. Any color-handling application which displays TekHVC color
  *    cooordinates identifies these as TekHVC color coordinates in any
  *    interface that displays these coordinates and in any associated
@@ -24,10 +24,10 @@
  *    including those provided in this file and any equivalent pathways and
  *    mathematical derivations, regardless of digital (e.g., floating point
  *    or integer) representation.
- * 
+ *
  * 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
@@ -75,7 +75,7 @@
  */
 Status
 XcmsTekHVCQueryMaxC(
-    XcmsCCC ccc, 
+    XcmsCCC ccc,
     XcmsFloat hue,
     XcmsFloat value,
     XcmsColor *pColor_return)
@@ -212,7 +212,7 @@ XcmsTekHVCQueryMaxC(
 		if (ftmp1 < ftmp2) {
 		    tmp.spec.TekHVC.V = lastValue;
 		    tmp.spec.TekHVC.C = lastChroma;
-		} 
+		}
 		if (_XcmsTekHVC_CheckModify (&tmp)) {
 		    memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
 		    return(XcmsSuccess);
@@ -237,7 +237,7 @@ XcmsTekHVCQueryMaxC(
 		tmp.spec.TekHVC.C = lastChroma;
 	    }
 	}
-    } 
+    }
     /* make sure to return the input hue */
     tmp.spec.TekHVC.H = hue;
     memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
diff --git a/libX11/src/xcms/HVCMxV.c b/libX11/src/xcms/HVCMxV.c
index 72d0ccbcc..c54b83095 100644
--- a/libX11/src/xcms/HVCMxV.c
+++ b/libX11/src/xcms/HVCMxV.c
@@ -3,7 +3,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.  TekColor is a
  * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
@@ -11,10 +11,10 @@
  * foreign patents pending).  Permission is hereby granted to use, copy,
  * modify, sell, and otherwise distribute this software and its
  * documentation for any purpose and without fee, provided that:
- * 
+ *
  * 1. This copyright, permission, and disclaimer notice is reproduced in
  *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
+ *    supporting documentation;
  * 2. Any color-handling application which displays TekHVC color
  *    cooordinates identifies these as TekHVC color coordinates in any
  *    interface that displays these coordinates and in any associated
@@ -24,10 +24,10 @@
  *    including those provided in this file and any equivalent pathways and
  *    mathematical derivations, regardless of digital (e.g., floating point
  *    or integer) representation.
- * 
+ *
  * 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
@@ -144,7 +144,7 @@ XcmsTekHVCQueryMaxV(
 
     if (max_vc.spec.TekHVC.C < tmp.spec.TekHVC.C) {
 	/*
-	 *  If the chroma is greater than the chroma for the 
+	 *  If the chroma is greater than the chroma for the
 	 *  maximum value/chroma point then the value is the
 	 *  the value for the maximum value, chroma point.
 	 *  This is an error but it I return the best approximation I can.
@@ -156,7 +156,7 @@ XcmsTekHVCQueryMaxV(
 	return(XcmsSuccess);
     } else if (max_vc.spec.TekHVC.C == tmp.spec.TekHVC.C) {
 	/*
-	 *  If the chroma is equal to the chroma for the 
+	 *  If the chroma is equal to the chroma for the
 	 *  maximum value/chroma point then the value is the
 	 *  the value for the maximum value, chroma point.
 	 */
@@ -198,7 +198,7 @@ XcmsTekHVCQueryMaxV(
 		tmp.spec.TekHVC.H = hue;  /* use the saved hue */
 		memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
 		return(XcmsSuccess);
-	    } 
+	    }
 	    nChroma += savedChroma - tmp.spec.TekHVC.C;
 	    if (nChroma > max_vc.spec.TekHVC.C) {
 		nChroma = max_vc.spec.TekHVC.C;
diff --git a/libX11/src/xcms/HVCMxVC.c b/libX11/src/xcms/HVCMxVC.c
index c3726f08b..ae22b89d1 100644
--- a/libX11/src/xcms/HVCMxVC.c
+++ b/libX11/src/xcms/HVCMxVC.c
@@ -3,7 +3,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.  TekColor is a
  * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
@@ -11,10 +11,10 @@
  * foreign patents pending).  Permission is hereby granted to use, copy,
  * modify, sell, and otherwise distribute this software and its
  * documentation for any purpose and without fee, provided that:
- * 
+ *
  * 1. This copyright, permission, and disclaimer notice is reproduced in
  *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
+ *    supporting documentation;
  * 2. Any color-handling application which displays TekHVC color
  *    cooordinates identifies these as TekHVC color coordinates in any
  *    interface that displays these coordinates and in any associated
@@ -24,10 +24,10 @@
  *    including those provided in this file and any equivalent pathways and
  *    mathematical derivations, regardless of digital (e.g., floating point
  *    or integer) representation.
- * 
+ *
  * 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
@@ -104,7 +104,7 @@ _XcmsTekHVCQueryMaxVCRGB(
  *		XcmsFailure - Failure
  *		XCMS_SUCCUSS - Succeeded
  *
- */ 
+ */
 {
     XcmsFloat nSmall, nLarge;
     XcmsColor tmp;
@@ -124,14 +124,14 @@ _XcmsTekHVCQueryMaxVCRGB(
      * is NULL.
      */
     if ((_XcmsConvertColorsWithWhitePt(ccc, &tmp,
-	    &ccc->pPerScrnInfo->screenWhitePt, 1, XcmsRGBiFormat, (Bool *) NULL) 
+	    &ccc->pPerScrnInfo->screenWhitePt, 1, XcmsRGBiFormat, (Bool *) NULL)
 	    == XcmsFailure) && tmp.format != XcmsRGBiFormat) {
 	return (XcmsFailure);
     }
 
     /* Now pick the smallest RGB */
-    nSmall = MIN3(tmp.spec.RGBi.red, 
-		  tmp.spec.RGBi.green, 
+    nSmall = MIN3(tmp.spec.RGBi.red,
+		  tmp.spec.RGBi.green,
 		  tmp.spec.RGBi.blue);
     /* Make the smallest RGB equal to zero */
     tmp.spec.RGBi.red   -= nSmall;
@@ -139,8 +139,8 @@ _XcmsTekHVCQueryMaxVCRGB(
     tmp.spec.RGBi.blue  -= nSmall;
 
     /* Now pick the largest RGB */
-    nLarge = MAX3(tmp.spec.RGBi.red, 
-		  tmp.spec.RGBi.green, 
+    nLarge = MAX3(tmp.spec.RGBi.red,
+		  tmp.spec.RGBi.green,
 		  tmp.spec.RGBi.blue);
     /* Scale the RGB values based on the largest one */
     tmp.spec.RGBi.red   /= nLarge;
@@ -157,7 +157,7 @@ _XcmsTekHVCQueryMaxVCRGB(
 
     /* Convert from RGBi to HVC */
     if (_XcmsConvertColorsWithWhitePt(ccc, &tmp,
-	    &ccc->pPerScrnInfo->screenWhitePt, 1, XcmsTekHVCFormat, (Bool *) NULL) 
+	    &ccc->pPerScrnInfo->screenWhitePt, 1, XcmsTekHVCFormat, (Bool *) NULL)
 	    == XcmsFailure) {
 	return (XcmsFailure);
     }
@@ -165,7 +165,7 @@ _XcmsTekHVCQueryMaxVCRGB(
     /* make sure to return the input hue */
     tmp.spec.TekHVC.H = hue;
     memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
-    return (XcmsSuccess);    
+    return (XcmsSuccess);
 }
 
 
@@ -202,7 +202,7 @@ XcmsTekHVCQueryMaxVC (
  *		XcmsFailure - Failure
  *		XcmsSuccess - Succeeded
  *
- */ 
+ */
 {
     XcmsCCCRec myCCC;
 
@@ -219,7 +219,7 @@ XcmsTekHVCQueryMaxVC (
     if (XcmsAddColorSpace(&XcmsTekHVCColorSpace) == XcmsFailure) {
 	return(XcmsFailure);
     }
-    
+
     /* Use my own CCC */
     memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
     myCCC.clientWhitePt.format = XcmsUndefinedFormat;
@@ -230,8 +230,8 @@ XcmsTekHVCQueryMaxVC (
     }
     while (hue >= 360.0) {
 	hue -= 360.0;
-    } 
-    
+    }
+
     return(_XcmsTekHVCQueryMaxVCRGB (&myCCC, hue, pColor_return,
 	    (XcmsRGBi *)NULL));
 }
diff --git a/libX11/src/xcms/HVCMxVs.c b/libX11/src/xcms/HVCMxVs.c
index 88376e558..7368792b2 100644
--- a/libX11/src/xcms/HVCMxVs.c
+++ b/libX11/src/xcms/HVCMxVs.c
@@ -3,7 +3,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.  TekColor is a
  * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
@@ -11,10 +11,10 @@
  * foreign patents pending).  Permission is hereby granted to use, copy,
  * modify, sell, and otherwise distribute this software and its
  * documentation for any purpose and without fee, provided that:
- * 
+ *
  * 1. This copyright, permission, and disclaimer notice is reproduced in
  *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
+ *    supporting documentation;
  * 2. Any color-handling application which displays TekHVC color
  *    cooordinates identifies these as TekHVC color coordinates in any
  *    interface that displays these coordinates and in any associated
@@ -24,10 +24,10 @@
  *    including those provided in this file and any equivalent pathways and
  *    mathematical derivations, regardless of digital (e.g., floating point
  *    or integer) representation.
- * 
+ *
  * 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
@@ -76,7 +76,7 @@ XcmsTekHVCQueryMaxVSamples(
 /*
  *	DESCRIPTION
  *		Return a set of values and chromas for the input Hue.
- *		This routine will take any color as input.  
+ *		This routine will take any color as input.
  *		It returns TekHVC colors.
  *
  *		Since this routine works with the value within
diff --git a/libX11/src/xcms/HVCWpAj.c b/libX11/src/xcms/HVCWpAj.c
index f9e2c38d1..c7469ddee 100644
--- a/libX11/src/xcms/HVCWpAj.c
+++ b/libX11/src/xcms/HVCWpAj.c
@@ -3,7 +3,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.  TekColor is a
  * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
@@ -11,10 +11,10 @@
  * foreign patents pending).  Permission is hereby granted to use, copy,
  * modify, sell, and otherwise distribute this software and its
  * documentation for any purpose and without fee, provided that:
- * 
+ *
  * 1. This copyright, permission, and disclaimer notice is reproduced in
  *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
+ *    supporting documentation;
  * 2. Any color-handling application which displays TekHVC color
  *    cooordinates identifies these as TekHVC color coordinates in any
  *    interface that displays these coordinates and in any associated
@@ -24,10 +24,10 @@
  *    including those provided in this file and any equivalent pathways and
  *    mathematical derivations, regardless of digital (e.g., floating point
  *    or integer) representation.
- * 
+ *
  * 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
diff --git a/libX11/src/xcms/IdOfPr.c b/libX11/src/xcms/IdOfPr.c
index 47e4ec308..37c7a6317 100644
--- a/libX11/src/xcms/IdOfPr.c
+++ b/libX11/src/xcms/IdOfPr.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/LRGB.c b/libX11/src/xcms/LRGB.c
index dff677686..6ec2a1889 100644
--- a/libX11/src/xcms/LRGB.c
+++ b/libX11/src/xcms/LRGB.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -189,7 +189,7 @@ XcmsColorSpace	XcmsRGBColorSpace =
     };
 
     /*
-     * Device-Independent Color Spaces known to the 
+     * Device-Independent Color Spaces known to the
      * LINEAR_RGB Screen Color Characteristics Function Set.
      */
 static XcmsColorSpace	*DDColorSpaces[] = {
@@ -483,17 +483,17 @@ LINEAR_RGB_InitSCCData(
     /*
      * Allocate memory for pScreenData
      */
-    if (!(pScreenData = pScreenDefaultData = (LINEAR_RGB_SCCData *) 
+    if (!(pScreenData = pScreenDefaultData = (LINEAR_RGB_SCCData *)
 		      Xcalloc (1, sizeof(LINEAR_RGB_SCCData)))) {
 	return(XcmsFailure);
     }
 
-    /* 
+    /*
      *  1. Get the XYZ->RGB and RGB->XYZ matrices
      */
 
     if (MatrixAtom == None ||
-	!_XcmsGetProperty (dpy, RootWindow(dpy, screenNumber), MatrixAtom, 
+	!_XcmsGetProperty (dpy, RootWindow(dpy, screenNumber), MatrixAtom,
 	   &format_return, &nitems, &nbytes_return, &property_return) ||
 	   nitems != 18 || format_return != 32) {
 	/*
@@ -658,7 +658,7 @@ LINEAR_RGB_InitSCCData(
 	    /*
 	     * This is a per-Visual intensity table
 	     */
-	    if (!(pScreenData = (LINEAR_RGB_SCCData *) 
+	    if (!(pScreenData = (LINEAR_RGB_SCCData *)
 			      Xcalloc (1, sizeof(LINEAR_RGB_SCCData)))) {
 		return(XcmsFailure);
 	    }
@@ -667,7 +667,7 @@ LINEAR_RGB_InitSCCData(
 		   18 * sizeof(XcmsFloat));
 
 	    /* Create, initialize, and add map */
-	    if (!(pNewMap = (XcmsIntensityMap *) 
+	    if (!(pNewMap = (XcmsIntensityMap *)
 			      Xcalloc (1, sizeof(XcmsIntensityMap)))) {
 		Xfree((char *)pScreenData);
 		return(XcmsFailure);
@@ -721,7 +721,7 @@ LINEAR_RGB_InitSCCData(
 			&nitems) == XcmsFailure) {
 		    goto FreeBlueTbl;
 		}
-	    }	    
+	    }
 	} else if (cType == 1) {
 	    /* Red Intensity Table */
 	    if (!(pScreenData->pRedTbl = (IntensityTbl *)
@@ -851,7 +851,7 @@ LINEAR_RGB_FreeSCCData(
     if (pScreenData && pScreenData != &Default_RGB_SCCData) {
 	if (pScreenData->pRedTbl) {
 	    if (pScreenData->pGreenTbl) {
-		if (pScreenData->pRedTbl->pBase != 
+		if (pScreenData->pRedTbl->pBase !=
 		    pScreenData->pGreenTbl->pBase) {
 		    if (pScreenData->pGreenTbl->pBase) {
 			Xfree ((char *)pScreenData->pGreenTbl->pBase);
@@ -862,7 +862,7 @@ LINEAR_RGB_FreeSCCData(
 		}
 	    }
 	    if (pScreenData->pBlueTbl) {
-		if (pScreenData->pRedTbl->pBase != 
+		if (pScreenData->pRedTbl->pBase !=
 		    pScreenData->pBlueTbl->pBase) {
 		    if (pScreenData->pBlueTbl->pBase) {
 			Xfree ((char *)pScreenData->pBlueTbl->pBase);
@@ -921,7 +921,7 @@ _XcmsGetTableType0(
     }
 
     switch (format) {
-      case 8: 
+      case 8:
 	for (; nElements--; pIRec++) {
 	    /* 0xFFFF/0xFF = 0x101 */
 	    pIRec->value = _XcmsGetElement (format, pChar, pCount) * 0x101;
@@ -929,14 +929,14 @@ _XcmsGetTableType0(
 		    _XcmsGetElement (format, pChar, pCount) / (XcmsFloat)255.0;
 	}
 	break;
-      case 16: 
+      case 16:
 	for (; nElements--; pIRec++) {
 	    pIRec->value = _XcmsGetElement (format, pChar, pCount);
 	    pIRec->intensity = _XcmsGetElement (format, pChar, pCount)
 		    / (XcmsFloat)65535.0;
 	}
 	break;
-      case 32: 
+      case 32:
 	for (; nElements--; pIRec++) {
 	    pIRec->value = _XcmsGetElement (format, pChar, pCount);
 	    pIRec->intensity = _XcmsGetElement (format, pChar, pCount)
@@ -983,21 +983,21 @@ _XcmsGetTableType1(
     }
 
     switch (format) {
-      case 8: 
+      case 8:
 	for (count = 0; count < max_index+1; count++, pIRec++) {
 	    pIRec->value = (count * 65535) / max_index;
 	    pIRec->intensity = _XcmsGetElement (format, pChar, pCount)
 		    / (XcmsFloat)255.0;
 	}
 	break;
-      case 16: 
+      case 16:
 	for (count = 0; count < max_index+1; count++, pIRec++) {
 	    pIRec->value = (count * 65535) / max_index;
 	    pIRec->intensity = _XcmsGetElement (format, pChar, pCount)
 		    / (XcmsFloat)65535.0;
 	}
 	break;
-      case 32: 
+      case 32:
 	for (count = 0; count < max_index+1; count++, pIRec++) {
 	    pIRec->value = (count * 65535) / max_index;
 	    pIRec->intensity = _XcmsGetElement (format, pChar, pCount)
@@ -1090,7 +1090,7 @@ _XcmsValueInterpolation(
 {
     XcmsFloat ratio;
 
-    ratio = ((XcmsFloat)key->value - (XcmsFloat)lo->value) / 
+    ratio = ((XcmsFloat)key->value - (XcmsFloat)lo->value) /
 	((XcmsFloat)hi->value - (XcmsFloat)lo->value);
     answer->value = key->value;
     answer->intensity = (hi->intensity - lo->intensity) * ratio;
@@ -1241,7 +1241,7 @@ static void _XcmsMatVec(
     XcmsFloat *pMat, XcmsFloat *pIn, XcmsFloat *pOut)
 /*
  *      DESCRIPTION
- *		Multiply the passed vector by the passed matrix to return a 
+ *		Multiply the passed vector by the passed matrix to return a
  *		vector. Matrix is 3x3, vectors are of length 3.
  *
  *	RETURNS
@@ -1468,7 +1468,7 @@ XcmsLRGB_RGBi_ParseString(
  *	SYNOPSIS
  */
 /* ARGSUSED */
-Status 
+Status
 XcmsCIEXYZToRGBi(
     XcmsCCC ccc,
     XcmsColor *pXcmsColors_in_out,/* pointer to XcmsColors to convert 	*/
@@ -1534,7 +1534,7 @@ XcmsCIEXYZToRGBi(
 		/*
 		 * Aha!! Here's that little trick that will allow
 		 * gamut compression routines to get the out of bound
-		 * RGBi.  
+		 * RGBi.
 		 */
 		memcpy((char *)&pColor->spec, (char *)tmp, sizeof(tmp));
 		pColor->format = XcmsRGBiFormat;
@@ -1590,7 +1590,7 @@ XcmsCIEXYZToRGBi(
  *	SYNOPSIS
  */
 /* ARGSUSED */
-Status 
+Status
 XcmsRGBiToCIEXYZ(
     XcmsCCC ccc,
     XcmsColor *pXcmsColors_in_out,/* pointer to XcmsColors to convert 	*/
@@ -1643,7 +1643,7 @@ XcmsRGBiToCIEXYZ(
  *	SYNOPSIS
  */
 /* ARGSUSED */
-Status 
+Status
 XcmsRGBiToRGB(
     XcmsCCC ccc,
     XcmsColor *pXcmsColors_in_out,/* pointer to XcmsColors to convert 	*/
@@ -1726,7 +1726,7 @@ XcmsRGBiToRGB(
  *	SYNOPSIS
  */
 /* ARGSUSED */
-Status 
+Status
 XcmsRGBToRGBi(
     XcmsCCC ccc,
     XcmsColor *pXcmsColors_in_out,/* pointer to XcmsColors to convert 	*/
diff --git a/libX11/src/xcms/Lab.c b/libX11/src/xcms/Lab.c
index ae83110ee..df19964df 100644
--- a/libX11/src/xcms/Lab.c
+++ b/libX11/src/xcms/Lab.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/LabGcC.c b/libX11/src/xcms/LabGcC.c
index 366f29366..1f929eb86 100644
--- a/libX11/src/xcms/LabGcC.c
+++ b/libX11/src/xcms/LabGcC.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -63,11 +63,11 @@ XcmsCIELabClipab (
 /*
  *	DESCRIPTION
  *		Reduce the Chroma for a specific hue and chroma to
- *		to bring the given color into the gamut of the 
+ *		to bring the given color into the gamut of the
  *		specified device.  As required of gamut compression
  *		functions, this routine returns pColor_in_out
  *		in XcmsCIEXYZFormat on successful completion.
- *		
+ *
  *		Since this routine works with the L* within
  *		pColor_in_out intermediate results may be returned
  *		even though it may be invalid.
@@ -113,7 +113,7 @@ XcmsCIELabClipab (
 	    }
 	}
 	if (XcmsCIELabQueryMaxC(ccc,
-		degrees(XCMS_CIELAB_PMETRIC_HUE(pColor->spec.CIELab.a_star, 
+		degrees(XCMS_CIELAB_PMETRIC_HUE(pColor->spec.CIELab.a_star,
 						pColor->spec.CIELab.b_star)),
 		pColor->spec.CIELab.L_star,
 		pColor) == XcmsFailure) {
diff --git a/libX11/src/xcms/LabGcL.c b/libX11/src/xcms/LabGcL.c
index 9722c21a4..fc82e5e83 100644
--- a/libX11/src/xcms/LabGcL.c
+++ b/libX11/src/xcms/LabGcL.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -63,7 +63,7 @@ XcmsCIELabClipL (
 /*
  *	DESCRIPTION
  *		Return the closest L* for a specific hue and chroma.
- *		This routine takes any color as input and outputs 
+ *		This routine takes any color as input and outputs
  *		a CIE XYZ color.
  *
  *		Since this routine works with the L* within
@@ -97,7 +97,7 @@ XcmsCIELabClipL (
      */
 
     pColor = pColors_in_out + i;
-    
+
     if (ccc->visual->class < StaticColor) {
 	/*
 	 * GRAY !
@@ -138,7 +138,7 @@ XcmsCIELabClipL (
 	    memcpy((char *)pColor, (char *)&Lab_max, sizeof(XcmsColor));
 	    return (XcmsFailure);
 	} else if (pColor->spec.CIELab.L_star < Lab_max.spec.CIELab.L_star) {
-	    /* Find the minimum lightness for the given chroma. */  
+	    /* Find the minimum lightness for the given chroma. */
 	    if (pColor->format != XcmsCIELabFormat) {
 		if (_XcmsDIConvertColors(ccc, pColor,
 			ScreenWhitePointOfCCC(ccc), 1, XcmsCIELabFormat)
diff --git a/libX11/src/xcms/LabGcLC.c b/libX11/src/xcms/LabGcLC.c
index 47490cdee..e9b5a50b3 100644
--- a/libX11/src/xcms/LabGcLC.c
+++ b/libX11/src/xcms/LabGcLC.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -70,7 +70,7 @@ XcmsCIELabClipLab (
     Bool *pCompressed)
 /*
  *	DESCRIPTION
- *		This routine will find the closest L* and chroma 
+ *		This routine will find the closest L* and chroma
  *		for a specific hue.  The color input is converted to
  *		CIE L*u*v* format and returned as CIE XYZ format.
  *
@@ -140,12 +140,12 @@ XcmsCIELabClipLab (
     chroma = XCMS_CIELAB_PMETRIC_CHROMA(pColor->spec.CIELab.a_star,
 					pColor->spec.CIELab.b_star);
     memcpy((char *)&Lab_max, (char *)pColor, sizeof(XcmsColor));
-    if (_XcmsCIELabQueryMaxLCRGB (&myCCC, hue, &Lab_max, &rgb_max) 
+    if (_XcmsCIELabQueryMaxLCRGB (&myCCC, hue, &Lab_max, &rgb_max)
 	    == XcmsFailure) {
 	return (XcmsFailure);
     }
     maxLstar = Lab_max.spec.CIELab.L_star;
-	
+
     /* Now check and return the appropriate L* */
     if (saveLstar == maxLstar) {
 	/* When the L* input is equal to the maximum L* */
@@ -199,7 +199,7 @@ XcmsCIELabClipLab (
 		bestLstar = pColor->spec.CIELab.L_star;
 		bestastar = pColor->spec.CIELab.a_star;
 		bestbstar = pColor->spec.CIELab.b_star;
-		bestChroma = chroma;	    
+		bestChroma = chroma;
 	    }
 	    if (nI == nILast || nI == 0) {
 		break;
diff --git a/libX11/src/xcms/LabMnL.c b/libX11/src/xcms/LabMnL.c
index 9b4cd3d3a..2c2b2be54 100644
--- a/libX11/src/xcms/LabMnL.c
+++ b/libX11/src/xcms/LabMnL.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -108,7 +108,7 @@ XcmsCIELabQueryMinL(
     }
     while (hue_angle >= 360.0) {
 	hue_angle -= 360.0;
-    } 
+    }
 
     hue = radians(hue_angle);
     tmp.spec.CIELab.L_star = START_L_STAR;
@@ -116,7 +116,7 @@ XcmsCIELabQueryMinL(
     tmp.spec.CIELab.b_star = XCMS_CIEBSTAROFHUE(hue, chroma);
     tmp.pixel = pColor_return->pixel;
     tmp.format = XcmsCIELabFormat;
-    
+
     /* Step 1: Obtain the maximum L_star and chroma for this hue. */
     if (_XcmsCIELabQueryMaxLCRGB(&myCCC, hue, &max_lc, &rgb_saved)
 	    == XcmsFailure) {
@@ -128,7 +128,7 @@ XcmsCIELabQueryMinL(
 
     if (max_chroma <= chroma) {
 	/*
-	 *  If the chroma is greater than the chroma for the 
+	 *  If the chroma is greater than the chroma for the
 	 *  maximum L/chroma point then the L_star is the
 	 *  the L_star for the maximum L_star/chroma point.
 	 *  This is an error but I return the best approximation I can.
@@ -139,7 +139,7 @@ XcmsCIELabQueryMinL(
     }
 
     /*
-     *  If the chroma is equal to the chroma for the 
+     *  If the chroma is equal to the chroma for the
      *  maximum L_star/chroma point then the L_star is the
      *  the L_star for the maximum L* and chroma point.
      */
@@ -182,15 +182,15 @@ XcmsCIELabQueryMinL(
 	    /* Found It! */
 	    memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
 	    return(XcmsSuccess);
-	} 
+	}
 	nChroma += chroma - tmp_chroma;
 	if (nChroma > max_chroma) {
 	    nChroma = max_chroma;
 	    rFactor *= 0.5;  /* selective relaxation employed */
 	} else if (nChroma < 0.0) {
-	    if (XCMS_FABS(lastChroma - chroma) < 
+	    if (XCMS_FABS(lastChroma - chroma) <
 		XCMS_FABS(tmp_chroma - chroma)) {
-		memcpy ((char *)pColor_return, (char *)&prev, 
+		memcpy ((char *)pColor_return, (char *)&prev,
 			sizeof(XcmsColor));
 	    } else {
 		memcpy ((char *)pColor_return, (char *)&tmp,
@@ -204,7 +204,7 @@ XcmsCIELabQueryMinL(
     }
 
     if (nCount >= nMaxCount) {
-	if (XCMS_FABS(lastChroma - chroma) < 
+	if (XCMS_FABS(lastChroma - chroma) <
 	    XCMS_FABS(tmp_chroma - chroma)) {
 		memcpy ((char *)pColor_return, (char *)&prev,
  			sizeof(XcmsColor));
diff --git a/libX11/src/xcms/LabMxC.c b/libX11/src/xcms/LabMxC.c
index acd83f2d5..be763d3e1 100644
--- a/libX11/src/xcms/LabMxC.c
+++ b/libX11/src/xcms/LabMxC.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -105,7 +105,7 @@ XcmsCIELabQueryMaxC(
 
     /* Use my own CCC and inherit screen white Pt */
     memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat; 
+    myCCC.clientWhitePt.format = XcmsUndefinedFormat;
     myCCC.gamutCompProc = (XcmsCompressionProc)NULL;/* no gamut comp func */
 
     while (hue_angle < 0.0) {
@@ -113,7 +113,7 @@ XcmsCIELabQueryMaxC(
     }
     while (hue_angle >= 360.0) {
 	hue_angle -= 360.0;
-    } 
+    }
 
     hue = radians(hue_angle);
     tmp.spec.CIELab.L_star = L_star;
@@ -192,7 +192,7 @@ XcmsCIELabQueryMaxC(
 		/* printf("rFactor = %lf\n", rFactor); */
 	}
     }
-    if (XCMS_FABS(last_L_star - L_star) < 
+    if (XCMS_FABS(last_L_star - L_star) <
 	XCMS_FABS(tmp.spec.CIELab.L_star - L_star)) {
 	    tmp.spec.CIELab.a_star = lastaStar;
 	    tmp.spec.CIELab.b_star = lastbStar;
diff --git a/libX11/src/xcms/LabMxL.c b/libX11/src/xcms/LabMxL.c
index fbc39eef3..6db122227 100644
--- a/libX11/src/xcms/LabMxL.c
+++ b/libX11/src/xcms/LabMxL.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -108,7 +108,7 @@ XcmsCIELabQueryMaxL(
     }
     while (hue_angle >= 360.0) {
 	hue_angle -= 360.0;
-    } 
+    }
 
     hue = radians(hue_angle);
     tmp.spec.CIELab.L_star = START_L_STAR;
@@ -116,7 +116,7 @@ XcmsCIELabQueryMaxL(
     tmp.spec.CIELab.b_star = XCMS_CIEBSTAROFHUE(hue, chroma);
     tmp.pixel = pColor_return->pixel;
     tmp.format = XcmsCIELabFormat;
-    
+
     /* Step 1: Obtain the maximum L_star and chroma for this hue. */
     if (_XcmsCIELabQueryMaxLCRGB(&myCCC, hue, &max_lc, &rgb_saved)
 	    == XcmsFailure) {
@@ -128,7 +128,7 @@ XcmsCIELabQueryMaxL(
 
     if (max_chroma <= chroma) {
 	/*
-	 *  If the chroma is greater than the chroma for the 
+	 *  If the chroma is greater than the chroma for the
 	 *  maximum L/chroma point then the L_star is the
 	 *  the L_star for the maximum L_star/chroma point.
 	 *  This is an error but I return the best approximation I can.
@@ -139,7 +139,7 @@ XcmsCIELabQueryMaxL(
     }
 
     /*
-     *  If the chroma is equal to the chroma for the 
+     *  If the chroma is equal to the chroma for the
      *  maximum L_star/chroma point then the L_star is the
      *  the L_star for the maximum L* and chroma point.
      */
@@ -182,13 +182,13 @@ XcmsCIELabQueryMaxL(
 	    /* Found It! */
 	    memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
 	    return(XcmsSuccess);
-	} 
+	}
 	nChroma += chroma - tmp_chroma;
 	if (nChroma > max_chroma) {
 	    nChroma = max_chroma;
 	    rFactor *= 0.5;  /* selective relaxation employed */
 	} else if (nChroma < 0.0) {
-	    if (XCMS_FABS(lastChroma - chroma) < 
+	    if (XCMS_FABS(lastChroma - chroma) <
 		XCMS_FABS(tmp_chroma - chroma)) {
 		memcpy ((char *)pColor_return, (char *)&prev,
  			sizeof(XcmsColor));
@@ -204,7 +204,7 @@ XcmsCIELabQueryMaxL(
     }
 
     if (nCount >= nMaxCount) {
-	if (XCMS_FABS(lastChroma - chroma) < 
+	if (XCMS_FABS(lastChroma - chroma) <
 	    XCMS_FABS(tmp_chroma - chroma)) {
 		memcpy ((char *)pColor_return, (char *)&prev,
  			sizeof(XcmsColor));
diff --git a/libX11/src/xcms/LabMxLC.c b/libX11/src/xcms/LabMxLC.c
index c24dd4b98..9efc86972 100644
--- a/libX11/src/xcms/LabMxLC.c
+++ b/libX11/src/xcms/LabMxLC.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -83,7 +83,7 @@ _XcmsCIELabQueryMaxLCRGB(
  *		by a binary search of all possible chromas.  An assumption
  *		is made that there are no local maxima.  Use the unrounded
  *		Max psychometric chroma because the difference check can be
- *		small.  
+ *		small.
  *
  *		NOTE:  No local CCC is used because this is a private
  *		       routine and all routines that call it are expected
@@ -98,7 +98,7 @@ _XcmsCIELabQueryMaxLCRGB(
  *		XcmsFailure - Failure
  *		XcmsSuccess - Succeeded
  *
- */ 
+ */
 {
     XcmsFloat nSmall, nLarge;
     XcmsColor tmp;
@@ -115,15 +115,15 @@ _XcmsCIELabQueryMaxLCRGB(
      * out of bounds RGBi values in tmp when the ccc->gamutCompProc
      * is NULL.
      */
-    if ((_XcmsConvertColorsWithWhitePt(ccc, &tmp, ScreenWhitePointOfCCC(ccc), 
-		               (unsigned int)1, XcmsRGBiFormat, (Bool *) NULL) 
+    if ((_XcmsConvertColorsWithWhitePt(ccc, &tmp, ScreenWhitePointOfCCC(ccc),
+		               (unsigned int)1, XcmsRGBiFormat, (Bool *) NULL)
 	    == XcmsFailure) && tmp.format != XcmsRGBiFormat) {
 	return (XcmsFailure);
     }
 
     /* Now pick the smallest RGB */
-    nSmall = MIN3(tmp.spec.RGBi.red, 
-		  tmp.spec.RGBi.green, 
+    nSmall = MIN3(tmp.spec.RGBi.red,
+		  tmp.spec.RGBi.green,
 		  tmp.spec.RGBi.blue);
     /* Make the smallest RGB equal to zero */
     tmp.spec.RGBi.red   -= nSmall;
@@ -131,8 +131,8 @@ _XcmsCIELabQueryMaxLCRGB(
     tmp.spec.RGBi.blue  -= nSmall;
 
     /* Now pick the largest RGB */
-    nLarge = MAX3(tmp.spec.RGBi.red, 
-		  tmp.spec.RGBi.green, 
+    nLarge = MAX3(tmp.spec.RGBi.red,
+		  tmp.spec.RGBi.green,
 		  tmp.spec.RGBi.blue);
     /* Scale the RGB values based on the largest one */
     tmp.spec.RGBi.red   /= nLarge;
@@ -149,13 +149,13 @@ _XcmsCIELabQueryMaxLCRGB(
 
     /* Convert from RGBi to Lab */
     if (_XcmsConvertColorsWithWhitePt(ccc, &tmp,
-	       ScreenWhitePointOfCCC(ccc), 1, XcmsCIELabFormat, (Bool *) NULL) 
+	       ScreenWhitePointOfCCC(ccc), 1, XcmsCIELabFormat, (Bool *) NULL)
 	    == XcmsFailure) {
 	return (XcmsFailure);
     }
 
     memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
-    return (XcmsSuccess);    
+    return (XcmsSuccess);
 }
 
 
@@ -192,7 +192,7 @@ XcmsCIELabQueryMaxLC (
  *		XcmsFailure - Failure
  *		XcmsSuccess - Succeeded
  *
- */ 
+ */
 {
     XcmsCCCRec myCCC;
 
@@ -202,7 +202,7 @@ XcmsCIELabQueryMaxLC (
     if (ccc == NULL || pColor_return == NULL) {
 	return(XcmsFailure);
     }
-    
+
     /* Use my own CCC */
     memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
     myCCC.clientWhitePt.format = XcmsUndefinedFormat;
@@ -213,8 +213,8 @@ XcmsCIELabQueryMaxLC (
     }
     while (hue_angle >= 360.0) {
 	hue_angle -= 360.0;
-    } 
-    
+    }
+
     return(_XcmsCIELabQueryMaxLCRGB (&myCCC, radians(hue_angle), pColor_return,
 	    (XcmsRGBi *)NULL));
 }
diff --git a/libX11/src/xcms/LabWpAj.c b/libX11/src/xcms/LabWpAj.c
index 3098a60c8..5959779e6 100644
--- a/libX11/src/xcms/LabWpAj.c
+++ b/libX11/src/xcms/LabWpAj.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/Luv.c b/libX11/src/xcms/Luv.c
index 9fe80a0f4..8dae87f4a 100644
--- a/libX11/src/xcms/Luv.c
+++ b/libX11/src/xcms/Luv.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -303,7 +303,7 @@ XcmsCIELuvToCIEuvY(
 	    uvY_return.v_prime = pLuv_WhitePt->spec.CIEuvY.v_prime;
 	} else {
 	    tmpVal = 13.0 * (pColor->spec.CIELuv.L_star / 100.0);
-	    uvY_return.u_prime = pColor->spec.CIELuv.u_star/tmpVal + 
+	    uvY_return.u_prime = pColor->spec.CIELuv.u_star/tmpVal +
 			    pLuv_WhitePt->spec.CIEuvY.u_prime;
 	    uvY_return.v_prime = pColor->spec.CIELuv.v_star/tmpVal +
 			    pLuv_WhitePt->spec.CIEuvY.v_prime;
@@ -381,7 +381,7 @@ XcmsCIEuvYToCIELuv(
 	}
 
 	/* Now convert the uvY to Luv */
-	Luv_return.L_star = 
+	Luv_return.L_star =
 	    (pColor->spec.CIEuvY.Y < 0.008856)
 	    ?
 	    (pColor->spec.CIEuvY.Y * 903.29)
diff --git a/libX11/src/xcms/LuvGcC.c b/libX11/src/xcms/LuvGcC.c
index c4fde28d7..868748bb3 100644
--- a/libX11/src/xcms/LuvGcC.c
+++ b/libX11/src/xcms/LuvGcC.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -63,11 +63,11 @@ XcmsCIELuvClipuv (
 /*
  *	DESCRIPTION
  *		Reduce the Chroma for a specific hue and chroma to
- *		to bring the given color into the gamut of the 
+ *		to bring the given color into the gamut of the
  *		specified device.  As required of gamut compression
  *		functions, this routine returns pColor_in_out
  *		in XcmsCIEXYZFormat on successful completion.
- *		
+ *
  *		Since this routine works with the L* within
  *		pColor_in_out intermediate results may be returned
  *		even though it may be invalid.
@@ -113,7 +113,7 @@ XcmsCIELuvClipuv (
 	    }
 	}
 	if (XcmsCIELuvQueryMaxC(ccc,
-		degrees(XCMS_CIELUV_PMETRIC_HUE(pColor->spec.CIELuv.u_star, 
+		degrees(XCMS_CIELUV_PMETRIC_HUE(pColor->spec.CIELuv.u_star,
 						pColor->spec.CIELuv.v_star)),
 		pColor->spec.CIELuv.L_star,
 		pColor) == XcmsFailure) {
diff --git a/libX11/src/xcms/LuvGcL.c b/libX11/src/xcms/LuvGcL.c
index c7ccc7503..e6dd58462 100644
--- a/libX11/src/xcms/LuvGcL.c
+++ b/libX11/src/xcms/LuvGcL.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -63,7 +63,7 @@ XcmsCIELuvClipL (
 /*
  *	DESCRIPTION
  *		Return the closest L* for a specific hue and chroma.
- *		This routine takes any color as input and outputs 
+ *		This routine takes any color as input and outputs
  *		a CIE XYZ color.
  *
  *		Since this routine works with the L* within
@@ -97,7 +97,7 @@ XcmsCIELuvClipL (
      */
 
     pColor = pColors_in_out + i;
-    
+
     if (ccc->visual->class < StaticColor) {
 	/*
 	 * GRAY !
@@ -138,7 +138,7 @@ XcmsCIELuvClipL (
 	    memcpy((char *)pColor, (char *)&Luv_max, sizeof(XcmsColor));
 	    return (XcmsFailure);
 	} else if (pColor->spec.CIELuv.L_star < Luv_max.spec.CIELuv.L_star) {
-	    /* Find the minimum lightness for the given chroma. */  
+	    /* Find the minimum lightness for the given chroma. */
 	    if (pColor->format != XcmsCIELuvFormat) {
 		if (_XcmsDIConvertColors(ccc, pColor,
 			ScreenWhitePointOfCCC(ccc), 1, XcmsCIELuvFormat)
diff --git a/libX11/src/xcms/LuvGcLC.c b/libX11/src/xcms/LuvGcLC.c
index f2eab371e..a52d9fa1d 100644
--- a/libX11/src/xcms/LuvGcLC.c
+++ b/libX11/src/xcms/LuvGcLC.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -70,7 +70,7 @@ XcmsCIELuvClipLuv (
     Bool *pCompressed)
 /*
  *	DESCRIPTION
- *		This routine will find the closest L* and chroma 
+ *		This routine will find the closest L* and chroma
  *		for a specific hue.  The color input is converted to
  *		CIE L*u*v* format and returned as CIE XYZ format.
  *
@@ -140,12 +140,12 @@ XcmsCIELuvClipLuv (
     chroma = XCMS_CIELUV_PMETRIC_CHROMA(pColor->spec.CIELuv.u_star,
 					pColor->spec.CIELuv.v_star);
     memcpy((char *)&Luv_max, (char *)pColor, sizeof(XcmsColor));
-    if (_XcmsCIELuvQueryMaxLCRGB (&myCCC, hue, &Luv_max, &rgb_max) 
+    if (_XcmsCIELuvQueryMaxLCRGB (&myCCC, hue, &Luv_max, &rgb_max)
 	    == XcmsFailure) {
 	return (XcmsFailure);
     }
     maxLstar = Luv_max.spec.CIELuv.L_star;
-	
+
     /* Now check and return the appropriate L* */
     if (saveLstar == maxLstar) {
 	/* When the L* input is equal to the maximum L* */
@@ -199,7 +199,7 @@ XcmsCIELuvClipLuv (
 		bestLstar = pColor->spec.CIELuv.L_star;
 		bestustar = pColor->spec.CIELuv.u_star;
 		bestvstar = pColor->spec.CIELuv.v_star;
-		bestChroma = chroma;	    
+		bestChroma = chroma;
 	    }
 	    if (nI == nILast || nI == 0) {
 		break;
diff --git a/libX11/src/xcms/LuvMnL.c b/libX11/src/xcms/LuvMnL.c
index 2286d7ee1..fa83e1fde 100644
--- a/libX11/src/xcms/LuvMnL.c
+++ b/libX11/src/xcms/LuvMnL.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -108,7 +108,7 @@ XcmsCIELuvQueryMinL(
     }
     while (hue_angle >= 360.0) {
 	hue_angle -= 360.0;
-    } 
+    }
 
     hue = radians(hue_angle);
     tmp.spec.CIELuv.L_star = START_L_STAR;
@@ -116,7 +116,7 @@ XcmsCIELuvQueryMinL(
     tmp.spec.CIELuv.v_star = XCMS_CIEVSTAROFHUE(hue, chroma);
     tmp.pixel = pColor_return->pixel;
     tmp.format = XcmsCIELuvFormat;
-    
+
     /* Step 1: Obtain the maximum L_star and chroma for this hue. */
     if (_XcmsCIELuvQueryMaxLCRGB(&myCCC, hue, &max_lc, &rgb_saved)
 	    == XcmsFailure) {
@@ -128,7 +128,7 @@ XcmsCIELuvQueryMinL(
 
     if (max_chroma <= chroma) {
 	/*
-	 *  If the chroma is greater than the chroma for the 
+	 *  If the chroma is greater than the chroma for the
 	 *  maximum L/chroma point then the L_star is the
 	 *  the L_star for the maximum L_star/chroma point.
 	 *  This is an error but I return the best approximation I can.
@@ -139,7 +139,7 @@ XcmsCIELuvQueryMinL(
     }
 
     /*
-     *  If the chroma is equal to the chroma for the 
+     *  If the chroma is equal to the chroma for the
      *  maximum L_star/chroma point then the L_star is the
      *  the L_star for the maximum L* and chroma point.
      */
@@ -182,15 +182,15 @@ XcmsCIELuvQueryMinL(
 	    /* Found It! */
 	    memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
 	    return(XcmsSuccess);
-	} 
+	}
 	nChroma += chroma - tmp_chroma;
 	if (nChroma > max_chroma) {
 	    nChroma = max_chroma;
 	    rFactor *= 0.5;  /* selective relaxation employed */
 	} else if (nChroma < 0.0) {
-	    if (XCMS_FABS(lastChroma - chroma) < 
+	    if (XCMS_FABS(lastChroma - chroma) <
 		XCMS_FABS(tmp_chroma - chroma)) {
-		memcpy ((char *)pColor_return, (char *)&prev, 
+		memcpy ((char *)pColor_return, (char *)&prev,
 			sizeof(XcmsColor));
 	    } else {
 		memcpy ((char *)pColor_return, (char *)&tmp,
@@ -204,7 +204,7 @@ XcmsCIELuvQueryMinL(
     }
 
     if (nCount >= nMaxCount) {
-	if (XCMS_FABS(lastChroma - chroma) < 
+	if (XCMS_FABS(lastChroma - chroma) <
 	    XCMS_FABS(tmp_chroma - chroma)) {
 		memcpy ((char *)pColor_return, (char *)&prev,
  			sizeof(XcmsColor));
diff --git a/libX11/src/xcms/LuvMxC.c b/libX11/src/xcms/LuvMxC.c
index d228c39dc..34abf6d46 100644
--- a/libX11/src/xcms/LuvMxC.c
+++ b/libX11/src/xcms/LuvMxC.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -105,7 +105,7 @@ XcmsCIELuvQueryMaxC(
 
     /* Use my own CCC  and inherit screen white Pt */
     memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat; 
+    myCCC.clientWhitePt.format = XcmsUndefinedFormat;
     myCCC.gamutCompProc = (XcmsCompressionProc)NULL;/* no gamut comp func */
 
     while (hue_angle < 0.0) {
@@ -113,7 +113,7 @@ XcmsCIELuvQueryMaxC(
     }
     while (hue_angle >= 360.0) {
 	hue_angle -= 360.0;
-    } 
+    }
 
     hue = radians(hue_angle);
     tmp.spec.CIELuv.L_star = L_star;
@@ -182,7 +182,7 @@ XcmsCIELuvQueryMaxC(
 		return(XcmsSuccess);
 	}
 	if (nT > 0) {
-	    n_L_star += ((TOPL - n_L_star) * 
+	    n_L_star += ((TOPL - n_L_star) *
 			 (L_star - tmp.spec.CIELuv.L_star)) / (TOPL - L_star);
 	} else {
 	    n_L_star *= L_star / tmp.spec.CIELuv.L_star;
@@ -193,7 +193,7 @@ XcmsCIELuvQueryMaxC(
 		/* printf("rFactor = %lf\n", rFactor); */
 	}
     }
-    if (XCMS_FABS(last_L_star - L_star) < 
+    if (XCMS_FABS(last_L_star - L_star) <
 	XCMS_FABS(tmp.spec.CIELuv.L_star - L_star)) {
 	    tmp.spec.CIELuv.u_star = lastuStar;
 	    tmp.spec.CIELuv.v_star = lastvStar;
diff --git a/libX11/src/xcms/LuvMxL.c b/libX11/src/xcms/LuvMxL.c
index f24c41419..da06684a4 100644
--- a/libX11/src/xcms/LuvMxL.c
+++ b/libX11/src/xcms/LuvMxL.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -108,7 +108,7 @@ XcmsCIELuvQueryMaxL(
     }
     while (hue_angle >= 360.0) {
 	hue_angle -= 360.0;
-    } 
+    }
 
     hue = radians(hue_angle);
     tmp.spec.CIELuv.L_star = START_L_STAR;
@@ -116,7 +116,7 @@ XcmsCIELuvQueryMaxL(
     tmp.spec.CIELuv.v_star = XCMS_CIEVSTAROFHUE(hue, chroma);
     tmp.pixel = pColor_return->pixel;
     tmp.format = XcmsCIELuvFormat;
-    
+
     /* Step 1: Obtain the maximum L_star and chroma for this hue. */
     if (_XcmsCIELuvQueryMaxLCRGB(&myCCC, hue, &max_lc, &rgb_saved)
 	    == XcmsFailure) {
@@ -128,7 +128,7 @@ XcmsCIELuvQueryMaxL(
 
     if (max_chroma <= chroma) {
 	/*
-	 *  If the chroma is greater than the chroma for the 
+	 *  If the chroma is greater than the chroma for the
 	 *  maximum L/chroma point then the L_star is the
 	 *  the L_star for the maximum L_star/chroma point.
 	 *  This is an error but I return the best approximation I can.
@@ -139,7 +139,7 @@ XcmsCIELuvQueryMaxL(
     }
 
     /*
-     *  If the chroma is equal to the chroma for the 
+     *  If the chroma is equal to the chroma for the
      *  maximum L_star/chroma point then the L_star is the
      *  the L_star for the maximum L* and chroma point.
      */
@@ -182,13 +182,13 @@ XcmsCIELuvQueryMaxL(
 	    /* Found It! */
 	    memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
 	    return(XcmsSuccess);
-	} 
+	}
 	nChroma += chroma - tmp_chroma;
 	if (nChroma > max_chroma) {
 	    nChroma = max_chroma;
 	    rFactor *= 0.5;  /* selective relaxation employed */
 	} else if (nChroma < 0.0) {
-	    if (XCMS_FABS(lastChroma - chroma) < 
+	    if (XCMS_FABS(lastChroma - chroma) <
 		XCMS_FABS(tmp_chroma - chroma)) {
 		memcpy ((char *)pColor_return, (char *)&prev,
  			sizeof(XcmsColor));
@@ -204,7 +204,7 @@ XcmsCIELuvQueryMaxL(
     }
 
     if (nCount >= nMaxCount) {
-	if (XCMS_FABS(lastChroma - chroma) < 
+	if (XCMS_FABS(lastChroma - chroma) <
 	    XCMS_FABS(tmp_chroma - chroma)) {
 		memcpy ((char *)pColor_return, (char *)&prev,
  			sizeof(XcmsColor));
diff --git a/libX11/src/xcms/LuvMxLC.c b/libX11/src/xcms/LuvMxLC.c
index 941e45921..d8634038f 100644
--- a/libX11/src/xcms/LuvMxLC.c
+++ b/libX11/src/xcms/LuvMxLC.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -98,7 +98,7 @@ _XcmsCIELuvQueryMaxLCRGB(
  *		XcmsFailure - Failure
  *		XcmsSuccess - Succeeded
  *
- */ 
+ */
 {
     XcmsFloat nSmall, nLarge;
     XcmsColor tmp;
@@ -115,15 +115,15 @@ _XcmsCIELuvQueryMaxLCRGB(
      * out of bounds RGBi values in tmp when the ccc->gamutCompProc
      * is NULL.
      */
-    if ((_XcmsConvertColorsWithWhitePt(ccc, &tmp, ScreenWhitePointOfCCC(ccc), 
-		               (unsigned int)1, XcmsRGBiFormat, (Bool *) NULL) 
+    if ((_XcmsConvertColorsWithWhitePt(ccc, &tmp, ScreenWhitePointOfCCC(ccc),
+		               (unsigned int)1, XcmsRGBiFormat, (Bool *) NULL)
 	    == XcmsFailure) && tmp.format != XcmsRGBiFormat) {
 	return (XcmsFailure);
     }
 
     /* Now pick the smallest RGB */
-    nSmall = MIN3(tmp.spec.RGBi.red, 
-		  tmp.spec.RGBi.green, 
+    nSmall = MIN3(tmp.spec.RGBi.red,
+		  tmp.spec.RGBi.green,
 		  tmp.spec.RGBi.blue);
     /* Make the smallest RGB equal to zero */
     tmp.spec.RGBi.red   -= nSmall;
@@ -131,8 +131,8 @@ _XcmsCIELuvQueryMaxLCRGB(
     tmp.spec.RGBi.blue  -= nSmall;
 
     /* Now pick the largest RGB */
-    nLarge = MAX3(tmp.spec.RGBi.red, 
-		  tmp.spec.RGBi.green, 
+    nLarge = MAX3(tmp.spec.RGBi.red,
+		  tmp.spec.RGBi.green,
 		  tmp.spec.RGBi.blue);
     /* Scale the RGB values based on the largest one */
     tmp.spec.RGBi.red   /= nLarge;
@@ -149,13 +149,13 @@ _XcmsCIELuvQueryMaxLCRGB(
 
     /* Convert from RGBi to Luv */
     if (_XcmsConvertColorsWithWhitePt(ccc, &tmp,
-	       ScreenWhitePointOfCCC(ccc), 1, XcmsCIELuvFormat, (Bool *) NULL) 
+	       ScreenWhitePointOfCCC(ccc), 1, XcmsCIELuvFormat, (Bool *) NULL)
 	    == XcmsFailure) {
 	return (XcmsFailure);
     }
 
     memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
-    return (XcmsSuccess);    
+    return (XcmsSuccess);
 }
 
 
@@ -192,7 +192,7 @@ XcmsCIELuvQueryMaxLC (
  *		XcmsFailure - Failure
  *		XcmsSuccess - Succeeded
  *
- */ 
+ */
 {
     XcmsCCCRec myCCC;
 
@@ -202,7 +202,7 @@ XcmsCIELuvQueryMaxLC (
     if (ccc == NULL || pColor_return == NULL) {
 	return(XcmsFailure);
     }
-    
+
     /* Use my own CCC */
     memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
     myCCC.clientWhitePt.format = XcmsUndefinedFormat;
@@ -213,8 +213,8 @@ XcmsCIELuvQueryMaxLC (
     }
     while (hue_angle >= 360.0) {
 	hue_angle -= 360.0;
-    } 
-    
+    }
+
     return(_XcmsCIELuvQueryMaxLCRGB (&myCCC, radians(hue_angle), pColor_return,
 	    (XcmsRGBi *)NULL));
 }
diff --git a/libX11/src/xcms/LuvWpAj.c b/libX11/src/xcms/LuvWpAj.c
index 86a60b426..7ce643e89 100644
--- a/libX11/src/xcms/LuvWpAj.c
+++ b/libX11/src/xcms/LuvWpAj.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/Makefile.in b/libX11/src/xcms/Makefile.in
index ea990c1ef..3469812da 100644
--- a/libX11/src/xcms/Makefile.in
+++ b/libX11/src/xcms/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,8 +18,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -45,6 +47,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libxcms_la_LIBADD =
 am_libxcms_la_OBJECTS = AddDIC.lo AddSF.lo CCC.lo CvColW.lo CvCols.lo \
@@ -62,11 +65,9 @@ libxcms_la_OBJECTS = $(am_libxcms_la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -78,9 +79,23 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(X11dir)"
-dist_X11DATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_X11_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -100,27 +115,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -132,6 +146,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -141,7 +156,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -149,8 +167,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -190,17 +212,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -215,6 +234,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -231,6 +251,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -243,6 +264,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = libxcms.la
@@ -343,14 +365,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/xcms/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/xcms/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/xcms/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/xcms/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -368,6 +390,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -452,21 +475,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -479,34 +502,37 @@ clean-libtool:
 install-dist_X11DATA: $(dist_X11_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(X11dir)" || $(MKDIR_P) "$(DESTDIR)$(X11dir)"
-	@list='$(dist_X11_DATA)'; for p in $$list; do \
+	@list='$(dist_X11_DATA)'; test -n "$(X11dir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_X11DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(X11dir)/$$f'"; \
-	  $(dist_X11DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(X11dir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(X11dir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(X11dir)" || exit $$?; \
 	done
 
 uninstall-dist_X11DATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_X11_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(X11dir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(X11dir)/$$f"; \
-	done
+	@list='$(dist_X11_DATA)'; test -n "$(X11dir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(X11dir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(X11dir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -514,29 +540,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -557,13 +588,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -594,6 +629,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -615,6 +651,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -623,18 +661,28 @@ install-data-am: install-dist_X11DATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -676,6 +724,7 @@ uninstall-am: uninstall-dist_X11DATA
 
 @LINT_TRUE@lint:
 @LINT_TRUE@	$(LINT) $(ALL_LINT_FLAGS) $(libxcms_la_SOURCES) -lm
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/src/xcms/OfCCC.c b/libX11/src/xcms/OfCCC.c
index 1c9e16b4c..29d37e6ef 100644
--- a/libX11/src/xcms/OfCCC.c
+++ b/libX11/src/xcms/OfCCC.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/PrOfId.c b/libX11/src/xcms/PrOfId.c
index 01d2c264b..72f75b3fe 100644
--- a/libX11/src/xcms/PrOfId.c
+++ b/libX11/src/xcms/PrOfId.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/QBlack.c b/libX11/src/xcms/QBlack.c
index cdeae0333..c3d1f949f 100644
--- a/libX11/src/xcms/QBlack.c
+++ b/libX11/src/xcms/QBlack.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/QBlue.c b/libX11/src/xcms/QBlue.c
index eae77dde2..6aac33041 100644
--- a/libX11/src/xcms/QBlue.c
+++ b/libX11/src/xcms/QBlue.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/QGreen.c b/libX11/src/xcms/QGreen.c
index deb24ccce..449704d5a 100644
--- a/libX11/src/xcms/QGreen.c
+++ b/libX11/src/xcms/QGreen.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/QRed.c b/libX11/src/xcms/QRed.c
index 51b6be407..5d119dbaa 100644
--- a/libX11/src/xcms/QRed.c
+++ b/libX11/src/xcms/QRed.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/QWhite.c b/libX11/src/xcms/QWhite.c
index d23443db2..956bc8a89 100644
--- a/libX11/src/xcms/QWhite.c
+++ b/libX11/src/xcms/QWhite.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/QuCol.c b/libX11/src/xcms/QuCol.c
index 7944faaa0..673058712 100644
--- a/libX11/src/xcms/QuCol.c
+++ b/libX11/src/xcms/QuCol.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/QuCols.c b/libX11/src/xcms/QuCols.c
index 7a0816df3..b6f620528 100644
--- a/libX11/src/xcms/QuCols.c
+++ b/libX11/src/xcms/QuCols.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/SetCCC.c b/libX11/src/xcms/SetCCC.c
index a7094b170..17d3de0b0 100644
--- a/libX11/src/xcms/SetCCC.c
+++ b/libX11/src/xcms/SetCCC.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/SetGetCols.c b/libX11/src/xcms/SetGetCols.c
index 03f7a2f72..ce482553b 100644
--- a/libX11/src/xcms/SetGetCols.c
+++ b/libX11/src/xcms/SetGetCols.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -55,7 +55,7 @@
 
 /*
  *	NAME
- *		XcmsSetColor - 
+ *		XcmsSetColor -
  *
  *	SYNOPSIS
  */
@@ -172,7 +172,7 @@ Query:
 
 /*
  *	NAME
- *		XcmsSetColors - 
+ *		XcmsSetColors -
  *
  *	SYNOPSIS
  */
diff --git a/libX11/src/xcms/StCol.c b/libX11/src/xcms/StCol.c
index fef449e7e..e93b0dd37 100644
--- a/libX11/src/xcms/StCol.c
+++ b/libX11/src/xcms/StCol.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/StCols.c b/libX11/src/xcms/StCols.c
index 163d62171..65355f6d7 100644
--- a/libX11/src/xcms/StCols.c
+++ b/libX11/src/xcms/StCols.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/UNDEFINED.c b/libX11/src/xcms/UNDEFINED.c
index 2c0563077..9c9094ed2 100644
--- a/libX11/src/xcms/UNDEFINED.c
+++ b/libX11/src/xcms/UNDEFINED.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/XRGB.c b/libX11/src/xcms/XRGB.c
index 0d7e24c7d..e2697d2ab 100644
--- a/libX11/src/xcms/XRGB.c
+++ b/libX11/src/xcms/XRGB.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -76,7 +76,7 @@ static unsigned short const MASK[17] = {
 
 /*
  *	NAME
- *		_XcmsRGB_to_XColor - 
+ *		_XcmsRGB_to_XColor -
  *
  *	SYNOPSIS
  */
@@ -163,7 +163,7 @@ _XcmsResolveColor(
  *	    On a display with N-bit DACs, the "hardware" color is computed as:
  *
  *	    ((unsignedlong)(ClientValue >> (16-N)) * 0xFFFF) / ((1 << N) - 1)
- *		
+ *
  *
  *	RETURNS
  *		void.
diff --git a/libX11/src/xcms/XYZ.c b/libX11/src/xcms/XYZ.c
index 5c93dad3d..2868c925a 100644
--- a/libX11/src/xcms/XYZ.c
+++ b/libX11/src/xcms/XYZ.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/Xcmsint.h b/libX11/src/xcms/Xcmsint.h
index 1bf02ba2f..7ec0d1b00 100644
--- a/libX11/src/xcms/Xcmsint.h
+++ b/libX11/src/xcms/Xcmsint.h
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/cmsAllCol.c b/libX11/src/xcms/cmsAllCol.c
index 145d11776..1b2bc76f5 100644
--- a/libX11/src/xcms/cmsAllCol.c
+++ b/libX11/src/xcms/cmsAllCol.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/cmsAllNCol.c b/libX11/src/xcms/cmsAllNCol.c
index efee0f6b3..b17f7e4c6 100644
--- a/libX11/src/xcms/cmsAllNCol.c
+++ b/libX11/src/xcms/cmsAllNCol.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -46,7 +46,7 @@
 
 /*
  *	NAME
- *		XcmsAllocNamedColor - 
+ *		XcmsAllocNamedColor -
  *
  *	SYNOPSIS
  */
diff --git a/libX11/src/xcms/cmsCmap.c b/libX11/src/xcms/cmsCmap.c
index e21368280..932743b2b 100644
--- a/libX11/src/xcms/cmsCmap.c
+++ b/libX11/src/xcms/cmsCmap.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -411,7 +411,7 @@ _XcmsFreeClientCmaps(
  *
  *	SYNOPSIS
  */
-XcmsCCC 
+XcmsCCC
 XcmsCCCOfColormap(
     Display *dpy,
     Colormap cmap)
diff --git a/libX11/src/xcms/cmsColNm.c b/libX11/src/xcms/cmsColNm.c
index e3ca5183d..8aa495857 100644
--- a/libX11/src/xcms/cmsColNm.c
+++ b/libX11/src/xcms/cmsColNm.c
@@ -4,7 +4,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
@@ -12,10 +12,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
@@ -187,7 +187,7 @@ _XcmsParseColorString(
  *	DESCRIPTION
  *		Assuming color_string contains a numerical string color
  *		specification, attempts to parse a string into an
- *		XcmsColor structure.		
+ *		XcmsColor structure.
  *
  *	RETURNS
  *		0 if failed; otherwise non-zero.
@@ -470,7 +470,7 @@ Retry:
 	pair->flag = CYCLE;
 	return(XcmsFailure);
     }
-	    
+
     if (_XcmsParseColorString(ccc, pair->second, pColor) == XcmsSuccess) {
 	/* f2 contains a numerical string specification */
 	return(XcmsSuccess);
@@ -816,7 +816,7 @@ _XcmsCopyISOLatin1Lowered(
 
 /*
  *	NAME
- *		_XcmsResolveColorString - 
+ *		_XcmsResolveColorString -
  *
  *	SYNOPSIS
  */
@@ -872,7 +872,7 @@ _XcmsResolveColorString (
 	if (result_format != XcmsUndefinedFormat
 		&& pColor_exact_return->format != result_format) {
 	    /* need to be converted to the target format */
-	    return(XcmsConvertColors(ccc, pColor_exact_return, 1, 
+	    return(XcmsConvertColors(ccc, pColor_exact_return, 1,
 		    result_format, (Bool *)NULL));
 	} else {
 	    return(XcmsSuccess);
diff --git a/libX11/src/xcms/cmsGlobls.c b/libX11/src/xcms/cmsGlobls.c
index abe711c6a..3453bef1c 100644
--- a/libX11/src/xcms/cmsGlobls.c
+++ b/libX11/src/xcms/cmsGlobls.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/cmsInt.c b/libX11/src/xcms/cmsInt.c
index 68cfebd74..cab123538 100644
--- a/libX11/src/xcms/cmsInt.c
+++ b/libX11/src/xcms/cmsInt.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -189,7 +189,7 @@ _XcmsInitDefaultCCCs(
     if (!(ccc = (XcmsCCC)
 	    Xcalloc((unsigned)nScrn, (unsigned) sizeof(XcmsCCCRec)))) {
 	return(0);
-    } 
+    }
     dpy->cms.defaultCCCs = (XPointer)ccc;
     dpy->free_funcs->defaultCCCs = _XcmsFreeDefaultCCCs;
 
@@ -328,7 +328,7 @@ _XcmsInitScrnInfo(
 	if (!(defaultccc->pPerScrnInfo = (XcmsPerScrnInfo *)
 		Xcalloc(1, (unsigned) sizeof(XcmsPerScrnInfo)))) {
 	    return(0);
-	} 
+	}
 	defaultccc->pPerScrnInfo->state = XcmsInitNone;
     }
 
diff --git a/libX11/src/xcms/cmsLkCol.c b/libX11/src/xcms/cmsLkCol.c
index f19f21d03..5c15bce78 100644
--- a/libX11/src/xcms/cmsLkCol.c
+++ b/libX11/src/xcms/cmsLkCol.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -46,7 +46,7 @@
 
 /*
  *	NAME
- *		XcmsLookupColor - 
+ *		XcmsLookupColor -
  *
  *	SYNOPSIS
  */
diff --git a/libX11/src/xcms/cmsMath.c b/libX11/src/xcms/cmsMath.c
index 5e8cae72f..fd48b9ffc 100644
--- a/libX11/src/xcms/cmsMath.c
+++ b/libX11/src/xcms/cmsMath.c
@@ -91,7 +91,7 @@ _XcmsCubeRoot(double a)
 #endif
     return cur_guess;
 }
-	
+
 
 
 /* for square roots, x^2 - a = 0,  x_new = x - 1/2 (x - a/x) */
@@ -135,4 +135,4 @@ _XcmsSquareRoot(double a)
 #endif
     return cur_guess;
 }
-	
+
diff --git a/libX11/src/xcms/cmsProp.c b/libX11/src/xcms/cmsProp.c
index 4040a05ce..191d66366 100644
--- a/libX11/src/xcms/cmsProp.c
+++ b/libX11/src/xcms/cmsProp.c
@@ -4,7 +4,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
@@ -12,10 +12,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
@@ -123,10 +123,10 @@ _XcmsGetProperty(
     long len = 6516;
     unsigned long nitems_ret, after_ret;
     Atom atom_ret;
-    
-    while (XGetWindowProperty (pDpy, w, property, 0, len, False, 
-			       XA_INTEGER, &atom_ret, &format_ret, 
-			       &nitems_ret, &after_ret, 
+
+    while (XGetWindowProperty (pDpy, w, property, 0, len, False,
+			       XA_INTEGER, &atom_ret, &format_ret,
+			       &nitems_ret, &after_ret,
 			       (unsigned char **)&prop_ret)) {
 	if (after_ret > 0) {
 	    len += nitems_ret * (format_ret >> 3);
@@ -135,7 +135,7 @@ _XcmsGetProperty(
 	    break;
 	}
     }
-    if (format_ret == 0 || nitems_ret == 0) { 
+    if (format_ret == 0 || nitems_ret == 0) {
 	/* the property does not exist or is of an unexpected type */
 	return(XcmsFailure);
     }
diff --git a/libX11/src/xcms/cmsTrig.c b/libX11/src/xcms/cmsTrig.c
index 4e17e7da4..0ab4426fc 100644
--- a/libX11/src/xcms/cmsTrig.c
+++ b/libX11/src/xcms/cmsTrig.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -165,7 +165,7 @@ static double const sin_qcoeffs[] = {
  *	to the range over which the polynomial approximation
  *	is valid, and as the polynomial is evaluated using
  *	finite-precision arithmetic.
- *	
+ *
  *  PROGRAMMER
  *
  *	Fred Fish
@@ -225,7 +225,7 @@ static double const sin_qcoeffs[] = {
  *	HART satisfies this requirement, although not explicitly
  *	stated in the text.  This may not be true of other
  *	approximations given in the reference.
- *			
+ *
  */
 
 double _XcmsCosine(double x)
@@ -444,7 +444,7 @@ static double _XcmsPolynomial(
  *	to the range over which the polynomial approximation
  *	is valid, and as the polynomial is evaluated using
  *	finite-precision arithmetic.
- *	
+ *
  *  PROGRAMMER
  *
  *	Fred Fish
@@ -505,7 +505,7 @@ static double _XcmsPolynomial(
  *	HART satisfies this requirement, although not explicitly
  *	stated in the text.  This may not be true of other
  *	approximations given in the reference.
- *			
+ *
  */
 
 double
@@ -559,7 +559,7 @@ _XcmsArcTangent(double x)
  *			New York, NY, Harper & Row, 1970.
  *
  *	RETURNS
- *		Returns the arctangent 
+ *		Returns the arctangent
  */
 {
     double ai, a1 = 0.0, bi, b1 = 0.0, l, d;
diff --git a/libX11/src/xcms/uvY.c b/libX11/src/xcms/uvY.c
index da9fd0f7d..0567b2063 100644
--- a/libX11/src/xcms/uvY.c
+++ b/libX11/src/xcms/uvY.c
@@ -3,7 +3,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
@@ -11,10 +11,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
diff --git a/libX11/src/xcms/xyY.c b/libX11/src/xcms/xyY.c
index 2e56a0862..555afe4fe 100644
--- a/libX11/src/xcms/xyY.c
+++ b/libX11/src/xcms/xyY.c
@@ -3,7 +3,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
@@ -11,10 +11,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
@@ -382,7 +382,7 @@ XcmsCIEXYZToCIExyY(
 	/* Now convert for XYZ to xyY */
 	if ((div = pColor->spec.CIEXYZ.X + pColor->spec.CIEXYZ.Y + pColor->spec.CIEXYZ.Z) == 0.0) {
 	    div = EPS;
-	} 
+	}
 	xyY_return.x = pColor->spec.CIEXYZ.X / div;
 	xyY_return.y = pColor->spec.CIEXYZ.Y / div;
 	xyY_return.Y = pColor->spec.CIEXYZ.Y;