diff --git a/modules/core/misc/python/pyopencv_core.hpp b/modules/core/misc/python/pyopencv_core.hpp index 782dd5a73b..1aecd5b864 100644 --- a/modules/core/misc/python/pyopencv_core.hpp +++ b/modules/core/misc/python/pyopencv_core.hpp @@ -14,8 +14,22 @@ static PyObject* pycvMakeType(PyObject* , PyObject* args, PyObject* kw) { return PyInt_FromLong(type); } +template +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), METH_O, "CV_8UC(channels) -> retval"}, \ + {"CV_8SC", (PyCFunction)(pycvMakeTypeCh), METH_O, "CV_8SC(channels) -> retval"}, \ + {"CV_16UC", (PyCFunction)(pycvMakeTypeCh), METH_O, "CV_16UC(channels) -> retval"}, \ + {"CV_16SC", (PyCFunction)(pycvMakeTypeCh), METH_O, "CV_16SC(channels) -> retval"}, \ + {"CV_32SC", (PyCFunction)(pycvMakeTypeCh), METH_O, "CV_32SC(channels) -> retval"}, \ + {"CV_32FC", (PyCFunction)(pycvMakeTypeCh), METH_O, "CV_32FC(channels) -> retval"}, \ + {"CV_64FC", (PyCFunction)(pycvMakeTypeCh), METH_O, "CV_64FC(channels) -> retval"}, \ + {"CV_16FC", (PyCFunction)(pycvMakeTypeCh), METH_O, "CV_16FC(channels) -> retval"}, #endif // HAVE_OPENCV_CORE #endif // OPENCV_CORE_PYOPENCV_CORE_HPP diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp index 3f976c9a81..a7837a6ff8 100644 --- a/modules/python/src2/cv2.cpp +++ b/modules/python/src2/cv2.cpp @@ -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 diff --git a/modules/python/test/test_misc.py b/modules/python/test/test_misc.py index 2bd6d0890f..e8c4ab8849 100644 --- a/modules/python/test/test_misc.py +++ b/modules/python/test/test_misc.py @@ -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):