diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-04-15 11:03:12 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-04-15 11:04:07 +0200 |
| commit | 40475404d83d74d7b5db3f71ea1488a6de10ccc5 (patch) | |
| tree | 0654165ff569ef2b92fc7dd32f66e5002956c299 /matlab/mex/mexCopyDataHelpFunctions.cpp | |
| parent | 0242b4c361a61f601e6d87ce5a2459c69f913c72 (diff) | |
| download | astra-40475404d83d74d7b5db3f71ea1488a6de10ccc5.tar.gz astra-40475404d83d74d7b5db3f71ea1488a6de10ccc5.tar.bz2 astra-40475404d83d74d7b5db3f71ea1488a6de10ccc5.tar.xz astra-40475404d83d74d7b5db3f71ea1488a6de10ccc5.zip | |
Fix bug in astra_mex_data3d('create') zero-initialization
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); |