X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fct.h;h=95e9134cad20a67b396cf21a2d425ad5054f2127;hp=b618130ec6d152772bd23b2baece82a430727e8c;hb=505de7e90b7c4a6ab3e81ee3192a7d9837701806;hpb=9b2bb510160bdb56f04847f5b55ab61dd8a47976

diff --git a/include/ct.h b/include/ct.h
index b618130..95e9134 100644
--- a/include/ct.h
+++ b/include/ct.h
@@ -7,9 +7,9 @@
 **   Date Started:  Aug 1984
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
+**  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: ct.h,v 1.48 2001/01/02 05:34:57 kevin Exp $
+**  $Id: ct.h,v 1.58 2001/03/02 02:08: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
@@ -28,6 +28,8 @@
 #ifndef CT_H
 #define CT_H
 
+#define NO_MAIN 1    // filter out all old main blocks
+
 #ifdef MSVC
 #include "msvc_compat.h"
 #endif
@@ -35,7 +37,12 @@
 #ifdef HAVE_CONFIG_H
   #include <config.h>
 #endif
-
+
+#ifdef _DEBUG
+#undef DEBUG
+#define DEBUG 1
+#endif
+
 #define HAVE_ANSI_CPP 1
 #ifdef HAVE_ANSI_CPP
 #include <complex>
@@ -46,16 +53,16 @@
 #include <cstddef>
 #include <cstdarg>
 #include <cstdlib>
-
-#if defined(MSVC) || HAVE_SSTREAM
+
+#if defined(MSVC) || HAVE_SSTREAM
 #include <sstream>
-#else
+#else
 #include <sstream_subst>
-#endif
-
+#endif
+
 #include <fstream>
 #include <iostream>
-#include <string>
+#include <string>
 #include <iterator>
 #include <algorithm>
 #include <exception>
@@ -148,6 +155,7 @@ extern "C" {
 #ifdef HAVE_FFTW
 #include <rfftw.h>
 #include <fftw.h>
+#define HAVE_FFT 1
 #endif
 
 #ifdef HAVE_MPI
@@ -156,6 +164,7 @@ extern "C" {
 #endif
 
 #include "ctsupport.h"
+#include "interpolator.h"
 #include "fnetorderstream.h"
 
 #ifdef HAVE_SGP
@@ -170,14 +179,18 @@ extern "C" {
 #include "phantom.h"
 #include "scanner.h"
 #include "backprojectors.h"
-#include "filter.h"
+#include "filter.h"
 #include "fourier.h"
 #include "procsignal.h"
 #include "projections.h"
 #include "reconstruct.h"
-#include "plotfile.h"
+#include "plotfile.h"
 #include "trace.h"
+#ifdef HAVE_CTN_DICOM
+#include "ctndicom.h"
+#endif
 
+#include "ctglobals.h"
 
 #endif