mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-11 20:09:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #23679 from dkurt:py_cv_type_macro

Browse Source 
Python bindings for CV_8UC(n) and other types macros #23679

### Pull Request Readiness Checklist

resolves https://github.com/opencv/opencv/issues/23628#issuecomment-1562468327

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
This commit is contained in:
Dmitry Kurtaev 2023-05-25 15:54:41 +03:00 committed by GitHub
parent 26a7b332cb
commit 4823285b55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/core/misc/python/pyopencv_core.hpp
View File

@ -14,8 +14,22 @@ static PyObject* pycvMakeType(PyObject* , PyObject* args, PyObject* kw) {
return PyInt_FromLong(type);
}
template <int depth>
static PyObject* pycvMakeTypeCh(PyObject*, PyObject *value) {
int channels = (int)PyLong_AsLong(value);
return PyInt_FromLong(CV_MAKETYPE(depth, channels));
}
#define PYOPENCV_EXTRA_METHODS_CV \
{"CV_MAKETYPE", CV_PY_FN_WITH_KW(pycvMakeType), "CV_MAKETYPE(depth, channels) -> retval"},
{"CV_MAKETYPE", CV_PY_FN_WITH_KW(pycvMakeType), "CV_MAKETYPE(depth, channels) -> retval"}, \
{"CV_8UC", (PyCFunction)(pycvMakeTypeCh<CV_8U>), METH_O, "CV_8UC(channels) -> retval"}, \
{"CV_8SC", (PyCFunction)(pycvMakeTypeCh<CV_8S>), METH_O, "CV_8SC(channels) -> retval"}, \
{"CV_16UC", (PyCFunction)(pycvMakeTypeCh<CV_16U>), METH_O, "CV_16UC(channels) -> retval"}, \
{"CV_16SC", (PyCFunction)(pycvMakeTypeCh<CV_16S>), METH_O, "CV_16SC(channels) -> retval"}, \
{"CV_32SC", (PyCFunction)(pycvMakeTypeCh<CV_32S>), METH_O, "CV_32SC(channels) -> retval"}, \
{"CV_32FC", (PyCFunction)(pycvMakeTypeCh<CV_32F>), METH_O, "CV_32FC(channels) -> retval"}, \
{"CV_64FC", (PyCFunction)(pycvMakeTypeCh<CV_64F>), METH_O, "CV_64FC(channels) -> retval"}, \
{"CV_16FC", (PyCFunction)(pycvMakeTypeCh<CV_16F>), METH_O, "CV_16FC(channels) -> retval"},
#endif // HAVE_OPENCV_CORE
#endif // OPENCV_CORE_PYOPENCV_CORE_HPP

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

@ -557,6 +557,11 @@ static bool init_body(PyObject * m)
PUBLISH(CV_64FC2);
PUBLISH(CV_64FC3);
PUBLISH(CV_64FC4);
PUBLISH(CV_16F);
PUBLISH(CV_16FC1);
PUBLISH(CV_16FC2);
PUBLISH(CV_16FC3);
PUBLISH(CV_16FC4);
#undef PUBLISH_
#undef PUBLISH

15
modules/python/test/test_misc.py
View File

@ -144,13 +144,18 @@ class Bindings(NewOpenCVTests):
def test_maketype(self):
data = {
cv.CV_8UC3: [cv.CV_8U, 3],
cv.CV_16SC1: [cv.CV_16S, 1],
cv.CV_32FC4: [cv.CV_32F, 4],
cv.CV_64FC2: [cv.CV_64F, 2],
cv.CV_8UC3: [cv.CV_8U, 3, cv.CV_8UC],
cv.CV_16SC1: [cv.CV_16S, 1, cv.CV_16SC],
cv.CV_32FC4: [cv.CV_32F, 4, cv.CV_32FC],
cv.CV_64FC2: [cv.CV_64F, 2, cv.CV_64FC],
cv.CV_8SC4: [cv.CV_8S, 4, cv.CV_8SC],
cv.CV_16UC2: [cv.CV_16U, 2, cv.CV_16UC],
cv.CV_32SC1: [cv.CV_32S, 1, cv.CV_32SC],
cv.CV_16FC3: [cv.CV_16F, 3, cv.CV_16FC],
}
for ref, (depth, channels) in data.items():
for ref, (depth, channels, func) in data.items():
self.assertEqual(ref, cv.CV_MAKETYPE(depth, channels))
self.assertEqual(ref, func(channels))
class Arguments(NewOpenCVTests):