mirror of
https://github.com/opencv/opencv.git
synced 2024-12-12 23:49:36 +08:00
5510718381
python: attempts to fix 3d mat parsing problem for dnn #25810 Fixes https://github.com/opencv/opencv/issues/25762 https://github.com/opencv/opencv/issues/23242 Relates https://github.com/opencv/opencv/issues/25763 https://github.com/opencv/opencv/issues/19091 Although `cv.Mat` has already been introduced to workaround this problem, people do not know it and it kind of leads to confusion with `numpy.array`. This patch adds a "switch" to turn off the auto multichannel feature when the API is from cv::dnn::Net (more specifically, `setInput`) and the parameter is of type `Mat`. This patch only leads to changes of three places in `pyopencv_generated_types_content.h`: ```.diff static PyObject* pyopencv_cv_dnn_dnn_Net_setInput(PyObject* self, PyObject* py_args, PyObject* kw) { ... - pyopencv_to_safe(pyobj_blob, blob, ArgInfo("blob", 0)) && + pyopencv_to_safe(pyobj_blob, blob, ArgInfo("blob", 8)) && ... } // I guess we also need to change this as one-channel blob is expected for param static PyObject* pyopencv_cv_dnn_dnn_Net_setParam(PyObject* self, PyObject* py_args, PyObject* kw) { ... - pyopencv_to_safe(pyobj_blob, blob, ArgInfo("blob", 0)) ) + pyopencv_to_safe(pyobj_blob, blob, ArgInfo("blob", 8)) ) ... - pyopencv_to_safe(pyobj_blob, blob, ArgInfo("blob", 0)) ) + pyopencv_to_safe(pyobj_blob, blob, ArgInfo("blob", 8)) ) ... } ``` Others are unchanged, e.g. `dnn_SegmentationModel` and stuff like that. ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake
73 lines
1.7 KiB
C++
73 lines
1.7 KiB
C++
#ifndef CV2_HPP
|
|
#define CV2_HPP
|
|
|
|
//warning number '5033' not a valid compiler warning in vc12
|
|
#if defined(_MSC_VER) && (_MSC_VER > 1800)
|
|
// eliminating duplicated round() declaration
|
|
#define HAVE_ROUND 1
|
|
#pragma warning(push)
|
|
#pragma warning(disable:5033) // 'register' is no longer a supported storage class
|
|
#endif
|
|
|
|
// #define CVPY_DYNAMIC_INIT
|
|
// #define Py_DEBUG
|
|
|
|
#if defined(CVPY_DYNAMIC_INIT) && !defined(Py_DEBUG)
|
|
# ifndef PYTHON3_LIMITED_API_VERSION
|
|
# define PYTHON3_LIMITED_API_VERSION 0x03060000
|
|
# endif
|
|
# define Py_LIMITED_API PYTHON3_LIMITED_API_VERSION
|
|
#endif
|
|
|
|
#include <cmath>
|
|
#include <Python.h>
|
|
#include <limits>
|
|
|
|
#if PY_MAJOR_VERSION < 3
|
|
#undef CVPY_DYNAMIC_INIT
|
|
#else
|
|
#define CV_PYTHON_3 1
|
|
#endif
|
|
|
|
#if defined(_MSC_VER) && (_MSC_VER > 1800)
|
|
#pragma warning(pop)
|
|
#endif
|
|
|
|
#define MODULESTR "cv2"
|
|
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
|
|
|
|
#include <numpy/ndarrayobject.h>
|
|
|
|
#include "pycompat.hpp"
|
|
|
|
class ArgInfo
|
|
{
|
|
private:
|
|
static const uint32_t arg_outputarg_flag = 0x1;
|
|
static const uint32_t arg_arithm_op_src_flag = 0x2;
|
|
static const uint32_t arg_pathlike_flag = 0x4;
|
|
static const uint32_t arg_nd_mat_flag = 0x8;
|
|
|
|
public:
|
|
const char* name;
|
|
bool outputarg;
|
|
bool arithm_op_src;
|
|
bool pathlike;
|
|
bool nd_mat;
|
|
// more fields may be added if necessary
|
|
|
|
ArgInfo(const char* name_, uint32_t arg_) :
|
|
name(name_),
|
|
outputarg((arg_ & arg_outputarg_flag) != 0),
|
|
arithm_op_src((arg_ & arg_arithm_op_src_flag) != 0),
|
|
pathlike((arg_ & arg_pathlike_flag) != 0),
|
|
nd_mat((arg_ & arg_nd_mat_flag) != 0) {}
|
|
|
|
private:
|
|
ArgInfo(const ArgInfo&) = delete;
|
|
ArgInfo& operator=(const ArgInfo&) = delete;
|
|
};
|
|
|
|
|
|
#endif // CV2_HPP
|