add regression_3192 test

Author: AleksandrPanov

modules/aruco/test/test_arucodetection.cpp

@@ -594,7 +594,7 @@ TEST(CV_ArucoTutorial, can_find_gboriginal)
     string imgPath = cvtest::findDataFile("gboriginal.png", false);
     Mat image = imread(imgPath);
     string dictPath = cvtest::findDataFile("tutorial_dict.yml", false);
-    cv::Ptr<cv::aruco::Dictionary> dictionary;
+    Ptr<aruco::Dictionary> dictionary = makePtr<aruco::Dictionary>();
 
     FileStorage fs(dictPath, FileStorage::READ);
     dictionary->aruco::Dictionary::readDictionary(fs.root()); // set marker from tutorial_dict.yml
@@ -644,4 +644,20 @@ TEST(CV_ArucoTutorial, can_find_gboriginal)
     }
 }
 
+TEST(CV_ArucoTutorial, regression_3192)
+{
+    Ptr<aruco::Dictionary> dictionary = aruco::getPredefinedDictionary(aruco::DICT_4X4_50);
+    Ptr<aruco::DetectorParameters> detectorParams = aruco::DetectorParameters::create();
+    //detectorParams->cornerRefinementMethod = aruco::CORNER_REFINE_APRILTAG;
+    vector< int > markerIds;
+    vector<vector<Point2f> > markerCorners;
+
+    string imgPath = cvtest::findDataFile("aruco/regression_3192.png", true);
+    Mat image = imread(imgPath);
+
+    aruco::detectMarkers(image, dictionary, markerCorners, markerIds, detectorParams);
+    ASSERT_EQ(2ull, markerIds.size());
+
+}
+
 }} // namespace

modules/aruco/test/test_charucodetection.cpp

@@ -695,7 +695,7 @@ TEST(CV_ArucoTutorial, can_find_diamondmarkers)
     Mat image = imread(imgPath);
 
     string dictPath = cvtest::findDataFile("tutorial_dict.yml", false);
-    Ptr<cv::aruco::Dictionary> dictionary;
+    Ptr<aruco::Dictionary> dictionary = makePtr<aruco::Dictionary>();
     FileStorage fs(dictPath, FileStorage::READ);
     dictionary->aruco::Dictionary::readDictionary(fs.root()); // set marker from tutorial_dict.yml
 
@@ -745,15 +745,16 @@ TEST(Charuco, issue_14014)
     ASSERT_EQ(corners.size(), 19ull);
     EXPECT_EQ(Size(4, 1), corners[0].size()); // check dimension of detected corners
 
-    ASSERT_EQ(rejectedPoints.size(), 21ull);
+    size_t numRejPoints = rejectedPoints.size();
+    ASSERT_TRUE(numRejPoints > 0ull);
     EXPECT_EQ(Size(4, 1), rejectedPoints[0].size()); // check dimension of detected corners
 
     aruco::refineDetectedMarkers(img, board, corners, ids, rejectedPoints);
 
     ASSERT_EQ(corners.size(), 20ull);
     EXPECT_EQ(Size(4, 1), corners[0].size()); // check dimension of rejected corners after successfully refine
 
-    ASSERT_EQ(rejectedPoints.size(), 20ull);
+    ASSERT_EQ(rejectedPoints.size() + 1, numRejPoints);
     EXPECT_EQ(Size(4, 1), rejectedPoints[0].size()); // check dimension of rejected corners after successfully refine
 }