r70: added imagefiles

[ctsim.git] / include / ir.h

diff --git a/include/ir.h b/include/ir.h
index 3cc918a6da7d3f226217716ad8049a7ed9ed6db1..0a04c795d74bb149107c832af9b31cbf329711a5 100644 (file)
--- a/include/ir.h
+++ b/include/ir.h
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ir.h,v 1.18 2000/06/05 01:32:45 kevin Exp $
+**  $Id: ir.h,v 1.19 2000/06/07 00:59:38 kevin Exp $
 **  $Log: ir.h,v $
+**  Revision 1.19  2000/06/07 00:59:38  kevin
+**  added imagefiles
+**
 **  Revision 1.18  2000/06/05 01:32:45  kevin
 **  Added C++ compatibility
 **
@@ -82,10 +85,6 @@
 #ifndef IR_H
 #define IR_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #ifdef MPI_CT
 #define MPI_MAX_PROCESS 128 
 struct mpi_ct_st
@@ -268,12 +267,12 @@ static const char D_FREQ_STR[]=    "freq";
 static const char D_SPATIAL_STR[]= "spatial";
  
 typedef enum {
-  D_FREQ,
+  D_FREQ = 1,
   D_SPATIAL 
 } DomainType;
 
 typedef enum {
-    FUNC_EVEN,    /* function types, f[-n] = f[n] */
+    FUNC_EVEN = 1,    /* function types, f[-n] = f[n] */
     FUNC_ODD,     /* f[-n] = -f[n] */
     FUNC_BOTH    /* function has both odd & even components */
 } FunctionSymmetry;
@@ -281,7 +280,7 @@ typedef enum {
 /* interpolation methods */
 #undef HAVE_BSPLINE_INTERP
 typedef enum {     /* Interpolation methods */
-  I_NEAREST,       /* Nearest neighbor */
+  I_NEAREST = 1,       /* Nearest neighbor */
 #if HAVE_BSPLINE_INTERP
   I_BSPLINE,
   I_1BSPLINE,      /* 1st order B-Spline */
@@ -369,7 +368,11 @@ const static int RAYSUM_TRACE_ROW_ATTEN=18;
 /*************************************************************************
  *  FUNCTION DECLARATIONS
  ************************************************************************/
- 
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 void usage (const char *program);
 
 /* From reconstr.c */