summaryrefslogtreecommitdiffstats
path: root/include/astra
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-12-16 18:15:11 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-12-16 18:15:11 +0100
commit27bb093fb52ee768b00f52cf12075e8488e63452 (patch)
tree2424d84078e35e6232d732846ccf756280e9a431 /include/astra
parentf3ac1849f2b141ea1845752e1ca2317845e90e3a (diff)
parentf1c4c523db55ad31f3cfb8f51113099654c62c00 (diff)
downloadastra-27bb093fb52ee768b00f52cf12075e8488e63452.tar.gz
astra-27bb093fb52ee768b00f52cf12075e8488e63452.tar.bz2
astra-27bb093fb52ee768b00f52cf12075e8488e63452.tar.xz
astra-27bb093fb52ee768b00f52cf12075e8488e63452.zip
Merge branch 'master'
Diffstat (limited to 'include/astra')
-rw-r--r--include/astra/ParallelBeamLineKernelProjector2D.inl4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/astra/ParallelBeamLineKernelProjector2D.inl b/include/astra/ParallelBeamLineKernelProjector2D.inl
index 199d69e..c11f243 100644
--- a/include/astra/ParallelBeamLineKernelProjector2D.inl
+++ b/include/astra/ParallelBeamLineKernelProjector2D.inl
@@ -259,7 +259,7 @@ void CParallelBeamLineKernelProjector2D::projectBlock_internal(int _iProjFrom, i
else {
I = (1.5f - T - x2) / (1.0f - 2.0f*T) * lengthPerCol;
- if (x1 >= 0 && x1 < m_pVolumeGeometry->getGridColCount()) {
+ if (x1 >= 0 && x1 < m_pVolumeGeometry->getGridRowCount()) {
iVolumeIndex = m_pVolumeGeometry->pixelRowColToIndex(x1, col);
// POLICY: PIXEL PRIOR + ADD + POSTERIOR
if (p.pixelPrior(iVolumeIndex)) {
@@ -267,7 +267,7 @@ void CParallelBeamLineKernelProjector2D::projectBlock_internal(int _iProjFrom, i
p.pixelPosterior(iVolumeIndex);
}
}
- if (x1+1 >= 0 && x1+1 < m_pVolumeGeometry->getGridColCount()) {
+ if (x1+1 >= 0 && x1+1 < m_pVolumeGeometry->getGridRowCount()) {
iVolumeIndex = m_pVolumeGeometry->pixelRowColToIndex(x1+1, col);
// POLICY: PIXEL PRIOR + ADD + POSTERIOR
if (p.pixelPrior(iVolumeIndex)) {