diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-06-26 12:20:44 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-06-26 12:20:44 +0200 |
| commit | 47b520d51fc4fc49db992b9117f6c0abfa8152b5 (patch) | |
| tree | 8f494a765a3607afd1c9bac9c592f30536b950a1 /matlab/mex/mexHelpFunctions.cpp | |
| parent | 9f86a4c3f20ac8785f80288ec4cdefe79ed67e68 (diff) | |
| parent | 62f3aa5792011792db866ce0841c8d164aa9a34d (diff) | |
| download | astra-47b520d51fc4fc49db992b9117f6c0abfa8152b5.tar.gz astra-47b520d51fc4fc49db992b9117f6c0abfa8152b5.tar.bz2 astra-47b520d51fc4fc49db992b9117f6c0abfa8152b5.tar.xz astra-47b520d51fc4fc49db992b9117f6c0abfa8152b5.zip | |
Merge branch 'master'
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 |