diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2014-11-24 15:18:48 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2014-12-12 12:10:31 +0100 |
| commit | be0ba0549d417c8e5821a3d08faa149ddbabf446 (patch) | |
| tree | 830f585d1a3552b70bfd361e6d51f05f5b992004 /matlab/mex | |
| parent | f8c6579b910d2752f40850fbf17f045fa5de0366 (diff) | |
| download | astra-be0ba0549d417c8e5821a3d08faa149ddbabf446.tar.gz astra-be0ba0549d417c8e5821a3d08faa149ddbabf446.tar.bz2 astra-be0ba0549d417c8e5821a3d08faa149ddbabf446.tar.xz astra-be0ba0549d417c8e5821a3d08faa149ddbabf446.zip | |
Avoid mxIsSharedArray
Matlab R2014b no longer seems to support it.
Diffstat (limited to 'matlab/mex')
| -rw-r--r-- | matlab/mex/astra_mex_data3d_c.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/matlab/mex/astra_mex_data3d_c.cpp b/matlab/mex/astra_mex_data3d_c.cpp index fdd801e..35f3480 100644 --- a/matlab/mex/astra_mex_data3d_c.cpp +++ b/matlab/mex/astra_mex_data3d_c.cpp @@ -278,7 +278,10 @@ extern "C" { mxArray *mxCreateSharedDataCopy(const mxArray *pr); bool mxUnshareArray(const mxArray *pr, const bool noDeepCopy); mxArray *mxUnreference(const mxArray *pr); +#if 0 +// Unsupported in Matlab R2014b bool mxIsSharedArray(const mxArray *pr); +#endif } class CFloat32CustomMemoryMatlab3D : public CFloat32CustomMemory { @@ -289,9 +292,12 @@ public: //fprintf(stderr, "Passed:\narray: %p\tdata: %p\n", (void*)_pArray, (void*)mxGetData(_pArray)); // First unshare the input array, so that we may modify it. if (bUnshare) { +#if 0 + // Unsupported in Matlab R2014b if (mxIsSharedArray(_pArray)) { fprintf(stderr, "Performance note: unsharing shared array in link\n"); } +#endif mxUnshareArray(_pArray, false); //fprintf(stderr, "Unshared:\narray: %p\tdata: %p\n", (void*)_pArray, (void*)mxGetData(_pArray)); } |