diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-10-07 16:36:28 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-10-07 16:36:28 +0200 |
| commit | f6aa2db83dfea89f9d2cfc6fcbd3da141ee77e02 (patch) | |
| tree | 6de18fc05a9ee0cf033675aadfd8514a97d9e7d1 /cuda/3d/cone_fp.h | |
| parent | 741675b458bf23cf437a6c56f95483c5c66af774 (diff) | |
| parent | 8f2b55a66db9747419e75dae5973281a7536b934 (diff) | |
| download | astra-f6aa2db83dfea89f9d2cfc6fcbd3da141ee77e02.tar.gz astra-f6aa2db83dfea89f9d2cfc6fcbd3da141ee77e02.tar.bz2 astra-f6aa2db83dfea89f9d2cfc6fcbd3da141ee77e02.tar.xz astra-f6aa2db83dfea89f9d2cfc6fcbd3da141ee77e02.zip | |
Merge branch 'master' into parallel_vec
Diffstat (limited to 'cuda/3d/cone_fp.h')
| -rw-r--r-- | cuda/3d/cone_fp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cuda/3d/cone_fp.h b/cuda/3d/cone_fp.h index 969a6d8..62c9caa 100644 --- a/cuda/3d/cone_fp.h +++ b/cuda/3d/cone_fp.h @@ -34,12 +34,12 @@ namespace astraCUDA3d { _AstraExport bool ConeFP_Array(cudaArray *D_volArray, cudaPitchedPtr D_projData, const SDimensions3D& dims, const SConeProjection* angles, - float fOutputScale); + const SProjectorParams3D& params); _AstraExport bool ConeFP(cudaPitchedPtr D_volumeData, cudaPitchedPtr D_projData, const SDimensions3D& dims, const SConeProjection* angles, - float fOutputScale); + const SProjectorParams3D& params); } |