projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r329: *** empty log message ***
[ctsim.git]
/
include
/
ct.h
diff --git
a/include/ct.h
b/include/ct.h
index ad04701926bbe9f4589d2c886bf197c78cbec345..b618130ec6d152772bd23b2baece82a430727e8c 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.4
0 2000/12/04 04:15:48
kevin Exp $
+** $Id: ct.h,v 1.4
8 2001/01/02 05:34:57
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,14
@@
#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
+#ifdef MSVC
+#include "msvc_compat.h"
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-
+
\r
#define HAVE_ANSI_CPP 1
#ifdef HAVE_ANSI_CPP
#include <complex>
#define HAVE_ANSI_CPP 1
#ifdef HAVE_ANSI_CPP
#include <complex>
@@
-51,12
+46,16
@@
#include <cstddef>
#include <cstdarg>
#include <cstdlib>
#include <cstddef>
#include <cstdarg>
#include <cstdlib>
-using namespace std;
-
+
\r
+#if defined(MSVC) || HAVE_SSTREAM
\r
#include <sstream>
#include <sstream>
+#else
\r
+#include <sstream_subst>
+#endif
\r
+
\r
#include <fstream>
#include <iostream>
#include <fstream>
#include <iostream>
-#include <string>
+#include <string>
\r
#include <iterator>
#include <algorithm>
#include <exception>
#include <iterator>
#include <algorithm>
#include <exception>
@@
-171,10
+170,12
@@
extern "C" {
#include "phantom.h"
#include "scanner.h"
#include "backprojectors.h"
#include "phantom.h"
#include "scanner.h"
#include "backprojectors.h"
-#include "filter.h"
+#include "filter.h"
\r
+#include "fourier.h"
#include "procsignal.h"
#include "projections.h"
#include "reconstruct.h"
#include "procsignal.h"
#include "projections.h"
#include "reconstruct.h"
+#include "plotfile.h"
\r
#include "trace.h"
#include "trace.h"