Merge branch 4.x

asmorkalov · asmorkalov · commit 219eaec156a0 · 2023-10-17T14:51:08.000+03:00
diff --git a/modules/aruco/src/charuco.cpp b/modules/aruco/src/charuco.cpp
@@ -40,7 +40,7 @@ void detectCharucoDiamond(InputArray _image, InputArrayOfArrays _markerCorners,
     vector<Mat> markerCorners;
     _markerCorners.getMatVector(markerCorners);
 
-    detector.detectBoard(_image, _diamondCorners, _diamondIds, markerCorners, _markerIds.getMat());
+    detector.detectDiamonds(_image, _diamondCorners, _diamondIds, markerCorners, _markerIds.getMat());
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ void detectCharucoDiamond(InputArray _image, InputArrayOfArrays _markerCorners,`
`40`	`40`	`vector<Mat> markerCorners;`
`41`	`41`	`_markerCorners.getMatVector(markerCorners);`
`42`	`42`
`43`		`- detector.detectBoard(_image, _diamondCorners, _diamondIds, markerCorners, _markerIds.getMat());`
	`43`	`+ detector.detectDiamonds(_image, _diamondCorners, _diamondIds, markerCorners, _markerIds.getMat());`
`44`	`44`	`}`
`45`	`45`
`46`	`46`