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/2d/algo.cu | |
| 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/2d/algo.cu')
| -rw-r--r-- | cuda/2d/algo.cu | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cuda/2d/algo.cu b/cuda/2d/algo.cu index f04607f..71cbfb3 100644 --- a/cuda/2d/algo.cu +++ b/cuda/2d/algo.cu @@ -214,11 +214,11 @@ bool ReconAlgo::setMaxConstraint(float fMax) bool ReconAlgo::allocateBuffers() { bool ok; - ok = allocateVolume(D_volumeData, dims.iVolWidth+2, dims.iVolHeight+2, volumePitch); + ok = allocateVolume(D_volumeData, dims.iVolWidth, dims.iVolHeight, volumePitch); if (!ok) return false; - ok = allocateVolume(D_sinoData, dims.iProjDets+2, dims.iProjAngles, sinoPitch); + ok = allocateVolume(D_sinoData, dims.iProjDets, dims.iProjAngles, sinoPitch); if (!ok) { cudaFree(D_volumeData); D_volumeData = 0; @@ -226,7 +226,7 @@ bool ReconAlgo::allocateBuffers() } if (useVolumeMask) { - ok = allocateVolume(D_maskData, dims.iVolWidth+2, dims.iVolHeight+2, maskPitch); + ok = allocateVolume(D_maskData, dims.iVolWidth, dims.iVolHeight, maskPitch); if (!ok) { cudaFree(D_volumeData); cudaFree(D_sinoData); @@ -237,7 +237,7 @@ bool ReconAlgo::allocateBuffers() } if (useSinogramMask) { - ok = allocateVolume(D_smaskData, dims.iProjDets+2, dims.iProjAngles, smaskPitch); + ok = allocateVolume(D_smaskData, dims.iProjDets, dims.iProjAngles, smaskPitch); if (!ok) { cudaFree(D_volumeData); cudaFree(D_sinoData); @@ -271,7 +271,7 @@ bool ReconAlgo::copyDataToGPU(const float* pfSinogram, unsigned int iSinogramPit return false; // rescale sinogram to adjust for pixel size - processVol<opMul,SINO>(D_sinoData, fSinogramScale, + processVol<opMul>(D_sinoData, fSinogramScale, //1.0f/(fPixelSize*fPixelSize), sinoPitch, dims.iProjDets, dims.iProjAngles); |