Merge pull request #2236 from szk1509:invMarkerContourDetectionImproved

bb5dadd7 · Alexander Alekhin · bb1dee17 · 93f910e9 · bb5dadd7 · bb5dadd7
Commit bb5dadd7 authored Aug 30, 2019 by Alexander Alekhin
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 15 deletions

aruco.cpp modules/aruco/src/aruco.cpp +0 -0

test_arucodetection.cpp modules/aruco/test/test_arucodetection.cpp +1 -15

No files found.
--- a/modules/aruco/src/aruco.cpp
+++ b/modules/aruco/src/aruco.cpp
--- a/modules/aruco/test/test_arucodetection.cpp
+++ b/modules/aruco/test/test_arucodetection.cpp
@@ -322,24 +322,10 @@ void CV_ArucoDetectionPerspective::run(int tryWith) {
                }
                for(int c = 0; c < 4; c++) {
                    double dist = cv::norm(groundTruthCorners[c] - corners[0][c]);  // TODO cvtest
-                    if(CV_ArucoDetectionPerspective::DETECT_INVERTED_MARKER == tryWith){
+                    if(dist > 5) {
-                        if(szEnclosed && dist > 3){
                            ts->printf(cvtest::TS::LOG, "Incorrect marker corners position");
                            ts->set_failed_test_info(cvtest::TS::FAIL_BAD_ACCURACY);
                            return;
-                        }
-                        if(!szEnclosed && dist >15){
-                            ts->printf(cvtest::TS::LOG, "Incorrect marker corners position");
-                            ts->set_failed_test_info(cvtest::TS::FAIL_BAD_ACCURACY);
-                            return;
-                        }
-                    }
-                    else{
-                        if(dist > 5) {
-                            ts->printf(cvtest::TS::LOG, "Incorrect marker corners position");
-                            ts->set_failed_test_info(cvtest::TS::FAIL_BAD_ACCURACY);
-                            return;
-                        }
                    }
                }
            }