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

1 files changed, 11 insertions, 11 deletions

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;