r97: Converted Scanner and Projections to C++

[ctsim.git] / include / ct.h

diff --git a/include/ct.h b/include/ct.h
index 02992b34be34b70f1954a52a4cd22cdb6e0a77c9..4817fb35424e7a736f680f7eabe2daee21b949b3 100644 (file)
--- a/include/ct.h
+++ b/include/ct.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ct.h,v 1.12 2000/06/09 01:35:33 kevin Exp $
+**  $Id: ct.h,v 1.15 2000/06/17 20:12:14 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,22 +45,14 @@
   #include "png.h"
 #endif
 #ifdef HAVE_G2_H
-  #ifdef __cplusplus
-  extern "C" { 
-    #include "g2.h" 
-  }
-  #else
-  #include "g2.h"
-  #endif
-  #ifdef HAVE_X11
-    #ifdef __cplusplus
-      extern "C" {
-        #include "g2_X11.h"
-      }
-    #else
-        #include "g2_X11.h"
-    #endif
-  #endif
+extern "C" { 
+#include "g2.h" 
+}
+#ifdef HAVE_X11
+extern "C" {
+#include "g2_X11.h"
+}
+#endif
 #endif
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
@@ -126,6 +118,7 @@
 #include "kmath.h"
 #include "keyboard.h"
 #include "cio.h"
+#include "byteorder.h"
 
 #ifdef HAVE_SGP
   #include "ezplot.h"
@@ -133,14 +126,20 @@
 #endif
 
 #include <iostream>
+#include <sstream>
 #include <string>
+#include <iterator>
+#include <algorithm>
 
 using namespace std;
 
 #include "array2d.h"
 #include "imagefile.h"
+#include "phantom.h"
+#include "projections.h"
+#include "scanner.h"
 #include "ir.h"
-#include "backproj.h"
+#include "backprojectors.h"
 
 
 #endif