summaryrefslogtreecommitdiffstats
path: root/matlab/mex
diff options
context:
space:
mode:
authorDaniel M. Pelt <D.M.Pelt@cwi.nl>2015-07-17 16:22:05 +0200
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-07-23 11:57:17 +0200
commit3d136b7c819b0b142ad056bf01c8c1191eea9ba0 (patch)
treec94bdf6cb861c3e2570e7e2437a30c58513e3780 /matlab/mex
parent2f871bc7068d6c87a7d950ae044ba66b0b8dcd3f (diff)
downloadastra-3d136b7c819b0b142ad056bf01c8c1191eea9ba0.tar.gz
astra-3d136b7c819b0b142ad056bf01c8c1191eea9ba0.tar.bz2
astra-3d136b7c819b0b142ad056bf01c8c1191eea9ba0.tar.xz
astra-3d136b7c819b0b142ad056bf01c8c1191eea9ba0.zip
Fix numpy lapack loading when running in Matlab
Diffstat (limited to 'matlab/mex')
-rw-r--r--matlab/mex/mexInitFunctions.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/matlab/mex/mexInitFunctions.cpp b/matlab/mex/mexInitFunctions.cpp
index d8a50d7..c11c7d5 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.");
}