add matchImagePoints

Author: AleksandrPanov

modules/aruco/include/opencv2/aruco.hpp

@@ -36,7 +36,7 @@ CV_EXPORTS_W void drawPlanarBoard(const Ptr<Board> &board, Size outSize, OutputA
                                   int borderBits);
 
 /**
-@deprecated Use Board::getBoardObjectAndImagePoints
+@deprecated Use Board::matchImagePoints
 */
 CV_EXPORTS_W void getBoardObjectAndImagePoints(const Ptr<Board> &board, InputArrayOfArrays detectedCorners,
                                                InputArray detectedIds, OutputArray objPoints, OutputArray imgPoints);

modules/aruco/src/aruco.cpp

@@ -34,7 +34,7 @@ void drawPlanarBoard(const Ptr<Board> &board, Size outSize, const _OutputArray &
 
 void getBoardObjectAndImagePoints(const Ptr<Board> &board, InputArrayOfArrays detectedCorners, InputArray detectedIds,
                                   OutputArray objPoints, OutputArray imgPoints) {
-    board->getBoardObjectAndImagePoints(detectedCorners, detectedIds, objPoints, imgPoints);
+    board->matchImagePoints(detectedCorners, detectedIds, objPoints, imgPoints);
 }
 
 int estimatePoseBoard(InputArrayOfArrays corners, InputArray ids, const Ptr<Board> &board,
@@ -44,7 +44,7 @@ int estimatePoseBoard(InputArrayOfArrays corners, InputArray ids, const Ptr<Boar
 
     // get object and image points for the solvePnP function
     Mat objPoints, imgPoints;
-    getBoardObjectAndImagePoints(board, corners, ids, objPoints, imgPoints);
+    board->matchImagePoints(corners, ids, objPoints, imgPoints);
 
     CV_Assert(imgPoints.total() == objPoints.total());
 

modules/aruco/src/aruco_calib.cpp

@@ -36,7 +36,7 @@ double calibrateCameraAruco(InputArrayOfArrays _corners, InputArray _ids, InputA
         }
         markerCounter += nMarkersInThisFrame;
         Mat currentImgPoints, currentObjPoints;
-        board->getBoardObjectAndImagePoints(thisFrameCorners, thisFrameIds, currentObjPoints,
+        board->matchImagePoints(thisFrameCorners, thisFrameIds, currentObjPoints,
             currentImgPoints);
         if(currentImgPoints.total() > 0 && currentObjPoints.total() > 0) {
             processedImagePoints.push_back(currentImgPoints);