Merge branch 'master'

3 files changed, 16 insertions, 14 deletions

diff --git a/matlab/mex/astra_mex_c.cpp b/matlab/mex/astra_mex_c.cpp
index a9b9654..d34334c 100644
--- a/matlab/mex/astra_mex_c.cpp
+++ b/matlab/mex/astra_mex_c.cpp
@@ -50,16 +50,19 @@ using namespace astra;
  */
 void astra_mex_credits(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[])
 { 
-	mexPrintf("All Scale Tomographic Reconstruction Antwerp Toolbox (ASTRA-Toolbox) was developed at the University of Antwerp by\n");
+	mexPrintf("The ASTRA Toolbox has been developed at the University of Antwerp and CWI, Amsterdam by\n");
 	mexPrintf(" * Prof. dr. Joost Batenburg\n");
-	mexPrintf(" * Andrei Dabravolski\n");
-	mexPrintf(" * Gert Merckx\n");
-	mexPrintf(" * Willem Jan Palenstijn\n");
-	mexPrintf(" * Tom Roelandts\n");
 	mexPrintf(" * Prof. dr. Jan Sijbers\n");
-	mexPrintf(" * dr. Wim van Aarle\n");
-	mexPrintf(" * Sander van der Maar\n");
-	mexPrintf(" * dr. Gert Van Gompel\n");
+	mexPrintf(" * Dr. Jeroen Bedorf\n");
+	mexPrintf(" * Dr. Folkert Bleichrodt\n");
+	mexPrintf(" * Dr. Andrei Dabravolski\n");
+	mexPrintf(" * Dr. Willem Jan Palenstijn\n");
+	mexPrintf(" * Dr. Tom Roelandts\n");
+	mexPrintf(" * Dr. Wim van Aarle\n");
+	mexPrintf(" * Dr. Gert Van Gompel\n");
+	mexPrintf(" * Sander van der Maar, MSc.\n");
+	mexPrintf(" * Gert Merckx, MSc.\n");
+	mexPrintf(" * Daan Pelt, MSc.\n");
 }
 
 //-----------------------------------------------------------------------------------------
@@ -100,7 +103,7 @@ void astra_mex_version(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[
 	if (1 <= nlhs) {
 		plhs[0] = mxCreateDoubleScalar(astra::getVersion());
 	} else {
-		mexPrintf("astra toolbox version %s\n", astra::getVersionString());
+		mexPrintf("ASTRA Toolbox version %s\n", astra::getVersionString());
 	}
 }
 
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;
 	}
diff --git a/matlab/mex/mexHelpFunctions.h b/matlab/mex/mexHelpFunctions.h
index 3ac5bd8..07edc64 100644
--- a/matlab/mex/mexHelpFunctions.h
+++ b/matlab/mex/mexHelpFunctions.h
@@ -37,7 +37,6 @@ $Id$
 #include <algorithm>
 #include <mex.h>
 
-#include <boost/lexical_cast.hpp>
 #include <boost/any.hpp>
 
 #include "astra/Globals.h"