X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fir.h;h=0a04c795d74bb149107c832af9b31cbf329711a5;hp=652e5cb5b746fb79eb7694499cf0379663c44f6c;hb=07b93dbf2b66fa23c5378ab0fa42f9a7f0083380;hpb=6404682526633f7f2b9a2f94071d802b7b50dd07

diff --git a/include/ir.h b/include/ir.h
index 652e5cb..0a04c79 100644
--- a/include/ir.h
+++ b/include/ir.h
@@ -2,8 +2,14 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ir.h,v 1.17 2000/06/03 06:29:08 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
+**
 **  Revision 1.17  2000/06/03 06:29:08  kevin
 **  *** empty log message ***
 **
@@ -79,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
@@ -265,24 +267,27 @@ 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;
 
 /* interpolation methods */
+#undef HAVE_BSPLINE_INTERP
 typedef enum {     /* Interpolation methods */
-  I_NEAREST,       /* Nearest neighbor */
-  I_LINEAR,        /* Linear interpolation */
+  I_NEAREST = 1,       /* Nearest neighbor */
+#if HAVE_BSPLINE_INTERP
   I_BSPLINE,
   I_1BSPLINE,      /* 1st order B-Spline */
   I_2BSPLINE,
-  I_3BSPLINE
+  I_3BSPLINE,
+#endif
+  I_LINEAR        /* Linear interpolation */
 } InterpolationType;
 
 /* Constants for sizing PHANTOM */
@@ -363,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 */