summaryrefslogtreecommitdiffstats
path: root/matlab/mex/mexHelpFunctions.cpp
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <wjp@usecode.org>2015-06-26 12:00:20 +0200
committerWillem Jan Palenstijn <wjp@usecode.org>2015-06-26 12:00:20 +0200
commit62f3aa5792011792db866ce0841c8d164aa9a34d (patch)
tree8f494a765a3607afd1c9bac9c592f30536b950a1 /matlab/mex/mexHelpFunctions.cpp
parent8ad46dc9cb28067047838e06770707cf86ef6e56 (diff)
parent9e3472ea9041b8755050427d8bdb8a4701019c55 (diff)
downloadastra-62f3aa5792011792db866ce0841c8d164aa9a34d.tar.gz
astra-62f3aa5792011792db866ce0841c8d164aa9a34d.tar.bz2
astra-62f3aa5792011792db866ce0841c8d164aa9a34d.tar.xz
astra-62f3aa5792011792db866ce0841c8d164aa9a34d.zip
Merge pull request #76 from dmpelt/projector-configuration-fix
Configuration fixes
Diffstat (limited to 'matlab/mex/mexHelpFunctions.cpp')
-rw-r--r--matlab/mex/mexHelpFunctions.cpp6
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