diff options
author | Willem Jan Palenstijn <WillemJan.Palenstijn@uantwerpen.be> | 2014-04-16 11:12:55 +0000 |
---|---|---|
committer | wpalenst <WillemJan.Palenstijn@uantwerpen.be> | 2014-04-16 11:12:55 +0000 |
commit | 3a6769465bee7d56d0ddff36613b886446421e07 (patch) | |
tree | 624e85c5d6a4ab19c958a388e3436219693a6296 /cuda/3d | |
parent | 4dfb881ceb82b07630437e952dec62323977ab56 (diff) | |
download | astra-3a6769465bee7d56d0ddff36613b886446421e07.tar.gz astra-3a6769465bee7d56d0ddff36613b886446421e07.tar.bz2 astra-3a6769465bee7d56d0ddff36613b886446421e07.tar.xz astra-3a6769465bee7d56d0ddff36613b886446421e07.zip |
Remove padding in 2D cuda in favour of Border mode
Diffstat (limited to 'cuda/3d')
-rw-r--r-- | cuda/3d/fdk.cu | 4 | ||||
-rw-r--r-- | cuda/3d/util3d.cu | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cuda/3d/fdk.cu b/cuda/3d/fdk.cu index ad0604c..d439d9b 100644 --- a/cuda/3d/fdk.cu +++ b/cuda/3d/fdk.cu @@ -354,7 +354,7 @@ bool FDK_Filter(cudaPitchedPtr D_projData, for (int v = 0; v < dims.iProjV; ++v) { - ok = runCudaFFT(dims.iProjAngles, D_sinoData, projPitch, 0, + ok = runCudaFFT(dims.iProjAngles, D_sinoData, projPitch, dims.iProjU, iPaddedDetCount, iHalfFFTSize, D_sinoFFT); @@ -364,7 +364,7 @@ bool FDK_Filter(cudaPitchedPtr D_projData, ok = runCudaIFFT(dims.iProjAngles, D_sinoFFT, D_sinoData, projPitch, - 0, dims.iProjU, iPaddedDetCount, iHalfFFTSize); + dims.iProjU, iPaddedDetCount, iHalfFFTSize); if (!ok) break; diff --git a/cuda/3d/util3d.cu b/cuda/3d/util3d.cu index 81ea823..6dc79c7 100644 --- a/cuda/3d/util3d.cu +++ b/cuda/3d/util3d.cu @@ -487,7 +487,7 @@ bool transferProjectionsToArray(cudaPitchedPtr D_projData, cudaArray* array, con float dotProduct3D(cudaPitchedPtr data, unsigned int x, unsigned int y, unsigned int z) { - return astraCUDA::dotProduct2D((float*)data.ptr, data.pitch/sizeof(float), x, y*z, 0, 0); + return astraCUDA::dotProduct2D((float*)data.ptr, data.pitch/sizeof(float), x, y*z); } |