From 51b2e49e08901fd649f8cc13b8ba1d33166e413f Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Fri, 18 Nov 2016 17:49:45 +0100
Subject: Improve consts in matlab undocumented function declarations
---
matlab/mex/mexDataManagerHelpFunctions.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'matlab/mex/mexDataManagerHelpFunctions.cpp')
diff --git a/matlab/mex/mexDataManagerHelpFunctions.cpp b/matlab/mex/mexDataManagerHelpFunctions.cpp
index 1794abb..95d4640 100644
--- a/matlab/mex/mexDataManagerHelpFunctions.cpp
+++ b/matlab/mex/mexDataManagerHelpFunctions.cpp
@@ -42,10 +42,10 @@ $Id$
#ifdef USE_MATLAB_UNDOCUMENTED
extern "C" {
mxArray *mxCreateSharedDataCopy(const mxArray *pr);
-bool mxUnshareArray(const mxArray *pr, const bool noDeepCopy);
-mxArray *mxUnreference(const mxArray *pr);
+bool mxUnshareArray(mxArray *pr, bool noDeepCopy);
+mxArray *mxUnreference(mxArray *pr);
#if 0
-// Unsupported in Matlab R2014b
+// Unsupported in Matlab R2014b and later
bool mxIsSharedArray(const mxArray *pr);
#endif
}
@@ -66,12 +66,12 @@ public:
// First unshare the input array, so that we may modify it.
if (bUnshare) {
#if 0
- // Unsupported in Matlab R2014b
+ // Unsupported in Matlab R2014b and later
if (mxIsSharedArray(_pArray)) {
fprintf(stderr, "Performance note: unsharing shared array in link\n");
}
#endif
- mxUnshareArray(_pArray, false);
+ mxUnshareArray(const_cast<mxArray*>(_pArray), false);
//fprintf(stderr, "Unshared:\narray: %p\tdata: %p\n", (void*)_pArray, (void*)mxGetData(_pArray));
}
// Then create a (persistent) copy so the data won't be deleted
--
cgit v1.2.3
From 64a48bea80b909311351dc3b1345a17c693ddb69 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Wed, 28 Sep 2016 14:58:41 +0200
Subject: Add experimental support for Octave
Based on initial patch by @kalvdans.
---
matlab/mex/mexDataManagerHelpFunctions.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'matlab/mex/mexDataManagerHelpFunctions.cpp')
diff --git a/matlab/mex/mexDataManagerHelpFunctions.cpp b/matlab/mex/mexDataManagerHelpFunctions.cpp
index 95d4640..a514565 100644
--- a/matlab/mex/mexDataManagerHelpFunctions.cpp
+++ b/matlab/mex/mexDataManagerHelpFunctions.cpp
@@ -79,7 +79,7 @@ public:
m_pLink = mxCreateSharedDataCopy(_pArray);
//fprintf(stderr, "SharedDataCopy:\narray: %p\tdata: %p\n", (void*)m_pLink, (void*)mxGetData(m_pLink));
mexMakeArrayPersistent(m_pLink);
- m_fPtr = (float *)mxGetData(m_pLink);
+ m_fPtr = (float *)mxGetData(_pArray);
m_fPtr += iOffset;
}
virtual ~CFloat32CustomMemoryMatlab3D() {
--
cgit v1.2.3