r68: Added C++ compatibility

[ctsim.git] / include / ir.h

diff --git a/include/ir.h b/include/ir.h
index cf8b6a09ff80573e945533e2101b6d7c1bf0b597..3cc918a6da7d3f226217716ad8049a7ed9ed6db1 100644 (file)
--- 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.16 2000/05/24 22:48:17 kevin Exp $
+**  $Id: ir.h,v 1.18 2000/06/05 01:32:45 kevin Exp $
 **  $Log: ir.h,v $
+**  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 ***
+**
 **  Revision 1.16  2000/05/24 22:48:17  kevin
 **  First functional version of SDF library for X-window
 **
@@ -273,13 +279,16 @@ typedef enum {
 } FunctionSymmetry;
 
 /* interpolation methods */
+#undef HAVE_BSPLINE_INTERP
 typedef enum {     /* Interpolation methods */
   I_NEAREST,       /* Nearest neighbor */
-  I_LINEAR,        /* Linear interpolation */
+#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 */
@@ -364,7 +373,7 @@ const static int RAYSUM_TRACE_ROW_ATTEN=18;
 void usage (const char *program);
 
 /* From reconstr.c */
-IMAGE *image_reconst (IMAGE *im, RAYSUM *rs, int filt_type, double filt_param, const InterpolationType interp_type, int interp_param, const BackprojType backproj_type, int const ir_trace);
+IMAGE *image_reconst (IMAGE *im, RAYSUM *rs, const FilterType filt_type, double filt_param, InterpolationType interp_type, int interp_param, const BackprojType backproj_type, int const ir_trace);
 
 /* From bproj.c */
 void backproj_init (const RAYSUM *rs, IMAGE *im, const BackprojType bproj_method);