diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2018-09-25 18:19:09 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2018-09-25 18:34:41 +0200 |
| commit | bd5abc1dd5162ead6e0d19fb8f575bc61fcbc6c0 (patch) | |
| tree | b89fd0cb7804cdf4b9691a8cbe493819944aa56e | |
| parent | 6730face204f40c57c3e8fe58ea9749494d669a6 (diff) | |
| download | astra-bd5abc1dd5162ead6e0d19fb8f575bc61fcbc6c0.tar.gz astra-bd5abc1dd5162ead6e0d19fb8f575bc61fcbc6c0.tar.bz2 astra-bd5abc1dd5162ead6e0d19fb8f575bc61fcbc6c0.tar.xz astra-bd5abc1dd5162ead6e0d19fb8f575bc61fcbc6c0.zip | |
Unify USE_MATLAB_UNDOCUMENTED define
| -rw-r--r-- | matlab/mex/astra_mex_algorithm_c.cpp | 2 | ||||
| -rw-r--r-- | matlab/mex/astra_mex_data3d_c.cpp | 2 | ||||
| -rw-r--r-- | matlab/mex/astra_mex_direct_c.cpp | 2 | ||||
| -rw-r--r-- | matlab/mex/mexDataManagerHelpFunctions.cpp | 2 | ||||
| -rw-r--r-- | matlab/mex/mexHelpFunctions.h | 6 |
5 files changed, 4 insertions, 10 deletions
diff --git a/matlab/mex/astra_mex_algorithm_c.cpp b/matlab/mex/astra_mex_algorithm_c.cpp index 80c0424..7804eeb 100644 --- a/matlab/mex/astra_mex_algorithm_c.cpp +++ b/matlab/mex/astra_mex_algorithm_c.cpp @@ -34,8 +34,6 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "mexInitFunctions.h" #include "astra/Globals.h" -#define USE_MATLAB_UNDOCUMENTED - #ifdef USE_MATLAB_UNDOCUMENTED extern "C" { bool utIsInterruptPending(); } diff --git a/matlab/mex/astra_mex_data3d_c.cpp b/matlab/mex/astra_mex_data3d_c.cpp index 5504955..4642693 100644 --- a/matlab/mex/astra_mex_data3d_c.cpp +++ b/matlab/mex/astra_mex_data3d_c.cpp @@ -55,8 +55,6 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. using namespace std; using namespace astra; -#define USE_MATLAB_UNDOCUMENTED - //----------------------------------------------------------------------------------------- /** * id = astra_mex_io_data('create', datatype, geometry, data); diff --git a/matlab/mex/astra_mex_direct_c.cpp b/matlab/mex/astra_mex_direct_c.cpp index 1a129f4..0090d13 100644 --- a/matlab/mex/astra_mex_direct_c.cpp +++ b/matlab/mex/astra_mex_direct_c.cpp @@ -54,8 +54,6 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. using namespace std; using namespace astra; -#define USE_MATLAB_UNDOCUMENTED - class CFloat32CustomMemory_simple : public astra::CFloat32CustomMemory { public: diff --git a/matlab/mex/mexDataManagerHelpFunctions.cpp b/matlab/mex/mexDataManagerHelpFunctions.cpp index a71928b..dc225ac 100644 --- a/matlab/mex/mexDataManagerHelpFunctions.cpp +++ b/matlab/mex/mexDataManagerHelpFunctions.cpp @@ -36,8 +36,6 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/Float32VolumeData3DMemory.h" #include "astra/Float32ProjectionData3DMemory.h" -#define USE_MATLAB_UNDOCUMENTED - #ifdef USE_MATLAB_UNDOCUMENTED extern "C" { mxArray *mxCreateSharedDataCopy(const mxArray *pr); diff --git a/matlab/mex/mexHelpFunctions.h b/matlab/mex/mexHelpFunctions.h index bf22929..56994dc 100644 --- a/matlab/mex/mexHelpFunctions.h +++ b/matlab/mex/mexHelpFunctions.h @@ -28,6 +28,10 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #ifndef _INC_ASTRA_MEX_HELPFUNCTIONS #define _INC_ASTRA_MEX_HELPFUNCTIONS + +#define USE_MATLAB_UNDOCUMENTED + + #include <string> #include <list> #include <iostream> @@ -66,6 +70,4 @@ mxArray* XMLNodeToStruct(astra::XMLNode xml); mxArray* stringToMxArray(std::string input); mxArray* buildStruct(std::map<std::string, mxArray*> mInput); - - #endif |