diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2015-06-23 11:01:36 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2015-06-23 11:01:36 +0200 |
| commit | 0f4a28769bd577d18ff0c54e550d03a4f256939f (patch) | |
| tree | bbf4e9e71e55bd38ba69b9e7f57b4b92788bed78 /matlab | |
| parent | 26198f7e1fbed9d294fc2856f796f408c85b66f3 (diff) | |
| parent | a9ea08c4a11592378b320cac45be8eede8addd6f (diff) | |
| download | astra-0f4a28769bd577d18ff0c54e550d03a4f256939f.tar.gz astra-0f4a28769bd577d18ff0c54e550d03a4f256939f.tar.bz2 astra-0f4a28769bd577d18ff0c54e550d03a4f256939f.tar.xz astra-0f4a28769bd577d18ff0c54e550d03a4f256939f.zip | |
Merge pull request #74 from dmpelt/small-fixes
Small fixes
Diffstat (limited to 'matlab')
| -rw-r--r-- | matlab/mex/astra_mex_c.cpp | 4 | ||||
| -rw-r--r-- | matlab/tools/astra_create_reconstruction_cuda.m | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/matlab/mex/astra_mex_c.cpp b/matlab/mex/astra_mex_c.cpp index 4a331f5..a9b9654 100644 --- a/matlab/mex/astra_mex_c.cpp +++ b/matlab/mex/astra_mex_c.cpp @@ -36,9 +36,9 @@ $Id$ #include "mexInitFunctions.h" #include "astra/Globals.h" - +#ifdef ASTRA_CUDA #include "../cuda/2d/darthelper.h" - +#endif using namespace std; using namespace astra; diff --git a/matlab/tools/astra_create_reconstruction_cuda.m b/matlab/tools/astra_create_reconstruction_cuda.m index 7d9e1dd..7d0421c 100644 --- a/matlab/tools/astra_create_reconstruction_cuda.m +++ b/matlab/tools/astra_create_reconstruction_cuda.m @@ -45,7 +45,7 @@ if strcmp(rec_type,'') end % configure -cfg = astra_struct('SIRT_CUDA'); +cfg = astra_struct(rec_type); cfg.ProjectionGeometry = proj_geom; cfg.ReconstructionGeometry = vol_geom; cfg.ProjectionDataId = sinogram_id; |