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, 15 insertions, 15 deletions

diff --git a/nx-X11/lib/X11/LuvMxL.c b/nx-X11/lib/X11/LuvMxL.c
index d4387d7f9..d1d495b08 100644
--- a/nx-X11/lib/X11/LuvMxL.c
+++ b/nx-X11/lib/X11/LuvMxL.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
@@ -60,11 +60,11 @@
  *	SYNOPSIS
  */
 Status
-XcmsCIELuvQueryMaxL(ccc, hue_angle, chroma, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	    /* hue angle in degrees */
-    XcmsFloat chroma;
-    XcmsColor *pColor_return;
+XcmsCIELuvQueryMaxL(
+    XcmsCCC ccc,
+    XcmsFloat hue_angle,	    /* hue angle in degrees */
+    XcmsFloat chroma,
+    XcmsColor *pColor_return)
 /*
  *	DESCRIPTION
  *		Return the maximum Lstar for a specified hue_angle and chroma.
@@ -106,7 +106,7 @@ XcmsCIELuvQueryMaxL(ccc, hue_angle, chroma, pColor_return)
     }
     while (hue_angle >= 360.0) {
 	hue_angle -= 360.0;
-    } 
+    }
 
     hue = radians(hue_angle);
     tmp.spec.CIELuv.L_star = START_L_STAR;
@@ -114,7 +114,7 @@ XcmsCIELuvQueryMaxL(ccc, hue_angle, chroma, pColor_return)
     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) {
@@ -126,7 +126,7 @@ XcmsCIELuvQueryMaxL(ccc, hue_angle, chroma, pColor_return)
 
     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.
@@ -137,7 +137,7 @@ XcmsCIELuvQueryMaxL(ccc, hue_angle, chroma, pColor_return)
     }
 
     /*
-     *  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.
      */
@@ -180,13 +180,13 @@ XcmsCIELuvQueryMaxL(ccc, hue_angle, chroma, pColor_return)
 	    /* 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));
@@ -202,7 +202,7 @@ XcmsCIELuvQueryMaxL(ccc, hue_angle, chroma, pColor_return)
     }
 
     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));