Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x

Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214
Fixes ArcticaProject/nx-libs#157.

1 files changed, 20 insertions, 21 deletions

diff --git a/nx-X11/lib/X11/LuvMxLC.c b/nx-X11/lib/X11/LuvMxLC.c
index 54844041a..60b954916 100644
--- a/nx-X11/lib/X11/LuvMxLC.c
+++ b/nx-X11/lib/X11/LuvMxLC.c
@@ -2,7 +2,7 @@
 /*
  * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
  * 	All Rights Reserved
- * 
+ *
  * This file is a component of an X Window System-specific implementation
  * of XCMS based on the TekColor Color Management System.  Permission is
  * hereby granted to use, copy, modify, sell, and otherwise distribute this
@@ -10,10 +10,10 @@
  * that this copyright, permission, and disclaimer notice is reproduced in
  * all copies of this software and in supporting documentation.  TekColor
  * is a trademark of Tektronix, Inc.
- * 
+ *
  * Tektronix makes no representation about the suitability of this software
  * for any purpose.  It is provided "as is" and with all faults.
- * 
+ *
  * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
  * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
  * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
@@ -37,7 +37,6 @@
  *		Fred W. Billmeyer & Max Saltzman, "Principles of Color
  *		Technology", John Wily & Sons, Inc, 1981.
  */
-/* $XFree86$ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -97,7 +96,7 @@ _XcmsCIELuvQueryMaxLCRGB(
  *		XcmsFailure - Failure
  *		XcmsSuccess - Succeeded
  *
- */ 
+ */
 {
     XcmsFloat nSmall, nLarge;
     XcmsColor tmp;
@@ -114,15 +113,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;
@@ -130,8 +129,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;
@@ -148,13 +147,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);
 }
 
 
@@ -171,10 +170,10 @@ _XcmsCIELuvQueryMaxLCRGB(
  *	SYNOPSIS
  */
 Status
-XcmsCIELuvQueryMaxLC (ccc, hue_angle, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	    /* hue angle in degrees */
-    XcmsColor *pColor_return;
+XcmsCIELuvQueryMaxLC (
+    XcmsCCC ccc,
+    XcmsFloat hue_angle,	    /* hue angle in degrees */
+    XcmsColor *pColor_return)
 
 /*
  *	DESCRIPTION
@@ -191,7 +190,7 @@ XcmsCIELuvQueryMaxLC (ccc, hue_angle, pColor_return)
  *		XcmsFailure - Failure
  *		XcmsSuccess - Succeeded
  *
- */ 
+ */
 {
     XcmsCCCRec myCCC;
 
@@ -201,7 +200,7 @@ XcmsCIELuvQueryMaxLC (ccc, hue_angle, pColor_return)
     if (ccc == NULL || pColor_return == NULL) {
 	return(XcmsFailure);
     }
-    
+
     /* Use my own CCC */
     memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
     myCCC.clientWhitePt.format = XcmsUndefinedFormat;
@@ -212,8 +211,8 @@ XcmsCIELuvQueryMaxLC (ccc, hue_angle, pColor_return)
     }
     while (hue_angle >= 360.0) {
 	hue_angle -= 360.0;
-    } 
-    
+    }
+
     return(_XcmsCIELuvQueryMaxLCRGB (&myCCC, radians(hue_angle), pColor_return,
 	    (XcmsRGBi *)NULL));
 }