projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r4600: Automatic commit for debian_version_4_2_4b-2
[ctsim.git]
/
include
/
ct.h
diff --git
a/include/ct.h
b/include/ct.h
index 99d20131fd2cca2742eed7dc39288108a389a8a0..97e52f188ab42a4972c93546085eec423af64e0c 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.
35 2000/11/28 15:37:5
2 kevin Exp $
+** $Id: ct.h,v 1.
60 2003/03/23 18:37:4
2 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,38
+28,73
@@
#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
-#include <cmath>
+#ifdef _DEBUG
+#undef DEBUG
+#define DEBUG 1
+#endif
+
+#define HAVE_ANSI_CPP 1
+#ifdef HAVE_ANSI_CPP
#include <complex>
#include <complex>
+#include <cmath>
#include <cstdio>
#include <cctype>
#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 <fstream>
#include <iostream>
-#include <sstream>
#include <string>
#include <iterator>
#include <algorithm>
#include <exception>
#include <stdexcept>
#include <memory>
#include <string>
#include <iterator>
#include <algorithm>
#include <exception>
#include <stdexcept>
#include <memory>
-#include <cstring>
-#include <cstddef>
-#include <cstdarg>
-#include <cstdlib>
-#define __MATH_H__ 1
+#else
+
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+
+#endif
+
#ifdef HAVE_DMALLOC
#include <dmalloc.h>
#ifdef HAVE_DMALLOC
#include <dmalloc.h>
@@
-117,38
+152,12
@@
extern "C" {
#endif
#endif
-#if 0
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-#ifdef HAVE_MATH_H
-#include <math.h>
-#endif
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#endif
-
-#endif
-
#ifdef HAVE_FFTW
#include <rfftw.h>
#include <fftw.h>
#ifdef HAVE_FFTW
#include <rfftw.h>
#include <fftw.h>
+#define HAVE_FFT 1
#endif
#endif
-using namespace std;
-
#ifdef HAVE_MPI
#include "mpi++.h"
#include "mpiworld.h"
#ifdef HAVE_MPI
#include "mpi++.h"
#include "mpiworld.h"
@@
-170,11
+179,14
@@
using namespace std;
#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