X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fbackprojectors.h;h=bd30b9cf47c0a4739da2f301e023505506d0f26f;hp=73dabe579cfe799e4c77e48ac6f339dba5c0796e;hb=9776c9a12ba53419d34563a5ec57c90e3d6798f4;hpb=9f29c8b32c972db1178d6f8551d5cd57ceb67083

diff --git a/include/backprojectors.h b/include/backprojectors.h
index 73dabe5..bd30b9c 100644
--- a/include/backprojectors.h
+++ b/include/backprojectors.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: backprojectors.h,v 1.19 2001/01/28 19:10:18 kevin Exp $
+**  $Id: backprojectors.h,v 1.22 2001/02/22 18:22:40 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -45,13 +45,12 @@ class Backprojector
   static const int BPROJ_TRIG;
   static const int BPROJ_TABLE;
   static const int BPROJ_DIFF;
-  static const int BPROJ_DIFF2;
-  static const int BPROJ_IDIFF2;
-  static const int BPROJ_IDIFF3;
+  static const int BPROJ_IDIFF;
 
   static const int INTERP_INVALID;
   static const int INTERP_NEAREST;
   static const int INTERP_LINEAR;
+  static const int INTERP_CUBIC;
   static const int INTERP_FREQ_PREINTERPOLATION;
 #if HAVE_BSPLINE_INTERP
   static const int INTERP_BSPLINE;
@@ -70,15 +69,15 @@ class Backprojector
   const std::string& failMessage() const {return m_failMessage;}
 
   static const int getBackprojectCount() {return s_iBackprojectCount;}
-  static const char** getBackprojectNameArray() {return s_aszBackprojectName;}
-  static const char** getBackprojectTitleArray() {return s_aszBackprojectTitle;}
+  static const char* const* getBackprojectNameArray() {return s_aszBackprojectName;}
+  static const char* const* getBackprojectTitleArray() {return s_aszBackprojectTitle;}
   static int convertBackprojectNameToID (const char* const bprojName);
   static const char* convertBackprojectIDToName (const int bprojID);
   static const char* convertBackprojectIDToTitle (const int bprojID);
 
   static const int getInterpCount() {return s_iInterpCount;}
-  static const char** getInterpNameArray() {return s_aszInterpName;}
-  static const char** getInterpTitleArray() {return s_aszInterpTitle;}
+  static const char* const * getInterpNameArray() {return s_aszInterpName;}
+  static const char* const * getInterpTitleArray() {return s_aszInterpTitle;}
   static int convertInterpNameToID (const char* const interpName);
   static const char* convertInterpIDToName (const int interpID);
   static const char* convertInterpIDToTitle (const int interpID);
@@ -93,12 +92,12 @@ class Backprojector
   bool m_fail;
   std::string m_failMessage;
 
-  static const char* s_aszBackprojectName[];
-  static const char* s_aszBackprojectTitle[];
+  static const char* const s_aszBackprojectName[];
+  static const char* const s_aszBackprojectTitle[];
   static const int s_iBackprojectCount;
 
-  static const char* s_aszInterpName[];
-  static const char* s_aszInterpTitle[];
+  static const char* const s_aszInterpName[];
+  static const char* const s_aszInterpTitle[];
   static const int s_iInterpCount;
 
   bool initBackprojector (const Projections& proj, ImageFile& im, const char* const backprojName, const char* const interpName, const int interpFactor);
@@ -181,31 +180,11 @@ class BackprojectDiff : public Backproject
   double im_xinc, im_yinc;
 };
 
-class BackprojectDiff2 : public BackprojectDiff
-{
- public:
-  BackprojectDiff2 (const Projections& proj, ImageFile& im, int interpID, const int interpFactor)
-    :  BackprojectDiff (proj, im, interpID, interpFactor)
-    {}
-
-  void BackprojectView (const double* const t, const double view_angle);
-};
-
-class BackprojectIntDiff2 : public BackprojectDiff
-{
- public:
-  BackprojectIntDiff2 (const Projections& proj, ImageFile& im, int interpID, const int interpFactor)
-    :  BackprojectDiff (proj, im, interpID, interpFactor)
-    {}
-  
-  void BackprojectView (const double* const t, const double view_angle);
-};
-
 
-class BackprojectIntDiff3 : public BackprojectDiff
+class BackprojectIntDiff : public BackprojectDiff
 {
  public:
-  BackprojectIntDiff3 (const Projections& proj, ImageFile& im, int interpID, const int interpFactor)
+  BackprojectIntDiff (const Projections& proj, ImageFile& im, int interpID, const int interpFactor)
     :  BackprojectDiff (proj, im, interpID, interpFactor)
     {}