From 63d78fbaafa7d247347f9052db86f575d89260b7 Mon Sep 17 00:00:00 2001
From: "Daniel M. Pelt" <D.M.Pelt@cwi.nl>
Date: Wed, 24 Jun 2015 20:28:46 +0200
Subject: Fix config to struct/dict translation for array options

---
 matlab/mex/mexHelpFunctions.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'matlab/mex/mexHelpFunctions.cpp')

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
-- 
cgit v1.2.3


From fc86917da1a175c04e9bd2e5f0bedb0a48a81c26 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Thu, 17 Dec 2015 14:37:41 +0100
Subject: Replace boost::lexical_cast by stringstreams

This is to avoid the dependence of lexical_cast on the current locale.
The stringstreams used for the new string parsing/output functions
are explicitly imbued with the C/classic locale.
---
 matlab/mex/mexHelpFunctions.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'matlab/mex/mexHelpFunctions.cpp')

diff --git a/matlab/mex/mexHelpFunctions.cpp b/matlab/mex/mexHelpFunctions.cpp
index 58e84d2..13c4ade 100644
--- a/matlab/mex/mexHelpFunctions.cpp
+++ b/matlab/mex/mexHelpFunctions.cpp
@@ -31,9 +31,9 @@ $Id$
  *  \brief Contains some functions for interfacing matlab with c data structures
  */
 #include "mexHelpFunctions.h"
+#include "astra/Utilities.h"
 
 #include <algorithm>
-#include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
@@ -58,7 +58,7 @@ string mexToString(const mxArray* pInput)
 
 	// is scalar?
 	if (mxIsNumeric(pInput) && mxGetM(pInput)*mxGetN(pInput) == 1) {
-		return boost::lexical_cast<string>(mxGetScalar(pInput));
+		return StringUtil::doubleToString(mxGetScalar(pInput));
 	}
 
 	return "";
@@ -378,7 +378,7 @@ mxArray* stringToMxArray(std::string input)
 			boost::split(col_strings, row_strings[row], boost::is_any_of(","));
 			// check size
 			for (unsigned int col = 0; col < col_strings.size(); col++) {
-				out[col*rows + row] = boost::lexical_cast<float32>(col_strings[col]);
+				out[col*rows + row] = StringUtil::stringToFloat(col_strings[col]);
 			}
 		}
 		return pMatrix;
@@ -397,7 +397,7 @@ mxArray* stringToMxArray(std::string input)
 
 		// loop elements
 		for (unsigned int i = 0; i < items.size(); i++) {
-			out[i] = boost::lexical_cast<float32>(items[i]);
+			out[i] = StringUtil::stringToFloat(items[i]);
 		}
 		return pVector;
 	}
-- 
cgit v1.2.3