diff options
author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-11-28 13:41:08 +0100 |
---|---|---|
committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-11-28 13:41:08 +0100 |
commit | 9101748879d81e8aafe7c77ecc4c8b2175390335 (patch) | |
tree | e5c05f226b45d4fb910dda5fab74ff760d9e27a0 /cuda/3d/mem3d.cu | |
parent | eeffd2d9748b8912b384a5764b808f5bfc850ade (diff) | |
parent | 4a12901ad7b08021b2adad1241bf750aec4a3d2d (diff) | |
download | astra-9101748879d81e8aafe7c77ecc4c8b2175390335.tar.gz astra-9101748879d81e8aafe7c77ecc4c8b2175390335.tar.bz2 astra-9101748879d81e8aafe7c77ecc4c8b2175390335.tar.xz astra-9101748879d81e8aafe7c77ecc4c8b2175390335.zip |
Merge branch 'fdk_custom_filter'
Diffstat (limited to 'cuda/3d/mem3d.cu')
-rw-r--r-- | cuda/3d/mem3d.cu | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cuda/3d/mem3d.cu b/cuda/3d/mem3d.cu index 4fb30a2..cb15ab9 100644 --- a/cuda/3d/mem3d.cu +++ b/cuda/3d/mem3d.cu @@ -279,7 +279,7 @@ bool BP(const astra::CProjectionGeometry3D* pProjGeom, MemHandle3D projData, con } -bool FDK(const astra::CProjectionGeometry3D* pProjGeom, MemHandle3D projData, const astra::CVolumeGeometry3D* pVolGeom, MemHandle3D volData, bool bShortScan) +bool FDK(const astra::CProjectionGeometry3D* pProjGeom, MemHandle3D projData, const astra::CVolumeGeometry3D* pVolGeom, MemHandle3D volData, bool bShortScan, const float *pfFilter) { SDimensions3D dims; SProjectorParams3D params; @@ -298,7 +298,7 @@ bool FDK(const astra::CProjectionGeometry3D* pProjGeom, MemHandle3D projData, co if (!ok || !pConeProjs) return false; - ok &= FDK(volData.d->ptr, projData.d->ptr, pConeProjs, dims, params, bShortScan); + ok &= FDK(volData.d->ptr, projData.d->ptr, pConeProjs, dims, params, bShortScan, pfFilter); return ok; |