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-11-24 15:18:48 +0100 |
| commit | 360f8a9039a03160dd3909d86b46b5387cfa3e76 (patch) | |
| tree | fd74e17295ae330f12064b903007658696872a13 /matlab | |
| parent | 68a1cca52aa6754ec338ffa7ba3bf0c583a11f59 (diff) | |
| download | astra-360f8a9039a03160dd3909d86b46b5387cfa3e76.tar.gz astra-360f8a9039a03160dd3909d86b46b5387cfa3e76.tar.bz2 astra-360f8a9039a03160dd3909d86b46b5387cfa3e76.tar.xz astra-360f8a9039a03160dd3909d86b46b5387cfa3e76.zip | |
Avoid mxIsSharedArray
Matlab R2014b no longer seems to support it.
Diffstat (limited to 'matlab')
| -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 8b6fb95..a40e814 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)); } |