Commit 61fd5ed0 authored by Alexander Mordvintsev's avatar Alexander Mordvintsev

fixed #1969

parent 1d579116
...@@ -57,6 +57,18 @@ private: ...@@ -57,6 +57,18 @@ private:
PyThreadState* _state; PyThreadState* _state;
}; };
class PyEnsureGIL
{
public:
PyEnsureGIL() : _state(PyGILState_Ensure()) {}
~PyEnsureGIL()
{
PyGILState_Release(_state);
}
private:
PyGILState_STATE _state;
};
#define ERRWRAP2(expr) \ #define ERRWRAP2(expr) \
try \ try \
{ \ { \
...@@ -139,6 +151,8 @@ public: ...@@ -139,6 +151,8 @@ public:
void allocate(int dims, const int* sizes, int type, int*& refcount, void allocate(int dims, const int* sizes, int type, int*& refcount,
uchar*& datastart, uchar*& data, size_t* step) uchar*& datastart, uchar*& data, size_t* step)
{ {
PyEnsureGIL gil;
int depth = CV_MAT_DEPTH(type); int depth = CV_MAT_DEPTH(type);
int cn = CV_MAT_CN(type); int cn = CV_MAT_CN(type);
const int f = (int)(sizeof(size_t)/8); const int f = (int)(sizeof(size_t)/8);
...@@ -169,6 +183,7 @@ public: ...@@ -169,6 +183,7 @@ public:
void deallocate(int* refcount, uchar* datastart, uchar* data) void deallocate(int* refcount, uchar* datastart, uchar* data)
{ {
PyEnsureGIL gil;
if( !refcount ) if( !refcount )
return; return;
PyObject* o = pyObjectFromRefcount(refcount); PyObject* o = pyObjectFromRefcount(refcount);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment