projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r405: pj2if.cpp
[ctsim.git]
/
include
/
ct.h
diff --git
a/include/ct.h
b/include/ct.h
index cfdd9dcf558bae1f0b9606b9550a55d8cb0bf4ee..a36412f097b98936b7461c2b4e824b2238182b67 100644
(file)
--- a/
include/ct.h
+++ b/
include/ct.h
@@
-9,7
+9,7
@@
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: ct.h,v 1.
37 2000/11/29 07:58:13
kevin Exp $
+** $Id: ct.h,v 1.
53 2001/01/13 03:51:35
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,13
+28,10
@@
#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
#endif
#ifdef HAVE_CONFIG_H
@@
-43,6
+40,7
@@
#define HAVE_ANSI_CPP 1
#ifdef HAVE_ANSI_CPP
#define HAVE_ANSI_CPP 1
#ifdef HAVE_ANSI_CPP
+#include <complex>
#include <cmath>
#include <cstdio>
#include <cctype>
#include <cmath>
#include <cstdio>
#include <cctype>
@@
-50,12
+48,15
@@
#include <cstddef>
#include <cstdarg>
#include <cstdlib>
#include <cstddef>
#include <cstdarg>
#include <cstdlib>
-using namespace std;
-#include <complex>
+#if defined(MSVC) || HAVE_SSTREAM
+#include <sstream>
+#else
+#include <sstream_subst>
+#endif
+
#include <fstream>
#include <iostream>
#include <fstream>
#include <iostream>
-#include <sstream>
#include <string>
#include <iterator>
#include <algorithm>
#include <string>
#include <iterator>
#include <algorithm>
@@
-149,6
+150,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
@@
-172,11
+174,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