diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-02-26 11:51:50 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-02-26 11:51:50 +0100 |
| commit | d2407fea1ed7c3c718a4c115d8c632664c2378dd (patch) | |
| tree | 9f0d21c77d64da4e9be1f4b0ba99f54edc691ad5 /matlab/mex/mexDataManagerHelpFunctions.cpp | |
| parent | 3cae1d138c53a3fd042de3d2c9d9a07cf0650e0f (diff) | |
| parent | 0ca00f4c671d6d583ae77838d3e0d4fcd411f077 (diff) | |
| download | astra-d2407fea1ed7c3c718a4c115d8c632664c2378dd.tar.gz astra-d2407fea1ed7c3c718a4c115d8c632664c2378dd.tar.bz2 astra-d2407fea1ed7c3c718a4c115d8c632664c2378dd.tar.xz astra-d2407fea1ed7c3c718a4c115d8c632664c2378dd.zip | |
Merge branch 'master' into python-interface
Diffstat (limited to 'matlab/mex/mexDataManagerHelpFunctions.cpp')
| -rw-r--r-- | matlab/mex/mexDataManagerHelpFunctions.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/matlab/mex/mexDataManagerHelpFunctions.cpp b/matlab/mex/mexDataManagerHelpFunctions.cpp index 5e6020b..f9d971c 100644 --- a/matlab/mex/mexDataManagerHelpFunctions.cpp +++ b/matlab/mex/mexDataManagerHelpFunctions.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2013 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). The ASTRA Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -105,7 +105,7 @@ checkID(const astra::int32 & id, astra::CFloat32Data3DMemory *& pDataObj) bool checkDataType(const mxArray * const in) { - return (mex_is_scalar(in) || mxIsDouble(in) || mxIsSingle(in)); + return (mex_is_scalar(in) || mxIsDouble(in) || mxIsSingle(in) || mxIsLogical(in)); } //----------------------------------------------------------------------------------------- |