r7939: Initial working version of fftw3 conversion -- tested only with pjrec

[ctsim.git] / include / ct.h

diff --git a/include/ct.h b/include/ct.h
index 84e139f8f892f86b65a0906ffc01500aefbec697..9ee346bf018c1385518893e9f844a17d7443884b 100644 (file)
--- 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.42 2000/12/06 15:17:51 kevin Exp $
+**  $Id$
 **
 **  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,20 +28,21 @@
 #ifndef CT_H
 #define CT_H
 
+#define NO_MAIN 1    // filter out all old main blocks
+
 #ifdef MSVC
- // extern "C" {int strcasecmp(const char*, const char*);}
-  typedef long off_t;
-  #define HAVE_STRING_H 1\r
-  #include <fcntl.h>\r
-  #define strdup _strdup
-  #define strcasecmp _stricmp
-  #define strncasecmp _strnicmp
+#include "msvc_compat.h"
 #endif
 
 #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>
@@ -52,14 +53,13 @@
 #include <cstddef>
 #include <cstdarg>
 #include <cstdlib>
-using namespace std;
-\r
-#if defined(MSVC) || HAVE_SSTREAM\r
+
+#if defined(MSVC) || HAVE_SSTREAM
 #include <sstream>
-#else\r
-#include <sstream_subst>\r
-#endif\r
-\r
+#else
+#include <sstream_subst>
+#endif
+
 #include <fstream>
 #include <iostream>
 #include <string>
@@ -153,8 +153,8 @@ extern "C" {
 
 
 #ifdef HAVE_FFTW
-#include <rfftw.h>
-#include <fftw.h>
+#include <fftw3.h>
+#define HAVE_FFT 1
 #endif
 
 #ifdef HAVE_MPI
@@ -178,11 +178,14 @@ extern "C" {
 #include "scanner.h"
 #include "backprojectors.h"
 #include "filter.h"
+#include "fourier.h"
 #include "procsignal.h"
 #include "projections.h"
 #include "reconstruct.h"
+#include "plotfile.h"
 #include "trace.h"
 
+#include "ctglobals.h"
 
 #endif