diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-12-04 16:35:00 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-12-04 16:35:00 +0100 |
| commit | f3ac1849f2b141ea1845752e1ca2317845e90e3a (patch) | |
| tree | adcdc9013af5cca4165857408ed7181ffdf0de64 /matlab/mex/mexInitFunctions.cpp | |
| parent | 8144bf0397ee1913b830d82058ccd40df741f1b3 (diff) | |
| parent | 0d015b1c91581ee5ef3e936f03e4c62fbc7ea362 (diff) | |
| download | astra-f3ac1849f2b141ea1845752e1ca2317845e90e3a.tar.gz astra-f3ac1849f2b141ea1845752e1ca2317845e90e3a.tar.bz2 astra-f3ac1849f2b141ea1845752e1ca2317845e90e3a.tar.xz astra-f3ac1849f2b141ea1845752e1ca2317845e90e3a.zip | |
Merge branch 'master'
Diffstat (limited to 'matlab/mex/mexInitFunctions.cpp')
| -rw-r--r-- | matlab/mex/mexInitFunctions.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/matlab/mex/mexInitFunctions.cpp b/matlab/mex/mexInitFunctions.cpp index 89a31a1..bd3df2c 100644 --- a/matlab/mex/mexInitFunctions.cpp +++ b/matlab/mex/mexInitFunctions.cpp @@ -17,6 +17,9 @@ void logCallBack(const char *msg, size_t len){ */ void initASTRAMex(){ if(mexIsInitialized) return; + + astra::running_in_matlab=true; + if(!astra::CLogger::setCallbackScreen(&logCallBack)){ mexErrMsgTxt("Error initializing mex functions."); } |