projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r438: no message
[ctsim.git]
/
include
/
ct.h
diff --git
a/include/ct.h
b/include/ct.h
index 4817fb35424e7a736f680f7eabe2daee21b949b3..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.
15 2000/06/17 20:12:14
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,31
+28,49
@@
#ifndef CT_H
#define CT_H
#ifndef CT_H
#define CT_H
-#ifdef _WIN32
- typedef long off_t;
- #define HAVE_STRING_H 1
- #include <fcntl.h>
- #define snprintf _snprintf
- #define vsnprintf _vsnprintf
- #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 HAVE_PNG
- #include "png.h"
+
+#define HAVE_ANSI_CPP 1
+#ifdef HAVE_ANSI_CPP
+#include <complex>
+#include <cmath>
+#include <cstdio>
+#include <cctype>
+#include <cstring>
+#include <cstddef>
+#include <cstdarg>
+#include <cstdlib>
+
+#if defined(MSVC) || HAVE_SSTREAM
+#include <sstream>
+#else
+#include <sstream_subst>
#endif
#endif
-#ifdef HAVE_G2_H
-extern "C" {
-#include "g2.h"
-}
-#ifdef HAVE_X11
-extern "C" {
-#include "g2_X11.h"
-}
+
+#include <fstream>
+#include <iostream>
+#include <string>
+#include <iterator>
+#include <algorithm>
+#include <exception>
+#include <stdexcept>
+#include <memory>
+
+#else
+
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
#endif
#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
#endif
#ifdef HAVE_STDIO_H
#include <stdio.h>
#endif
#ifdef HAVE_STDIO_H
#include <stdio.h>
@@
-69,18
+87,37
@@
extern "C" {
#ifdef HAVE_STDARG_H
#include <stdarg.h>
#endif
#ifdef HAVE_STDARG_H
#include <stdarg.h>
#endif
+
+#endif
+
+
+#ifdef HAVE_DMALLOC
+#include <dmalloc.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_PNG
+ #include "png.h"
+#endif
+#ifdef HAVE_G2_H
+extern "C" {
+#include "g2.h"
+}
+#ifdef HAVE_X11
+extern "C" {
+#include "g2_X11.h"
+}
+#endif
+#endif
+
+
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-#ifdef HAVE_MATH_H
-#include <math.h>
-#endif
#ifdef HAVE_SYS_FCNTL_H
#include <sys/fcntl.h>
#endif
#ifdef HAVE_SYS_FCNTL_H
#include <sys/fcntl.h>
#endif
@@
-90,9
+127,6
@@
extern "C" {
#if defined(HAVE_GETOPT_H) || defined(HAVE_GETOPT_LONG)
#include <getopt.h>
#endif
#if defined(HAVE_GETOPT_H) || defined(HAVE_GETOPT_LONG)
#include <getopt.h>
#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
#ifdef HAVE_SETJMP_H
#include <setjmp.h>
#endif
#ifdef HAVE_SETJMP_H
#include <setjmp.h>
#endif
@@
-108,39
+142,46
@@
extern "C" {
#ifdef HAVE_STDINT_H
#include <stdint.h> /* Standard ints on Linux */
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h> /* Standard ints on Linux */
#endif
+#ifdef HAVE_ASSERT_H
+#include <assert.h>
+#endif
+
+
+#ifdef HAVE_FFTW
+#include <rfftw.h>
+#include <fftw.h>
+#define HAVE_FFT 1
+#endif
#ifdef HAVE_MPI
#include "mpi++.h"
#include "mpiworld.h"
#endif
#ifdef HAVE_MPI
#include "mpi++.h"
#include "mpiworld.h"
#endif
-#include "kstddef.h"
-#include "kmath.h"
-#include "keyboard.h"
-#include "cio.h"
-#include "byteorder.h"
+#include "ctsupport.h"
+#include "fnetorderstream.h"
#ifdef HAVE_SGP
#include "ezplot.h"
#include "sgp.h"
#endif
#ifdef HAVE_SGP
#include "ezplot.h"
#include "sgp.h"
#endif
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <iterator>
-#include <algorithm>
-
-using namespace std;
-
#include "array2d.h"
#include "array2d.h"
+#include "array2dfile.h"
+#include "fnetorderstream.h"
#include "imagefile.h"
#include "phantom.h"
#include "imagefile.h"
#include "phantom.h"
-#include "projections.h"
#include "scanner.h"
#include "scanner.h"
-#include "ir.h"
#include "backprojectors.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"
+#include "ctglobals.h"
#endif
#endif