potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2023-07-12 13:42:01 +03:00
parent eb717a7e91 3c0b71bcec
commit cea26341a5
128 changed files with 9936 additions and 932 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/objdetect/test/test_arucodetection.cpp
+3 -3
View File
@@ -268,12 +268,12 @@ void CV_ArucoDetectionPerspective::run(int) {
}
if(ArucoAlgParams::USE_APRILTAG == arucoAlgParams){
detectorParameters.cornerRefinementMethod = aruco::CORNER_REFINE_APRILTAG;
detectorParameters.cornerRefinementMethod = (int)aruco::CORNER_REFINE_APRILTAG;
}
if (ArucoAlgParams::USE_ARUCO3 == arucoAlgParams) {
detectorParameters.useAruco3Detection = true;
detectorParameters.cornerRefinementMethod = aruco::CORNER_REFINE_SUBPIX;
detectorParameters.cornerRefinementMethod = (int)aruco::CORNER_REFINE_SUBPIX;
}
detector.setDetectorParameters(detectorParameters);
@@ -653,7 +653,7 @@ TEST_P(ArucoThreading, number_of_threads_does_not_change_results)
img_marker.copyTo(img(Rect(shift, shift, height_marker, height_marker)));
aruco::DetectorParameters detectorParameters = detector.getDetectorParameters();
detectorParameters.cornerRefinementMethod = GetParam();
detectorParameters.cornerRefinementMethod = (int)GetParam();
detector.setDetectorParameters(detectorParameters);
vector<vector<Point2f> > original_corners;