diff options
| author | Wim van Aarle <wimvanaarle@gmail.com> | 2015-02-24 11:43:01 +0100 |
|---|---|---|
| committer | Wim van Aarle <wimvanaarle@gmail.com> | 2015-02-24 11:43:01 +0100 |
| commit | fbb746d3f32105f7fc57d5b34203d291461d9b43 (patch) | |
| tree | 1229bc07f27ef593a07fd56aebed177380e68cb9 /matlab/mex/mexDataManagerHelpFunctions.cpp | |
| parent | b16c26d1fd7a50fda648dd63076e011d122543b8 (diff) | |
| download | astra-fbb746d3f32105f7fc57d5b34203d291461d9b43.tar.gz astra-fbb746d3f32105f7fc57d5b34203d291461d9b43.tar.bz2 astra-fbb746d3f32105f7fc57d5b34203d291461d9b43.tar.xz astra-fbb746d3f32105f7fc57d5b34203d291461d9b43.zip | |
Added support for logical matrices in mex_data3d
Did not accelerate using sse2, as no intrinsics exist to convert 8-bit
to 32-bit.
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)); } //----------------------------------------------------------------------------------------- |