diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2015-02-27 11:46:29 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2015-02-27 11:46:29 +0100 |
| commit | 03a9dd972ada50eedb83386910cecf02fe8d0e35 (patch) | |
| tree | f764bff6a8109d42445bdd1db622fd739baf5d4a /matlab/mex/mexCopyDataHelpFunctions.cpp | |
| parent | 9e2bb413a937aefe57f4fcf343413543ae57258a (diff) | |
| parent | 169e912d2633cda7ffc234e78afba1b096e122ea (diff) | |
| download | astra-03a9dd972ada50eedb83386910cecf02fe8d0e35.tar.gz astra-03a9dd972ada50eedb83386910cecf02fe8d0e35.tar.bz2 astra-03a9dd972ada50eedb83386910cecf02fe8d0e35.tar.xz astra-03a9dd972ada50eedb83386910cecf02fe8d0e35.zip | |
Merge pull request #20 from wvaarle/matlab-get-geometry
'get_geometry' functions in the matlab layer
Diffstat (limited to 'matlab/mex/mexCopyDataHelpFunctions.cpp')
| -rw-r--r-- | matlab/mex/mexCopyDataHelpFunctions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/matlab/mex/mexCopyDataHelpFunctions.cpp b/matlab/mex/mexCopyDataHelpFunctions.cpp index 6dfd4a6..80fb834 100644 --- a/matlab/mex/mexCopyDataHelpFunctions.cpp +++ b/matlab/mex/mexCopyDataHelpFunctions.cpp @@ -263,7 +263,7 @@ copyMexToCFloat32Array(const mxArray * const in, #pragma omp parallel { // fill with scalar value - if (mex_is_scalar(in)) { + if (mexIsScalar(in)) { astra::float32 fValue = 0.f; if (!mxIsEmpty(in)) { fValue = (astra::float32)mxGetScalar(in); |