Merge remote-tracking branch 'upstream/3.4' into merge-3.4

opencv · Dec 11, 2020 · 24be5b8 · 24be5b8
2 parents dda1f3d + 332ae5b
commit 24be5b8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/aruco/src/charuco.cpp b/modules/aruco/src/charuco.cpp
@@ -304,7 +304,7 @@ static int _selectAndRefineChessboardCorners(InputArray _allCorners, InputArray
     if(_image.type() == CV_8UC3)
         cvtColor(_image, grey, COLOR_BGR2GRAY);
     else
-        _image.copyTo(grey);
+        grey = _image.getMat();
 
     const Ptr<DetectorParameters> params = DetectorParameters::create(); // use default params for corner refinement
 
@@ -724,7 +724,7 @@ void detectCharucoDiamond(InputArray _image, InputArrayOfArrays _markerCorners,
     if(_image.type() == CV_8UC3)
         cvtColor(_image, grey, COLOR_BGR2GRAY);
     else
-        _image.copyTo(grey);
+        grey = _image.getMat();
 
     // for each of the detected markers, try to find a diamond
     for(unsigned int i = 0; i < _markerIds.total(); i++) {