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

diff --git a/include/ct.h b/include/ct.h
index 72a01f2..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.13 2000/06/10 23:00:17 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,39 +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
-  #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
+
+#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>
@@ -77,18 +92,37 @@
 #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
@@ -98,9 +132,6 @@
 #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
@@ -116,32 +147,45 @@
 #ifdef HAVE_STDINT_H
 #include <stdint.h>             /* Standard ints on Linux */
 #endif
+#ifdef HAVE_ASSERT_H
+#include <assert.h>
+#endif
+
+
+#ifdef HAVE_FFTW
+#include <fftw3.h>
+#define HAVE_FFT 1
+#endif
 
 #ifdef HAVE_MPI
 #include "mpi++.h"
 #include "mpiworld.h"
 #endif
 
-#include "kstddef.h"
-#include "kmath.h"
-#include "keyboard.h"
-#include "cio.h"
+#include "ctsupport.h"
+#include "fnetorderstream.h"
 
 #ifdef HAVE_SGP
   #include "ezplot.h"
   #include "sgp.h"
 #endif
 
-#include <iostream>
-#include <string>
-
-using namespace std;
-
 #include "array2d.h"
+#include "array2dfile.h"
+#include "fnetorderstream.h"
 #include "imagefile.h"
-#include "ir.h"
+#include "phantom.h"
+#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