projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r574: no message
[ctsim.git]
/
include
/
ct.h
diff --git
a/include/ct.h
b/include/ct.h
index aa4cbb095bf4dbb79a690bbe68e7017ae87b58bf..9be0e7f90260a90aa2af92dc23356bb6018fd834 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
** 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.
39 2000/12/04 03:09:00
kevin Exp $
+** $Id: ct.h,v 1.
57 2001/02/11 04:56:37
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
**
** 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,19
+28,21
@@
#ifndef CT_H
#define CT_H
#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 <fcntl.h>
- #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
#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>
#define HAVE_ANSI_CPP 1
#ifdef HAVE_ANSI_CPP
#include <complex>
@@
-51,10
+53,11
@@
#include <cstddef>
#include <cstdarg>
#include <cstdlib>
#include <cstddef>
#include <cstdarg>
#include <cstdlib>
-using namespace std;
-#if
ndef WIN32
+#if
defined(MSVC) || HAVE_SSTREAM
#include <sstream>
#include <sstream>
+#else
+#include <sstream_subst>
#endif
#include <fstream>
#endif
#include <fstream>
@@
-152,6
+155,7
@@
extern "C" {
#ifdef HAVE_FFTW
#include <rfftw.h>
#include <fftw.h>
#ifdef HAVE_FFTW
#include <rfftw.h>
#include <fftw.h>
+#define HAVE_FFT 1
#endif
#ifdef HAVE_MPI
#endif
#ifdef HAVE_MPI
@@
-160,6
+164,7
@@
extern "C" {
#endif
#include "ctsupport.h"
#endif
#include "ctsupport.h"
+#include "interpolator.h"
#include "fnetorderstream.h"
#ifdef HAVE_SGP
#include "fnetorderstream.h"
#ifdef HAVE_SGP
@@
-175,11
+180,14
@@
extern "C" {
#include "scanner.h"
#include "backprojectors.h"
#include "filter.h"
#include "scanner.h"
#include "backprojectors.h"
#include "filter.h"
+#include "fourier.h"
#include "procsignal.h"
#include "projections.h"
#include "reconstruct.h"
#include "procsignal.h"
#include "projections.h"
#include "reconstruct.h"
+#include "plotfile.h"
#include "trace.h"
#include "trace.h"
+#include "ctglobals.h"
#endif
#endif