summaryrefslogtreecommitdiff
path: root/src/xcms/HVC.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/xcms/HVC.c')
-rw-r--r--src/xcms/HVC.c41
1 files changed, 14 insertions, 27 deletions
diff --git a/src/xcms/HVC.c b/src/xcms/HVC.c
index 894e8dd..22f7a64 100644
--- a/src/xcms/HVC.c
+++ b/src/xcms/HVC.c
@@ -47,12 +47,13 @@
* DOCUMENTATION
* "TekColor Color Management System, System Implementor's Manual"
*/
-/* $XFree86: xc/lib/X11/HVC.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
+/* $XFree86: xc/lib/X11/HVC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
#include <X11/Xos.h>
#include <math.h>
+#include "Cv.h"
#include <stdio.h>
@@ -93,24 +94,10 @@
#endif
/*
- * EXTERNS
- */
-
-extern char _XcmsTekHVC_prefix[];
-
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
-/* uvY.c */
-extern Status _XcmsCIEuvY_ValidSpec();
-
-/*
* FORWARD DECLARATIONS
*/
-
-static int TekHVC_ParseString();
-static Status XcmsTekHVC_ValidSpec();
-
+static int TekHVC_ParseString(register char *spec, XcmsColor *pColor);
+static Status XcmsTekHVC_ValidSpec(XcmsColor *pColor);
/*
* LOCAL VARIABLES
@@ -167,9 +154,9 @@ XcmsColorSpace XcmsTekHVCColorSpace =
* SYNOPSIS
*/
static int
-TekHVC_ParseString(spec, pColor)
- register char *spec;
- XcmsColor *pColor;
+TekHVC_ParseString(
+ register char *spec,
+ XcmsColor *pColor)
/*
* DESCRIPTION
* This routines takes a string and attempts to convert
@@ -225,9 +212,9 @@ TekHVC_ParseString(spec, pColor)
* SYNOPSIS
*/
static int
-ThetaOffset(pWhitePt, pThetaOffset)
- XcmsColor *pWhitePt;
- XcmsFloat *pThetaOffset;
+ThetaOffset(
+ XcmsColor *pWhitePt,
+ XcmsFloat *pThetaOffset)
/*
* DESCRIPTION
* This routine computes the theta offset of a given
@@ -274,8 +261,8 @@ ThetaOffset(pWhitePt, pThetaOffset)
* SYNOPSIS
*/
static int
-XcmsTekHVC_ValidSpec(pColor)
- XcmsColor *pColor;
+XcmsTekHVC_ValidSpec(
+ XcmsColor *pColor)
/*
* DESCRIPTION
* Checks if values in the color specification are valid.
@@ -576,8 +563,8 @@ XcmsCIEuvYToTekHVC(ccc, pHVC_WhitePt, pColors_in_out, nColors)
* SYNOPSIS
*/
int
-_XcmsTekHVC_CheckModify(pColor)
- XcmsColor *pColor;
+_XcmsTekHVC_CheckModify(
+ XcmsColor *pColor)
/*
* DESCRIPTION
* Checks if values in the color specification are valid.