diff --git a/modules/aruco/include/opencv2/aruco/charuco.hpp b/modules/aruco/include/opencv2/aruco/charuco.hpp index 882df97bb7a..aa7a7c75e89 100644 --- a/modules/aruco/include/opencv2/aruco/charuco.hpp +++ b/modules/aruco/include/opencv2/aruco/charuco.hpp @@ -328,8 +328,7 @@ CV_EXPORTS_W void drawDetectedDiamonds(InputOutputArray image, InputArrayOfArray * * This function return the image of a ChArUco marker, ready to be printed. */ -// TODO cannot be exported yet; conversion from/to Vec4i is not wrapped in core -CV_EXPORTS void drawCharucoDiamond(const Ptr &dictionary, Vec4i ids, int squareLength, +CV_EXPORTS_W void drawCharucoDiamond(const Ptr &dictionary, Vec4i ids, int squareLength, int markerLength, OutputArray img, int marginSize = 0, int borderBits = 1); diff --git a/modules/aruco/misc/python/test/test_aruco.py b/modules/aruco/misc/python/test/test_aruco.py index 474aa87ecdf..c569c3f0b61 100644 --- a/modules/aruco/misc/python/test/test_aruco.py +++ b/modules/aruco/misc/python/test/test_aruco.py @@ -30,5 +30,10 @@ def test_idsAccessibility(self): with self.assertRaises(cv.error): board.setIds(np.array([0])) + def test_drawCharucoDiamond(self): + aruco_dict = cv.aruco.Dictionary_get(cv.aruco.DICT_4X4_50) + img = cv.aruco.drawCharucoDiamond(aruco_dict, np.array([0, 1, 2, 3]), 100, 80) + self.assertTrue(img is not None) + if __name__ == '__main__': NewOpenCVTests.bootstrap()