generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed #1969

Browse Source
This commit is contained in:
Alexander Mordvintsev 2012-05-22 11:21:25 +00:00
parent 1d57911646
commit 61fd5ed0e1
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/python/src2/cv2.cpp
View File

@ -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:
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:
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);