aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/CvCols.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-12 08:32:04 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-12 08:32:04 +0200
commit051d521f6e20761ba6831cecd91883da960fa931 (patch)
treeb28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/CvCols.c
parent6dce607bad8711dd06a5a7b69ad1930386b4123b (diff)
parentb8de7bf654929c823080b211aeac56cd213f5a32 (diff)
downloadnx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz
nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2
nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip
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.
Diffstat (limited to 'nx-X11/lib/X11/CvCols.c')
-rw-r--r--nx-X11/lib/X11/CvCols.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/nx-X11/lib/X11/CvCols.c b/nx-X11/lib/X11/CvCols.c
index 356f97765..ed3582663 100644
--- a/nx-X11/lib/X11/CvCols.c
+++ b/nx-X11/lib/X11/CvCols.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
@@ -237,7 +237,7 @@ ConvertMixedColors(
* batches:
* DI to DD
* DD to DI(not CIEXYZ)
- *
+ *
* format_flag:
* 0x01 : convert Device-Dependent only specifications to the
* target format.
@@ -419,7 +419,7 @@ _XcmsDIConvertColors(
* 3. The calling routine may want to convert only between
* CIExyY <-> CIEXYZ <-> CIEuvY
* therefore, this routine allows pWhitePt to equal NULL.
- *
+ *
*
* RETURNS
* XcmsFailure if failed,
@@ -505,7 +505,7 @@ Continue:
* complementary, i.e.,
* for an i, 0 <= i < n elements
* from_CIEXYZ[i] is not the inverse of to_CIEXYZ[i]
- *
+ *
* Execute the functions all the way to CIEXYZ
*/
while (*src_to_CIEXYZ) {
@@ -601,7 +601,7 @@ _XcmsDDConvertColors(
/*
* Its ok if pColors_in_out->format == XcmsCIEXYZFormat
- * or
+ * or
* if newFormat == XcmsCIEXYZFormat
*/
if ( !( ValidDDColorSpaceID(ccc, pColors_in_out->format)
@@ -668,7 +668,7 @@ Continue:
* complementary, i.e.,
* for an i, 0 <= i < n elements
* from_CIEXYZ[i] is not the inverse of to_CIEXYZ[i]
- *
+ *
* Execute the functions all the way to CIEXYZ
*/
while (*src_to_CIEXYZ) {
@@ -712,12 +712,12 @@ Continue:
* SYNOPSIS
*/
Status
-XcmsConvertColors(ccc, pColors_in_out, nColors, targetFormat, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
- XcmsColorFormat targetFormat;
- Bool *pCompressed;
+XcmsConvertColors(
+ XcmsCCC ccc,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors,
+ XcmsColorFormat targetFormat,
+ Bool *pCompressed)
/*
* DESCRIPTION
* Convert XcmsColor structures to another format