aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/xcms/LuvMxLC.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
commitcb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch)
tree8b4e9e320258d5280ce454163c49363030626c1a /libX11/src/xcms/LuvMxLC.c
parent213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff)
parentc87efef42f76c2ff0dcfad2842ab369beffd21de (diff)
downloadvcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/src/xcms/LuvMxLC.c')
-rw-r--r--libX11/src/xcms/LuvMxLC.c32
1 files changed, 16 insertions, 16 deletions
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));
}