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

1 files changed, 25 insertions, 25 deletions

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 	*/