mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 14:13:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace static numpy allocator by function containing static.

Browse Source 
That enables the numpy code to be its own library, in case
some users want to (e.g. CLIF library).
This commit is contained in:
Vincent Rabaud 2024-04-26 10:43:03 +02:00
parent 2cd330486e
commit 8f7e55a60b
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/misc/python/pyopencv_umat.hpp
View File

@ -28,7 +28,7 @@ static void* cv_UMat_context()
static Mat cv_UMat_get(const UMat* _self)
{
Mat m;
m.allocator = &g_numpyAllocator;
m.allocator = &GetNumpyAllocator();
_self->copyTo(m);
return m;
}

10
modules/python/src2/cv2_convert.cpp
View File

@ -56,7 +56,7 @@ bool pyopencv_to(PyObject* o, Mat& m, const ArgInfo& info)
if(!o || o == Py_None)
{
if( !m.data )
m.allocator = &g_numpyAllocator;
m.allocator = &GetNumpyAllocator();
return true;
}
@ -298,14 +298,14 @@ bool pyopencv_to(PyObject* o, Mat& m, const ArgInfo& info)
#endif
m = Mat(ndims, size, type, PyArray_DATA(oarr), step);
m.u = g_numpyAllocator.allocate(o, ndims, size, type, step);
m.u = GetNumpyAllocator().allocate(o, ndims, size, type, step);
m.addref();
if( !needcopy )
{
Py_INCREF(o);
}
m.allocator = &g_numpyAllocator;
m.allocator = &GetNumpyAllocator();
return true;
}
@ -316,9 +316,9 @@ PyObject* pyopencv_from(const cv::Mat& m)
if( !m.data )
Py_RETURN_NONE;
cv::Mat temp, *p = (cv::Mat*)&m;
if(!p->u || p->allocator != &g_numpyAllocator)
if(!p->u || p->allocator != &GetNumpyAllocator())
{
temp.allocator = &g_numpyAllocator;
temp.allocator = &GetNumpyAllocator();
ERRWRAP2(m.copyTo(temp));
p = &temp;
}

2
modules/python/src2/cv2_numpy.cpp
View File

@ -6,8 +6,6 @@
#include "cv2_numpy.hpp"
#include "cv2_util.hpp"
NumpyAllocator g_numpyAllocator;
using namespace cv;
UMatData* NumpyAllocator::allocate(PyObject* o, int dims, const int* sizes, int type, size_t* step) const

2
modules/python/src2/cv2_numpy.hpp
View File

@ -18,7 +18,7 @@ public:
const cv::MatAllocator* stdAllocator;
};
extern NumpyAllocator g_numpyAllocator;
inline NumpyAllocator& GetNumpyAllocator() {static NumpyAllocator gNumpyAllocator;return gNumpyAllocator;}
//======================================================================================================================