opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-18 17:24:28 +08:00
Code Issues Releases Wiki Activity

remove Ptr RefineParameters

Browse Source
This commit is contained in:
AleksandrPanov
2022-11-25 18:16:44 +03:00
parent 83f9947a08
commit f64e2d3079
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/aruco/src/aruco.cpp
View File

@@ -24,7 +24,7 @@ void refineDetectedMarkers(InputArray _image, const Ptr<Board> &_board,
InputArray _distCoeffs, float minRepDistance, float errorCorrectionRate, InputArray _distCoeffs, float minRepDistance, float errorCorrectionRate,
bool checkAllOrders, OutputArray _recoveredIdxs, bool checkAllOrders, OutputArray _recoveredIdxs,
const Ptr<DetectorParameters> &_params) { const Ptr<DetectorParameters> &_params) {
Ptr<RefineParameters> refineParams = makePtr<RefineParameters>(minRepDistance, errorCorrectionRate, checkAllOrders); RefineParameters refineParams(minRepDistance, errorCorrectionRate, checkAllOrders);
ArucoDetector detector(_board->getDictionary(), _params, refineParams); ArucoDetector detector(_board->getDictionary(), _params, refineParams);
detector.refineDetectedMarkers(_image, _board, _detectedCorners, _detectedIds, _rejectedCorners, _cameraMatrix, detector.refineDetectedMarkers(_image, _board, _detectedCorners, _detectedIds, _rejectedCorners, _cameraMatrix,
_distCoeffs, _recoveredIdxs); _distCoeffs, _recoveredIdxs);

2
modules/aruco/src/charuco.cpp
View File

@@ -427,7 +427,7 @@ void detectCharucoDiamond(InputArray _image, InputArrayOfArrays _markerCorners,
// try to find the rest of markers in the diamond // try to find the rest of markers in the diamond
vector< int > acceptedIdxs; vector< int > acceptedIdxs;
Ptr<RefineParameters> refineParameters = makePtr<RefineParameters>(minRepDistance, -1.f, false); RefineParameters refineParameters(minRepDistance, -1.f, false);
ArucoDetector detector(dictionary, makePtr<DetectorParameters>(), refineParameters); ArucoDetector detector(dictionary, makePtr<DetectorParameters>(), refineParameters);
detector.refineDetectedMarkers(grey, _charucoDiamondLayout, currentMarker, currentMarkerId, candidates, detector.refineDetectedMarkers(grey, _charucoDiamondLayout, currentMarker, currentMarkerId, candidates,
noArray(), noArray(), acceptedIdxs); noArray(), noArray(), acceptedIdxs);

2
modules/aruco/test/test_boarddetection.cpp
View File

@@ -170,7 +170,7 @@ class CV_ArucoRefine : public cvtest::BaseTest {
params->cornerRefinementMethod = aruco::CORNER_REFINE_SUBPIX; params->cornerRefinementMethod = aruco::CORNER_REFINE_SUBPIX;
if (arucoAlgParams == ArucoAlgParams::USE_ARUCO3) if (arucoAlgParams == ArucoAlgParams::USE_ARUCO3)
params->useAruco3Detection = true; params->useAruco3Detection = true;
Ptr<aruco::RefineParameters> refineParams = makePtr<aruco::RefineParameters>(10.f, 3.f, true); aruco::RefineParameters refineParams(10.f, 3.f, true);
detector = aruco::ArucoDetector(dictionary, params, refineParams); detector = aruco::ArucoDetector(dictionary, params, refineParams);
} }