X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fct.h;h=9ee346bf018c1385518893e9f844a17d7443884b;hp=54dd3cfb52689f7c89c0bdce332489f6d19b7599;hb=d42d3d062dd1aca92b5a2552a1f474aab0bee610;hpb=e4ffe82feebf1df2ac1dd14633818eb9a739863f

diff --git a/include/ct.h b/include/ct.h
index 54dd3cf..9ee346b 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.24 2000/07/02 18:21:39 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,31 +28,54 @@
 #ifndef CT_H
 #define CT_H
 
-#ifdef _WIN32
-  typedef long off_t;
-  #define HAVE_STRING_H 1
-  #include <fcntl.h>
-  #define snprintf _snprintf
-  #define vsnprintf _vsnprintf
-  #define strcasecmp stricmp
-  #define strncasecmp strnicmp
+#define NO_MAIN 1    // filter out all old main blocks
+
+#ifdef MSVC
+#include "msvc_compat.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
   #include <config.h>
 #endif
-#ifdef HAVE_PNG
-  #include "png.h"
+
+#ifdef _DEBUG
+#undef DEBUG
+#define DEBUG 1
 #endif
-#ifdef HAVE_G2_H
-extern "C" { 
-#include "g2.h" 
-}
-#ifdef HAVE_X11
-extern "C" {
-#include "g2_X11.h"
-}
+
+#define HAVE_ANSI_CPP 1
+#ifdef HAVE_ANSI_CPP
+#include <complex>
+#include <cmath>
+#include <cstdio>
+#include <cctype>
+#include <cstring>
+#include <cstddef>
+#include <cstdarg>
+#include <cstdlib>
+
+#if defined(MSVC) || HAVE_SSTREAM
+#include <sstream>
+#else
+#include <sstream_subst>
+#endif
+
+#include <fstream>
+#include <iostream>
+#include <string>
+#include <iterator>
+#include <algorithm>
+#include <exception>
+#include <stdexcept>
+#include <memory>
+
+#else
+
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
 #endif
+#ifdef HAVE_MATH_H
+#include <math.h>
 #endif
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
@@ -69,18 +92,37 @@ extern "C" {
 #ifdef HAVE_STDARG_H
 #include <stdarg.h>
 #endif
+
+#endif
+
+
+#ifdef HAVE_DMALLOC
+#include <dmalloc.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_PNG
+  #include "png.h"
+#endif
+#ifdef HAVE_G2_H
+extern "C" { 
+#include "g2.h" 
+}
+#ifdef HAVE_X11
+extern "C" {
+#include "g2_X11.h"
+}
+#endif
+#endif
+
+
 #ifdef  HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-#ifdef HAVE_MATH_H
-#include <math.h>
-#endif
 #ifdef HAVE_SYS_FCNTL_H
 #include <sys/fcntl.h>
 #endif
@@ -90,9 +132,6 @@ extern "C" {
 #if defined(HAVE_GETOPT_H) || defined(HAVE_GETOPT_LONG)
 #include <getopt.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #ifdef HAVE_SETJMP_H
 #include <setjmp.h>
 #endif
@@ -108,19 +147,15 @@ extern "C" {
 #ifdef HAVE_STDINT_H
 #include <stdint.h>             /* Standard ints on Linux */
 #endif
+#ifdef HAVE_ASSERT_H
+#include <assert.h>
+#endif
 
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <iterator>
-#include <algorithm>
-#include <exception>
-#include <stdexcept>
-#include <memory>
-#include <complex>
 
-using namespace std;
+#ifdef HAVE_FFTW
+#include <fftw3.h>
+#define HAVE_FFT 1
+#endif
 
 #ifdef HAVE_MPI
 #include "mpi++.h"
@@ -143,9 +178,14 @@ using namespace std;
 #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