summaryrefslogtreecommitdiffstats
path: root/matlab/mex/astra_mex.cpp
diff options
context:
space:
mode:
authorDaniel M. Pelt <D.M.Pelt@cwi.nl>2015-03-13 17:12:42 +0100
committerDaniel M. Pelt <D.M.Pelt@cwi.nl>2015-03-13 17:12:42 +0100
commitf21700e00e81538d5510973a51b8ae97fb4a24dd (patch)
treed1dcd07f2a29243e279fe2915c5db7814e99ea13 /matlab/mex/astra_mex.cpp
parente4614cf09b90cc9a0e38d370bb090a11f3877b33 (diff)
downloadastra-f21700e00e81538d5510973a51b8ae97fb4a24dd.tar.gz
astra-f21700e00e81538d5510973a51b8ae97fb4a24dd.tar.bz2
astra-f21700e00e81538d5510973a51b8ae97fb4a24dd.tar.xz
astra-f21700e00e81538d5510973a51b8ae97fb4a24dd.zip
Enable logging to Matlab window using callback function
Also introduces a mex initialize function that is called at the first invocation of any mex method.
Diffstat (limited to 'matlab/mex/astra_mex.cpp')
-rw-r--r--matlab/mex/astra_mex.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/matlab/mex/astra_mex.cpp b/matlab/mex/astra_mex.cpp
index 0eb5662..4bf42dd 100644
--- a/matlab/mex/astra_mex.cpp
+++ b/matlab/mex/astra_mex.cpp
@@ -28,6 +28,7 @@ $Id$
#include <mex.h>
#include "mexHelpFunctions.h"
+#include "mexInitFunctions.h"
#include "astra/Globals.h"
@@ -104,6 +105,8 @@ void mexFunction(int nlhs, mxArray* plhs[],
return;
}
+ initASTRAMex();
+
// SWITCH (MODE)
if (sMode == std::string("version")) {
astra_mex_version(nlhs, plhs, nrhs, prhs);