summaryrefslogtreecommitdiff
path: root/xc/lib/XIE
diff options
context:
space:
mode:
Diffstat (limited to 'xc/lib/XIE')
-rw-r--r--xc/lib/XIE/Imakefile8
-rw-r--r--xc/lib/XIE/XIE-def.cpp2
-rw-r--r--xc/lib/XIE/XIElib.h22
-rw-r--r--xc/lib/XIE/XIElibint.h6
-rw-r--r--xc/lib/XIE/abort.c4
-rw-r--r--xc/lib/XIE/await.c4
-rw-r--r--xc/lib/XIE/clientdata.c4
-rw-r--r--xc/lib/XIE/colorlist.c4
-rw-r--r--xc/lib/XIE/conven.c20
-rw-r--r--xc/lib/XIE/elements.c4
-rw-r--r--xc/lib/XIE/elements.h2
-rw-r--r--xc/lib/XIE/errors.c4
-rw-r--r--xc/lib/XIE/events.c4
-rw-r--r--xc/lib/XIE/free.c4
-rw-r--r--xc/lib/XIE/globals.h4
-rw-r--r--xc/lib/XIE/ieee.c4
-rw-r--r--xc/lib/XIE/init.c4
-rw-r--r--xc/lib/XIE/init.h2
-rw-r--r--xc/lib/XIE/jump_funcs8
-rw-r--r--xc/lib/XIE/jump_ignore8
-rw-r--r--xc/lib/XIE/jump_vars8
-rw-r--r--xc/lib/XIE/lut.c4
-rw-r--r--xc/lib/XIE/photoflo.c4
-rw-r--r--xc/lib/XIE/photomap.c4
-rw-r--r--xc/lib/XIE/photospace.c4
-rw-r--r--xc/lib/XIE/roi.c4
-rw-r--r--xc/lib/XIE/technique.c4
-rw-r--r--xc/lib/XIE/technique.h2
-rw-r--r--xc/lib/XIE/utils.c4
29 files changed, 98 insertions, 62 deletions
diff --git a/xc/lib/XIE/Imakefile b/xc/lib/XIE/Imakefile
index 09c9e9edc..a77b8b348 100644
--- a/xc/lib/XIE/Imakefile
+++ b/xc/lib/XIE/Imakefile
@@ -1,5 +1,9 @@
-XCOMM $XConsortium: Imakefile /main/7 1996/09/28 16:43:07 rws $
-XCOMM $XFree86: xc/lib/XIE/Imakefile,v 1.2 1998/12/20 11:56:58 dawes Exp $
+XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:45:25 cpqbld Exp $
+
+
+
+
+XCOMM $XFree86: xc/lib/XIE/Imakefile,v 1.3 2001/01/17 19:42:20 dawes Exp $
#define DoNormalLib NormalLibXie
#define DoSharedLib SharedLibXie
diff --git a/xc/lib/XIE/XIE-def.cpp b/xc/lib/XIE/XIE-def.cpp
index cbaa648db..b9191e96e 100644
--- a/xc/lib/XIE/XIE-def.cpp
+++ b/xc/lib/XIE/XIE-def.cpp
@@ -110,4 +110,4 @@ EXPORTS
XieTecWhiteAdjustCIELabShift
XieTecYCCToRGB
XieTecYCbCrToRGB
-/* $XConsortium: XIE-def.cpp /main/3 1996/05/07 13:15:28 kaleb $ */
+/* $Xorg: XIE-def.cpp,v 1.3 2000/08/17 19:45:25 cpqbld Exp $ */
diff --git a/xc/lib/XIE/XIElib.h b/xc/lib/XIE/XIElib.h
index fcbe74c64..3f1ce364f 100644
--- a/xc/lib/XIE/XIElib.h
+++ b/xc/lib/XIE/XIElib.h
@@ -1,4 +1,4 @@
-/* $TOG: XIElib.h /main/13 1998/02/06 15:13:26 kaleb $ */
+/* $Xorg: XIElib.h,v 1.5 2000/08/17 19:45:25 cpqbld Exp $ */
/*
@@ -246,7 +246,11 @@ typedef struct {
XiePhototag src2;
XieProcessDomain domain;
XieConstant constant;
+#if defined(__cplusplus) || defined(c_plusplus)
+ XieArithmeticOp c_operator;
+#else
XieArithmeticOp operator;
+#endif
unsigned int band_mask;
} Arithmetic;
@@ -283,7 +287,11 @@ typedef struct {
XiePhototag src2;
XieProcessDomain domain;
XieConstant constant;
+#if defined(__cplusplus) || defined(c_plusplus)
+ XieCompareOp c_operator;
+#else
XieCompareOp operator;
+#endif
Bool combine;
unsigned int band_mask;
} Compare;
@@ -357,7 +365,11 @@ typedef struct {
XiePhototag src2;
XieProcessDomain domain;
XieConstant constant;
+#if defined(__cplusplus) || defined(c_plusplus)
+ int c_operator;
+#else
int operator;
+#endif
unsigned int band_mask;
} Logical;
@@ -371,7 +383,11 @@ typedef struct {
struct {
XiePhototag src;
XieProcessDomain domain;
+#if defined(__cplusplus) || defined(c_plusplus)
+ XieMathOp c_operator;
+#else
XieMathOp operator;
+#endif
unsigned int band_mask;
} Math;
@@ -861,7 +877,11 @@ typedef struct {
unsigned long name_space;
XiePhototag phototag;
unsigned int elem_type;
+#if defined(__cplusplus) || defined(c_plusplus)
+ unsigned int c_operator;
+#else
unsigned int operator;
+#endif
} XieFloOperatorError;
typedef struct {
diff --git a/xc/lib/XIE/XIElibint.h b/xc/lib/XIE/XIElibint.h
index 0e23c69f6..80c29f7cd 100644
--- a/xc/lib/XIE/XIElibint.h
+++ b/xc/lib/XIE/XIElibint.h
@@ -1,4 +1,4 @@
-/* $TOG: XIElibint.h /main/9 1998/02/06 15:13:20 kaleb $ */
+/* $Xorg: XIElibint.h,v 1.4 2000/08/17 19:45:25 cpqbld Exp $ */
/*
Copyright 1993, 1994, 1998 The Open Group
@@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/XIElibint.h,v 3.3 1999/06/13 16:18:06 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/XIElibint.h,v 3.4 2001/01/17 19:42:21 dawes Exp $ */
#ifndef _XIELIBINT_H_
#define _XIELIBINT_H_
@@ -103,7 +103,7 @@ typedef struct _XieExtInfo
#define GET_EXTENSION_INFO(_display, _info) \
\
{ \
- if ((_info = _XieExtInfoHeader) != 0) \
+ if ((_info = _XieExtInfoHeader)) \
{ \
if (_XieExtInfoHeader->display != _display) \
{ \
diff --git a/xc/lib/XIE/abort.c b/xc/lib/XIE/abort.c
index e1e30d0a4..701917bc3 100644
--- a/xc/lib/XIE/abort.c
+++ b/xc/lib/XIE/abort.c
@@ -1,4 +1,4 @@
-/* $TOG: abort.c /main/3 1998/02/06 15:11:19 kaleb $ */
+/* $Xorg: abort.c,v 1.3 2000/08/17 19:45:25 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/abort.c,v 1.3 1999/06/13 16:18:07 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/abort.c,v 1.4 2001/01/17 19:42:21 dawes Exp $ */
#include "XIElibint.h"
diff --git a/xc/lib/XIE/await.c b/xc/lib/XIE/await.c
index c451fe475..f3037f8f7 100644
--- a/xc/lib/XIE/await.c
+++ b/xc/lib/XIE/await.c
@@ -1,4 +1,4 @@
-/* $TOG: await.c /main/3 1998/02/06 15:11:25 kaleb $ */
+/* $Xorg: await.c,v 1.3 2000/08/17 19:45:25 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/await.c,v 1.3 1999/06/13 16:18:07 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/await.c,v 1.4 2001/01/17 19:42:21 dawes Exp $ */
#include "XIElibint.h"
diff --git a/xc/lib/XIE/clientdata.c b/xc/lib/XIE/clientdata.c
index 2505c45f5..2a07a6fa4 100644
--- a/xc/lib/XIE/clientdata.c
+++ b/xc/lib/XIE/clientdata.c
@@ -1,4 +1,4 @@
-/* $TOG: clientdata.c /main/5 1998/02/06 15:11:30 kaleb $ */
+/* $Xorg: clientdata.c,v 1.3 2000/08/17 19:45:25 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/clientdata.c,v 1.3 1999/06/13 16:18:07 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/clientdata.c,v 1.4 2001/01/17 19:42:21 dawes Exp $ */
#include "XIElibint.h"
diff --git a/xc/lib/XIE/colorlist.c b/xc/lib/XIE/colorlist.c
index cc91fd694..03bf5cbc6 100644
--- a/xc/lib/XIE/colorlist.c
+++ b/xc/lib/XIE/colorlist.c
@@ -1,4 +1,4 @@
-/* $TOG: colorlist.c /main/7 1998/02/06 15:11:36 kaleb $ */
+/* $Xorg: colorlist.c,v 1.3 2000/08/17 19:45:25 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/colorlist.c,v 1.4 2000/09/26 15:56:53 tsi Exp $ */
+/* $XFree86: xc/lib/XIE/colorlist.c,v 1.5 2001/01/17 19:42:21 dawes Exp $ */
#include "XIElibint.h"
diff --git a/xc/lib/XIE/conven.c b/xc/lib/XIE/conven.c
index 4f1886aa9..8ecd62e8d 100644
--- a/xc/lib/XIE/conven.c
+++ b/xc/lib/XIE/conven.c
@@ -1,4 +1,4 @@
-/* $TOG: conven.c /main/10 1998/02/06 15:11:41 kaleb $ */
+/* $Xorg: conven.c,v 1.5 2000/08/17 19:45:25 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/conven.c,v 1.3 1999/06/13 16:18:08 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/conven.c,v 1.4 2001/01/17 19:42:21 dawes Exp $ */
#include "XIElibint.h"
@@ -168,7 +168,7 @@ XieFloArithmetic (
XiePhototag src2,
XieProcessDomain *domain,
XieConstant constant,
- XieArithmeticOp operator,
+ XieArithmeticOp op,
unsigned int band_mask)
{
element->elemType = xieElemArithmetic;
@@ -180,7 +180,7 @@ XieFloArithmetic (
element->data.Arithmetic.constant[0] = constant[0];
element->data.Arithmetic.constant[1] = constant[1];
element->data.Arithmetic.constant[2] = constant[2];
- element->data.Arithmetic.operator = operator;
+ element->data.Arithmetic.operator = op;
element->data.Arithmetic.band_mask = band_mask;
}
@@ -262,7 +262,7 @@ XieFloCompare (
XiePhototag src2,
XieProcessDomain *domain,
XieConstant constant,
- XieCompareOp operator,
+ XieCompareOp op,
Bool combine,
unsigned int band_mask)
{
@@ -275,7 +275,7 @@ XieFloCompare (
element->data.Compare.constant[0] = constant[0];
element->data.Compare.constant[1] = constant[1];
element->data.Compare.constant[2] = constant[2];
- element->data.Compare.operator = operator;
+ element->data.Compare.operator = op;
element->data.Compare.combine = combine;
element->data.Compare.band_mask = band_mask;
}
@@ -450,7 +450,7 @@ XieFloLogical (
XiePhototag src2,
XieProcessDomain *domain,
XieConstant constant,
- unsigned long operator,
+ unsigned long op,
unsigned int band_mask)
{
element->elemType = xieElemLogical;
@@ -462,7 +462,7 @@ XieFloLogical (
element->data.Logical.constant[0] = constant[0];
element->data.Logical.constant[1] = constant[1];
element->data.Logical.constant[2] = constant[2];
- element->data.Logical.operator = operator;
+ element->data.Logical.operator = op;
element->data.Logical.band_mask = band_mask;
}
@@ -490,7 +490,7 @@ XieFloMath (
XiePhotoElement *element,
XiePhototag src,
XieProcessDomain *domain,
- XieMathOp operator,
+ XieMathOp op,
unsigned int band_mask)
{
element->elemType = xieElemMath;
@@ -498,7 +498,7 @@ XieFloMath (
element->data.Math.domain.offset_x = domain->offset_x;
element->data.Math.domain.offset_y = domain->offset_y;
element->data.Math.domain.phototag = domain->phototag;
- element->data.Math.operator = operator;
+ element->data.Math.operator = op;
element->data.Math.band_mask = band_mask;
}
diff --git a/xc/lib/XIE/elements.c b/xc/lib/XIE/elements.c
index c1f144f85..99372d81b 100644
--- a/xc/lib/XIE/elements.c
+++ b/xc/lib/XIE/elements.c
@@ -1,4 +1,4 @@
-/* $TOG: elements.c /main/6 1998/02/06 15:11:48 kaleb $ */
+/* $Xorg: elements.c,v 1.5 2000/08/17 19:45:26 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/elements.c,v 1.3 1999/06/13 16:18:08 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/elements.c,v 1.4 2001/01/17 19:42:21 dawes Exp $ */
#include "XIElibint.h"
#include "elements.h"
diff --git a/xc/lib/XIE/elements.h b/xc/lib/XIE/elements.h
index 718534525..c6dcfe725 100644
--- a/xc/lib/XIE/elements.h
+++ b/xc/lib/XIE/elements.h
@@ -1,4 +1,4 @@
-/* $TOG: elements.h /main/6 1998/02/06 15:11:55 kaleb $ */
+/* $Xorg: elements.h,v 1.3 2000/08/17 19:45:26 cpqbld Exp $ */
/*
diff --git a/xc/lib/XIE/errors.c b/xc/lib/XIE/errors.c
index fdd92837b..c2bc2051f 100644
--- a/xc/lib/XIE/errors.c
+++ b/xc/lib/XIE/errors.c
@@ -1,4 +1,4 @@
-/* $TOG: errors.c /main/6 1998/02/06 15:12:00 kaleb $ */
+/* $Xorg: errors.c,v 1.5 2000/08/17 19:45:26 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/errors.c,v 3.3 1999/06/13 16:18:09 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/errors.c,v 3.4 2001/01/17 19:42:21 dawes Exp $ */
#define NEED_EVENTS /* so XErrorEvent will get pulled in */
diff --git a/xc/lib/XIE/events.c b/xc/lib/XIE/events.c
index 0c27b1113..49912d0bf 100644
--- a/xc/lib/XIE/events.c
+++ b/xc/lib/XIE/events.c
@@ -1,4 +1,4 @@
-/* $TOG: events.c /main/7 1998/02/06 15:12:05 kaleb $ */
+/* $Xorg: events.c,v 1.3 2000/08/17 19:45:26 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/events.c,v 1.3 1999/06/13 16:18:09 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/events.c,v 1.4 2001/01/17 19:42:21 dawes Exp $ */
#define NEED_EVENTS /* so xEvent will get pulled in */
#include "XIElibint.h"
diff --git a/xc/lib/XIE/free.c b/xc/lib/XIE/free.c
index 4734f7d9d..a3e8030b5 100644
--- a/xc/lib/XIE/free.c
+++ b/xc/lib/XIE/free.c
@@ -1,4 +1,4 @@
-/* $TOG: free.c /main/4 1998/02/06 15:12:10 kaleb $ */
+/* $Xorg: free.c,v 1.3 2000/08/17 19:45:26 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/free.c,v 1.3 1999/06/13 16:18:10 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/free.c,v 1.4 2001/01/17 19:42:21 dawes Exp $ */
#include "XIElibint.h"
diff --git a/xc/lib/XIE/globals.h b/xc/lib/XIE/globals.h
index 58c399ad2..47161773a 100644
--- a/xc/lib/XIE/globals.h
+++ b/xc/lib/XIE/globals.h
@@ -1,4 +1,4 @@
-/* $TOG: globals.h /main/4 1998/02/06 15:12:14 kaleb $ */
+/* $Xorg: globals.h,v 1.3 2000/08/17 19:45:27 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/globals.h,v 1.3 1999/06/13 13:47:01 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/globals.h,v 1.4 2001/01/17 19:42:21 dawes Exp $ */
extern void _XieElemImportClientLUT (char **, XiePhotoElement *);
extern void _XieElemImportClientPhoto (char **, XiePhotoElement *);
diff --git a/xc/lib/XIE/ieee.c b/xc/lib/XIE/ieee.c
index 1533e9365..683f1064a 100644
--- a/xc/lib/XIE/ieee.c
+++ b/xc/lib/XIE/ieee.c
@@ -1,4 +1,4 @@
-/* $TOG: ieee.c /main/6 1998/02/06 15:12:20 kaleb $ */
+/* $Xorg: ieee.c,v 1.3 2000/08/17 19:45:27 cpqbld Exp $ */
/******************************************************************************
NOTICE
@@ -64,7 +64,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/ieee.c,v 1.3 1999/06/13 16:18:10 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/ieee.c,v 1.4 2001/01/17 19:42:21 dawes Exp $ */
#include "XIElibint.h"
#include <math.h>
diff --git a/xc/lib/XIE/init.c b/xc/lib/XIE/init.c
index f345e2369..9e54faf99 100644
--- a/xc/lib/XIE/init.c
+++ b/xc/lib/XIE/init.c
@@ -1,4 +1,4 @@
-/* $TOG: init.c /main/12 1998/02/06 15:12:25 kaleb $ */
+/* $Xorg: init.c,v 1.5 2000/08/17 19:45:27 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/init.c,v 3.4 2000/09/26 15:56:53 tsi Exp $ */
+/* $XFree86: xc/lib/XIE/init.c,v 3.5 2001/01/17 19:42:21 dawes Exp $ */
#define NEED_EVENTS /* so XErrorEvent will get pulled in */
diff --git a/xc/lib/XIE/init.h b/xc/lib/XIE/init.h
index b2cbfaaf1..9381cc97d 100644
--- a/xc/lib/XIE/init.h
+++ b/xc/lib/XIE/init.h
@@ -1,4 +1,4 @@
-/* $TOG: init.h /main/4 1998/02/06 15:12:30 kaleb $ */
+/* $Xorg: init.h,v 1.3 2000/08/17 19:45:27 cpqbld Exp $ */
/*
diff --git a/xc/lib/XIE/jump_funcs b/xc/lib/XIE/jump_funcs
index e590f57c2..d4d85d123 100644
--- a/xc/lib/XIE/jump_funcs
+++ b/xc/lib/XIE/jump_funcs
@@ -1,5 +1,9 @@
-# $XConsortium: jump_funcs,v 1.2 94/12/07 10:44:37 kaleb Exp $
-# $XFree86: xc/lib/XIE/jump_funcs,v 3.1 1995/01/28 15:43:09 dawes Exp $
+# $Xorg: jump_funcs,v 1.3 2000/08/17 19:45:27 cpqbld Exp $
+#
+#
+#
+#
+# $XFree86: xc/lib/XIE/jump_funcs,v 3.2 2001/01/17 19:42:21 dawes Exp $
00000000 T _XieAbort libXIE abort
00000000 T _XieAwait libXIE await
00000000 T _XiePutClientData libXIE clientdata
diff --git a/xc/lib/XIE/jump_ignore b/xc/lib/XIE/jump_ignore
index 939a888dc..1a64a1cb0 100644
--- a/xc/lib/XIE/jump_ignore
+++ b/xc/lib/XIE/jump_ignore
@@ -1,3 +1,7 @@
-# $XConsortium: jump_ignore,v 1.2 94/12/07 10:44:37 kaleb Exp $
-# $XFree86: xc/lib/XIE/jump_ignore,v 3.1 1995/01/28 15:43:12 dawes Exp $
+# $Xorg: jump_ignore,v 1.3 2000/08/17 19:45:27 cpqbld Exp $
+#
+#
+#
+#
+# $XFree86: xc/lib/XIE/jump_ignore,v 3.2 2001/01/17 19:42:22 dawes Exp $
# jump_ignore
diff --git a/xc/lib/XIE/jump_vars b/xc/lib/XIE/jump_vars
index 481d2e3f4..5efd0cf77 100644
--- a/xc/lib/XIE/jump_vars
+++ b/xc/lib/XIE/jump_vars
@@ -1,5 +1,9 @@
-# $XConsortium: jump_vars,v 1.2 94/12/07 10:44:37 kaleb Exp $
-# $XFree86: xc/lib/XIE/jump_vars,v 3.1 1995/01/28 15:43:13 dawes Exp $
+# $Xorg: jump_vars,v 1.3 2000/08/17 19:45:27 cpqbld Exp $
+#
+#
+#
+#
+# $XFree86: xc/lib/XIE/jump_vars,v 3.2 2001/01/17 19:42:22 dawes Exp $
00000004 D __XieExtInfoHeader libXIE init
000000b4 D __XieElemFuncs libXIE init
00000004 D __XieTechFuncsInitialized libXIE init
diff --git a/xc/lib/XIE/lut.c b/xc/lib/XIE/lut.c
index bcfa46cb8..610da4838 100644
--- a/xc/lib/XIE/lut.c
+++ b/xc/lib/XIE/lut.c
@@ -1,4 +1,4 @@
-/* $TOG: lut.c /main/3 1998/02/06 15:12:36 kaleb $ */
+/* $Xorg: lut.c,v 1.3 2000/08/17 19:45:27 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/lut.c,v 1.3 1999/06/13 16:18:10 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/lut.c,v 1.4 2001/01/17 19:42:22 dawes Exp $ */
#include "XIElibint.h"
diff --git a/xc/lib/XIE/photoflo.c b/xc/lib/XIE/photoflo.c
index 43ef91681..a83f577d0 100644
--- a/xc/lib/XIE/photoflo.c
+++ b/xc/lib/XIE/photoflo.c
@@ -1,4 +1,4 @@
-/* $TOG: photoflo.c /main/7 1998/02/06 15:12:41 kaleb $ */
+/* $Xorg: photoflo.c,v 1.3 2000/08/17 19:45:27 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/photoflo.c,v 1.3 1999/06/13 16:18:11 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/photoflo.c,v 1.4 2001/01/17 19:42:22 dawes Exp $ */
#include "XIElibint.h"
diff --git a/xc/lib/XIE/photomap.c b/xc/lib/XIE/photomap.c
index 3ad31dcaa..ea27dc1d8 100644
--- a/xc/lib/XIE/photomap.c
+++ b/xc/lib/XIE/photomap.c
@@ -1,4 +1,4 @@
-/* $TOG: photomap.c /main/7 1998/02/06 15:12:46 kaleb $ */
+/* $Xorg: photomap.c,v 1.3 2000/08/17 19:45:27 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/photomap.c,v 1.3 1999/06/13 16:18:11 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/photomap.c,v 1.4 2001/01/17 19:42:22 dawes Exp $ */
#include "XIElibint.h"
diff --git a/xc/lib/XIE/photospace.c b/xc/lib/XIE/photospace.c
index ff57e5f9e..c52f36809 100644
--- a/xc/lib/XIE/photospace.c
+++ b/xc/lib/XIE/photospace.c
@@ -1,4 +1,4 @@
-/* $TOG: photospace.c /main/3 1998/02/06 15:12:51 kaleb $ */
+/* $Xorg: photospace.c,v 1.3 2000/08/17 19:45:27 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/photospace.c,v 1.3 1999/06/13 16:18:11 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/photospace.c,v 1.4 2001/01/17 19:42:22 dawes Exp $ */
#include "XIElibint.h"
diff --git a/xc/lib/XIE/roi.c b/xc/lib/XIE/roi.c
index 82b9869a9..0c4797c04 100644
--- a/xc/lib/XIE/roi.c
+++ b/xc/lib/XIE/roi.c
@@ -1,4 +1,4 @@
-/* $TOG: roi.c /main/3 1998/02/06 15:12:57 kaleb $ */
+/* $Xorg: roi.c,v 1.3 2000/08/17 19:45:27 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/roi.c,v 1.3 1999/06/13 16:18:12 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/roi.c,v 1.4 2001/01/17 19:42:22 dawes Exp $ */
#include "XIElibint.h"
diff --git a/xc/lib/XIE/technique.c b/xc/lib/XIE/technique.c
index b4c72c7a0..1f733763f 100644
--- a/xc/lib/XIE/technique.c
+++ b/xc/lib/XIE/technique.c
@@ -1,4 +1,4 @@
-/* $TOG: technique.c /main/8 1998/02/06 15:13:02 kaleb $ */
+/* $Xorg: technique.c,v 1.3 2000/08/17 19:45:27 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/technique.c,v 1.3 1999/06/13 16:18:12 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/technique.c,v 1.4 2001/01/17 19:42:22 dawes Exp $ */
#include "XIElibint.h"
#include "technique.h"
diff --git a/xc/lib/XIE/technique.h b/xc/lib/XIE/technique.h
index 163ce6af8..8acce1df5 100644
--- a/xc/lib/XIE/technique.h
+++ b/xc/lib/XIE/technique.h
@@ -1,4 +1,4 @@
-/* $TOG: technique.h /main/5 1998/02/06 15:13:09 kaleb $ */
+/* $Xorg: technique.h,v 1.3 2000/08/17 19:45:28 cpqbld Exp $ */
/*
diff --git a/xc/lib/XIE/utils.c b/xc/lib/XIE/utils.c
index dfd24be10..8efd29d62 100644
--- a/xc/lib/XIE/utils.c
+++ b/xc/lib/XIE/utils.c
@@ -1,4 +1,4 @@
-/* $TOG: utils.c /main/4 1998/04/30 14:40:10 kaleb $ */
+/* $Xorg: utils.c,v 1.3 2000/08/17 19:45:28 cpqbld Exp $ */
/*
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/XIE/utils.c,v 1.3 1999/06/13 16:18:12 dawes Exp $ */
+/* $XFree86: xc/lib/XIE/utils.c,v 1.4 2001/01/17 19:42:22 dawes Exp $ */
#include "XIElibint.h"