diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-12-01 12:27:44 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-12-01 12:27:44 +0100 |
| commit | fff0e6dba508744f540bcf5efff76f676fe7af48 (patch) | |
| tree | 5f33544e7d79b59501a5dd63a4922722eed8a98b /matlab/mex/mexHelpFunctions.cpp | |
| parent | 0d5947a0e8e7d6f86c7591a96d877dfe14b187e4 (diff) | |
| parent | dcfd15335549fa8e3e56260791cc4510331f7be6 (diff) | |
| download | astra-fff0e6dba508744f540bcf5efff76f676fe7af48.tar.gz astra-fff0e6dba508744f540bcf5efff76f676fe7af48.tar.bz2 astra-fff0e6dba508744f540bcf5efff76f676fe7af48.tar.xz astra-fff0e6dba508744f540bcf5efff76f676fe7af48.zip | |
Merge branch 'master' into python-plugins
Conflicts:
python/astra/utils.pyx
Diffstat (limited to 'matlab/mex/mexHelpFunctions.cpp')
| -rw-r--r-- | matlab/mex/mexHelpFunctions.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/matlab/mex/mexHelpFunctions.cpp b/matlab/mex/mexHelpFunctions.cpp index 87a9672..58e84d2 100644 --- a/matlab/mex/mexHelpFunctions.cpp +++ b/matlab/mex/mexHelpFunctions.cpp @@ -336,7 +336,11 @@ mxArray* XMLNodeToStruct(astra::XMLNode node) // option if (subnode.getName() == "Option") { - mOptions[subnode.getAttribute("key")] = stringToMxArray(subnode.getAttribute("value")); + if(subnode.hasAttribute("value")){ + mOptions[subnode.getAttribute("key")] = stringToMxArray(subnode.getAttribute("value")); + }else{ + mOptions[subnode.getAttribute("key")] = stringToMxArray(subnode.getContent()); + } } // regular content |