feat; update ndarray converter from cv2

Author: edmBernard

ndarray_converter.cpp

@@ -25,10 +25,9 @@ bool NDArrayConverter::init_numpy() {
     return true;
 }
 
-/*
- * The following conversion functions are taken/adapted from OpenCV's cv2.cpp file
- * inside modules/python/src2 folder (OpenCV 3.1.0)
- */
+// The following conversion functions are taken/adapted from OpenCV's cv2.cpp file
+// inside modules/python/src2 folder (OpenCV 4.5.2)
+
 
 static PyObject* opencv_error = 0;
 
@@ -129,7 +128,7 @@ class NumpyAllocator : public MatAllocator
             _sizes[i] = sizes[i];
         if( cn > 1 )
             _sizes[dims++] = cn;
-        PyObject* o = PyArray_SimpleNew(dims, _sizes, typenum);
+        PyObject* o = PyArray_SimpleNew(dims, _sizes.data(), typenum);
         if(!o)
             CV_Error_(Error::StsError, ("The numpy array of typenum=%d, ndims=%d can not be created", typenum, dims));
         return allocate(o, dims0, sizes, type, step);
@@ -192,7 +191,7 @@ bool NDArrayConverter::toMat(PyObject *o, Mat &m)
         m = Mat(sz, 1, CV_64F);
         for( i = 0; i < sz; i++ )
         {
-            PyObject* oi = PyTuple_GET_ITEM(o, i);
+            PyObject* oi = PyTuple_GetItem(o, i);
             if( PyInt_Check(oi) )
                 m.at<double>(i) = (double)PyInt_AsLong(oi);
             else if( PyFloat_Check(oi) )
@@ -276,11 +275,11 @@ bool NDArrayConverter::toMat(PyObject *o, Mat &m)
 
     if (needcopy)
     {
-        //if (info.outputarg)
-        //{
-        //    failmsg("Layout of the output array %s is incompatible with cv::Mat (step[ndims-1] != elemsize or step[1] != elemsize*nchannels)", info.name);
-        //    return false;
-        //}
+        // if (info.outputarg)
+        // {
+        //     failmsg("Layout of the output array %s is incompatible with cv::Mat (step[ndims-1] != elemsize or step[1] != elemsize*nchannels)", info.name);
+        //     return false;
+        // }
 
         if( needcast ) {
             o = PyArray_Cast(oarr, new_typenum);

ndarray_converter.h

@@ -9,7 +9,7 @@ class NDArrayConverter {
 public:
     // must call this first, or the other routines don't work!
     static bool init_numpy();
-    
+
     static bool toMat(PyObject* o, cv::Mat &m);
     static PyObject* toNDArray(const cv::Mat& mat);
 };
@@ -21,22 +21,22 @@ class NDArrayConverter {
 #include <pybind11/pybind11.h>
 
 namespace pybind11 { namespace detail {
-    
+
 template <> struct type_caster<cv::Mat> {
 public:
-    
+
     PYBIND11_TYPE_CASTER(cv::Mat, _("numpy.ndarray"));
-    
-    bool load(handle src, bool) {
+
+    bool load(handle src, bool /* convert */) {
         return NDArrayConverter::toMat(src.ptr(), value);
     }
-    
+
     static handle cast(const cv::Mat &m, return_value_policy, handle defval) {
         return handle(NDArrayConverter::toNDArray(m));
     }
 };
-    
-    
+
+
 }} // namespace pybind11::detail
 
 # endif