diff --git a/modules/aruco/include/opencv2/aruco.hpp b/modules/aruco/include/opencv2/aruco.hpp index 82ac2ea90..01bd1e22f 100644 --- a/modules/aruco/include/opencv2/aruco.hpp +++ b/modules/aruco/include/opencv2/aruco.hpp @@ -140,7 +140,7 @@ CV_EXPORTS_W void estimatePoseSingleMarkers(InputArrayOfArrays corners, float ma const Ptr& estimateParameters = makePtr()); -/** @deprecated Use CharucoBoard::testCharucoCornersCollinear +/** @deprecated Use CharucoBoard::checkCharucoCornersCollinear */ CV_EXPORTS_W bool testCharucoCornersCollinear(const Ptr &board, InputArray charucoIds); diff --git a/modules/aruco/misc/python/test/test_aruco.py b/modules/aruco/misc/python/test/test_aruco.py index a9814ad28..3f262a2b3 100644 --- a/modules/aruco/misc/python/test/test_aruco.py +++ b/modules/aruco/misc/python/test/test_aruco.py @@ -17,7 +17,7 @@ class aruco_test(NewOpenCVTests): id = 2 marker_size = 100 offset = 10 - img_marker = cv.aruco.drawMarker(aruco_dict, id, marker_size, aruco_params.markerBorderBits) + img_marker = cv.aruco.generateImageMarker(aruco_dict, id, marker_size, aruco_params.markerBorderBits) img_marker = np.pad(img_marker, pad_width=offset, mode='constant', constant_values=255) gold_corners = np.array([[offset, offset],[marker_size+offset-1.0,offset], [marker_size+offset-1.0,marker_size+offset-1.0], diff --git a/modules/aruco/perf/perf_aruco.cpp b/modules/aruco/perf/perf_aruco.cpp index aaf5a8176..8cb9224a7 100644 --- a/modules/aruco/perf/perf_aruco.cpp +++ b/modules/aruco/perf/perf_aruco.cpp @@ -90,7 +90,7 @@ public: // canonical image const int markerSizePixels = static_cast(imgMarkerSize/sqrt(2.f)); - aruco::drawMarker(dictionary, id, markerSizePixels, img, parameters.markerBorderBits); + aruco::generateImageMarker(dictionary, id, markerSizePixels, img, parameters.markerBorderBits); // get rvec and tvec for the perspective const double distance = 0.1; diff --git a/modules/aruco/samples/create_board.cpp b/modules/aruco/samples/create_board.cpp index 016efbb28..9201cba8f 100644 --- a/modules/aruco/samples/create_board.cpp +++ b/modules/aruco/samples/create_board.cpp @@ -120,7 +120,7 @@ int main(int argc, char *argv[]) { // show created board Mat boardImage; - board->draw(imageSize, boardImage, margins, borderBits); + board->generateImage(imageSize, boardImage, margins, borderBits); if(showImage) { imshow("board", boardImage); diff --git a/modules/aruco/samples/create_board_charuco.cpp b/modules/aruco/samples/create_board_charuco.cpp index 78f981904..1c762cb39 100644 --- a/modules/aruco/samples/create_board_charuco.cpp +++ b/modules/aruco/samples/create_board_charuco.cpp @@ -120,7 +120,7 @@ int main(int argc, char *argv[]) { // show created board Mat boardImage; - board->draw(imageSize, boardImage, margins, borderBits); + board->generateImage(imageSize, boardImage, margins, borderBits); if(showImage) { imshow("board", boardImage); diff --git a/modules/aruco/samples/create_marker.cpp b/modules/aruco/samples/create_marker.cpp index 0b1752a63..2e83e9e93 100644 --- a/modules/aruco/samples/create_marker.cpp +++ b/modules/aruco/samples/create_marker.cpp @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) { } Mat markerImg; - aruco::drawMarker(dictionary, markerId, markerSize, markerImg, borderBits); + aruco::generateImageMarker(dictionary, markerId, markerSize, markerImg, borderBits); if(showImage) { imshow("marker", markerImg); diff --git a/modules/aruco/samples/tutorial_charuco_create_detect.cpp b/modules/aruco/samples/tutorial_charuco_create_detect.cpp index 326efc0e9..84ea04df4 100644 --- a/modules/aruco/samples/tutorial_charuco_create_detect.cpp +++ b/modules/aruco/samples/tutorial_charuco_create_detect.cpp @@ -17,7 +17,7 @@ static inline void createBoard() //! [createBoard] cv::Ptr board = cv::aruco::CharucoBoard::create(5, 7, 0.04f, 0.02f, dictionary); cv::Mat boardImage; - board->draw(cv::Size(600, 500), boardImage, 10, 1); + board->generateImage(cv::Size(600, 500), boardImage, 10, 1); //! [createBoard] cv::imwrite("BoardImage.jpg", boardImage); } diff --git a/modules/aruco/src/aruco.cpp b/modules/aruco/src/aruco.cpp index a1b09163b..52ec072c1 100644 --- a/modules/aruco/src/aruco.cpp +++ b/modules/aruco/src/aruco.cpp @@ -31,7 +31,7 @@ void refineDetectedMarkers(InputArray _image, const Ptr &_board, } void drawPlanarBoard(const Ptr &board, Size outSize, const _OutputArray &img, int marginSize, int borderBits) { - board->draw(outSize, img, marginSize, borderBits); + board->generateImage(outSize, img, marginSize, borderBits); } void getBoardObjectAndImagePoints(const Ptr &board, InputArrayOfArrays detectedCorners, InputArray detectedIds, @@ -120,7 +120,7 @@ bool estimatePoseCharucoBoard(InputArray charucoCorners, InputArray charucoIds, } bool testCharucoCornersCollinear(const Ptr &board, InputArray charucoIds) { - return board->testCharucoCornersCollinear(charucoIds); + return board->checkCharucoCornersCollinear(charucoIds); } /** diff --git a/modules/aruco/src/charuco.cpp b/modules/aruco/src/charuco.cpp index f3592c524..b897ac9c0 100644 --- a/modules/aruco/src/charuco.cpp +++ b/modules/aruco/src/charuco.cpp @@ -497,7 +497,7 @@ void drawCharucoDiamond(const Ptr &dictionary, Vec4i ids, int square // create a charuco board similar to a charuco marker and print it Ptr board = CharucoBoard::create(3, 3, (float)squareLength, (float)markerLength, *dictionary, tmpIds); Size outSize(3 * squareLength + 2 * marginSize, 3 * squareLength + 2 * marginSize); - board->draw(outSize, _img, marginSize, borderBits); + board->generateImage(outSize, _img, marginSize, borderBits); } diff --git a/modules/aruco/test/test_aruco_utils.hpp b/modules/aruco/test/test_aruco_utils.hpp index 9ae94f789..a8a72c1b7 100644 --- a/modules/aruco/test/test_aruco_utils.hpp +++ b/modules/aruco/test/test_aruco_utils.hpp @@ -65,7 +65,7 @@ static inline void projectMarker(Mat& img, Ptr board, int markerIn // canonical image Mat markerImg; const int markerSizePixels = 100; - aruco::drawMarker(board->getDictionary(), board->getIds()[markerIndex], markerSizePixels, markerImg, markerBorder); + aruco::generateImageMarker(board->getDictionary(), board->getIds()[markerIndex], markerSizePixels, markerImg, markerBorder); // projected corners Mat distCoeffs(5, 1, CV_64FC1, Scalar::all(0)); diff --git a/modules/aruco/test/test_charucodetection.cpp b/modules/aruco/test/test_charucodetection.cpp index 56af03477..5928b223d 100644 --- a/modules/aruco/test/test_charucodetection.cpp +++ b/modules/aruco/test/test_charucodetection.cpp @@ -641,7 +641,7 @@ TEST(Charuco, testBoardSubpixelCoords) Ptr board = cv::aruco::CharucoBoard::create(4, 4, 1.f, .8f, dict); // generate ChArUco board - board->draw(Size(res.width, res.height), gray, 150); + board->generateImage(Size(res.width, res.height), gray, 150); cv::GaussianBlur(gray, gray, Size(5, 5), 1.0); aruco::DetectorParameters params; diff --git a/modules/aruco/test/test_misc.cpp b/modules/aruco/test/test_misc.cpp index 5c8800713..d56010082 100644 --- a/modules/aruco/test/test_misc.cpp +++ b/modules/aruco/test/test_misc.cpp @@ -20,7 +20,7 @@ TEST(CV_ArucoDrawMarker, regression_1226) ASSERT_NO_THROW( { - board->draw(sz, mat, 0, 1); + board->generateImage(sz, mat, 0, 1); }); }