projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update debian package, start of test scripts
[ctsim.git]
/
include
/
ct.h
diff --git
a/include/ct.h
b/include/ct.h
index b618130ec6d152772bd23b2baece82a430727e8c..4a4734b68fdd0a0119e59b80d374278f3102b046 100644
(file)
--- a/
include/ct.h
+++ b/
include/ct.h
@@
-7,9
+7,7
@@
** 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
-**
-** $Id: ct.h,v 1.48 2001/01/02 05:34:57 kevin Exp $
+** Copyright (c) 1983-2009 Kevin Rosenberg
**
** 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,6
+26,8
@@
#ifndef CT_H
#define CT_H
#ifndef CT_H
#define CT_H
+#define NO_MAIN 1 // filter out all old main blocks
+
#ifdef MSVC
#include "msvc_compat.h"
#endif
#ifdef MSVC
#include "msvc_compat.h"
#endif
@@
-35,7
+35,12
@@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-
\r
+
+#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>
@@
-46,16
+51,16
@@
#include <cstddef>
#include <cstdarg>
#include <cstdlib>
#include <cstddef>
#include <cstdarg>
#include <cstdlib>
-
\r
-#if defined(MSVC) || HAVE_SSTREAM
\r
+
+#if defined(MSVC) || HAVE_SSTREAM
#include <sstream>
#include <sstream>
-#else
\r
+#else
#include <sstream_subst>
#include <sstream_subst>
-#endif
\r
-
\r
+#endif
+
#include <fstream>
#include <iostream>
#include <fstream>
#include <iostream>
-#include <string>
\r
+#include <string>
#include <iterator>
#include <algorithm>
#include <exception>
#include <iterator>
#include <algorithm>
#include <exception>
@@
-99,8
+104,8
@@
#include "png.h"
#endif
#ifdef HAVE_G2_H
#include "png.h"
#endif
#ifdef HAVE_G2_H
-extern "C" {
-#include "g2.h"
+extern "C" {
+#include "g2.h"
}
#ifdef HAVE_X11
extern "C" {
}
#ifdef HAVE_X11
extern "C" {
@@
-146,8
+151,8
@@
extern "C" {
#ifdef HAVE_FFTW
#ifdef HAVE_FFTW
-#include <
rfftw
.h>
-#
include <fftw.h>
+#include <
fftw3
.h>
+#
define HAVE_FFT 1
#endif
#ifdef HAVE_MPI
#endif
#ifdef HAVE_MPI
@@
-170,14
+175,17
@@
extern "C" {
#include "phantom.h"
#include "scanner.h"
#include "backprojectors.h"
#include "phantom.h"
#include "scanner.h"
#include "backprojectors.h"
-#include "filter.h"
\r
+#include "filter.h"
#include "fourier.h"
#include "procsignal.h"
#include "projections.h"
#include "reconstruct.h"
#include "fourier.h"
#include "procsignal.h"
#include "projections.h"
#include "reconstruct.h"
-#include "plotfile.h"
\r
+#include "plotfile.h"
#include "trace.h"
#include "trace.h"
+#include "ctglobals.h"
-#endif
+// Macro to remove compiler warnings about unused variables
+#define UNUSED(expr) do { (void)(expr); } while (0)
+#endif