projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r360: no message
[ctsim.git]
/
libctsim
/
projections.cpp
diff --git
a/libctsim/projections.cpp
b/libctsim/projections.cpp
index 3c4f956e891c6f0ab2a644703df81a84e3f74a8d..846daf3f03ea8f9ef45f67acbe8bd2954f7376d0 100644
(file)
--- a/
libctsim/projections.cpp
+++ b/
libctsim/projections.cpp
@@
-8,7
+8,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: projections.cpp,v 1.
39 2001/01/07 22:53:36
kevin Exp $
+** $Id: projections.cpp,v 1.
41 2001/01/07 23:18:13
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
@@
-710,6
+710,9
@@
Projections::convertFFTPolar (ImageFile& rIF, int iInterpolationID, int iZeropad
if (! v || nx == 0 || ny == 0)
return false;
if (! v || nx == 0 || ny == 0)
return false;
+#ifndef HAVE_FFT
+ return false;
+#else
Array2d<double> adView (nx, ny);
Array2d<double> adDet (nx, ny);
double** ppdView = adView.getArray();
Array2d<double> adView (nx, ny);
Array2d<double> adDet (nx, ny);
double** ppdView = adView.getArray();
@@
-746,6
+749,7
@@
Projections::convertFFTPolar (ImageFile& rIF, int iInterpolationID, int iZeropad
delete [] ppcDetValue;
return true;
delete [] ppcDetValue;
return true;
+#endif
}
}
@@
-812,9
+816,9
@@
Projections::interpolatePolar (ImageFileArray& v, ImageFileArray& vImag,
v[ix][iy] = 0;
}
} else if (iInterpolationID == POLAR_INTERP_BILINEAR) {
v[ix][iy] = 0;
}
} else if (iInterpolationID == POLAR_INTERP_BILINEAR) {
- int iFloorView =
ppdView[ix][iy]
;
+ int iFloorView =
static_cast<int>(ppdView[ix][iy])
;
double dFracView = ppdView[ix][iy] - iFloorView;
double dFracView = ppdView[ix][iy] - iFloorView;
- int iFloorDet =
ppdDet[ix][iy]
;
+ int iFloorDet =
static_cast<int>(ppdDet[ix][iy])
;
double dFracDet = ppdDet[ix][iy] - iFloorDet;
if (iFloorDet >= 0 && iFloorView >= 0) {
double dFracDet = ppdDet[ix][iy] - iFloorDet;
if (iFloorDet >= 0 && iFloorView >= 0) {