X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fct.h;h=95e9134cad20a67b396cf21a2d425ad5054f2127;hp=cfdd9dcf558bae1f0b9606b9550a55d8cb0bf4ee;hb=505de7e90b7c4a6ab3e81ee3192a7d9837701806;hpb=a9c9c7d1a1068e92145c923fab2801149e0e6899 diff --git a/include/ct.h b/include/ct.h index cfdd9dc..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.37 2000/11/29 07:58:13 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,21 +28,24 @@ #ifndef CT_H #define CT_H -#ifdef _WIN32 - extern "C" {int strcasecmp(const char*, const char*);} - typedef long off_t; - #define HAVE_STRING_H 1 - #include - #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 #endif +#ifdef _DEBUG +#undef DEBUG +#define DEBUG 1 +#endif + #define HAVE_ANSI_CPP 1 #ifdef HAVE_ANSI_CPP +#include #include #include #include @@ -50,12 +53,15 @@ #include #include #include -using namespace std; -#include +#if defined(MSVC) || HAVE_SSTREAM +#include +#else +#include +#endif + #include #include -#include #include #include #include @@ -149,6 +155,7 @@ extern "C" { #ifdef HAVE_FFTW #include #include +#define HAVE_FFT 1 #endif #ifdef HAVE_MPI @@ -157,6 +164,7 @@ extern "C" { #endif #include "ctsupport.h" +#include "interpolator.h" #include "fnetorderstream.h" #ifdef HAVE_SGP @@ -172,11 +180,17 @@ 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" +#ifdef HAVE_CTN_DICOM +#include "ctndicom.h" +#endif +#include "ctglobals.h" #endif