diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-04-15 14:27:52 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-04-15 14:27:52 +0200 |
| commit | 66968b3886b3800afcecf8f089962f87243cf4b1 (patch) | |
| tree | 7b162a87427c18eb37446d7f98a1e376ef5da73d /matlab/mex/mexCopyDataHelpFunctions.cpp | |
| parent | 9458268a8b9192af98fc1b88bf0a5fbbc7696a77 (diff) | |
| parent | 40475404d83d74d7b5db3f71ea1488a6de10ccc5 (diff) | |
| download | astra-66968b3886b3800afcecf8f089962f87243cf4b1.tar.gz astra-66968b3886b3800afcecf8f089962f87243cf4b1.tar.bz2 astra-66968b3886b3800afcecf8f089962f87243cf4b1.tar.xz astra-66968b3886b3800afcecf8f089962f87243cf4b1.zip | |
Merge branch 'master' into volgeom3d
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 80fb834..4db6abd 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 (mexIsScalar(in)) { + if (mexIsScalar(in) || mxIsEmpty(in)) { astra::float32 fValue = 0.f; if (!mxIsEmpty(in)) { fValue = (astra::float32)mxGetScalar(in); |