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

b11fb781 · Alexander Alekhin · 40b238b0 · 11099062 · b11fb781 · 40b238b0
Commit b11fb781 authored Dec 11, 2019 by Alexander Alekhin
19 changed files
--- a/modules/aruco/tutorials/aruco_detection/aruco_detection.markdown
+++ b/modules/aruco/tutorials/aruco_detection/aruco_detection.markdown
--- a/modules/aruco/tutorials/aruco_detection/images/bitsextraction1.png
+++ b/modules/aruco/tutorials/aruco_detection/images/bitsextraction1.png
--- a/modules/aruco/tutorials/aruco_detection/images/marker23.jpg
+++ b/modules/aruco/tutorials/aruco_detection/images/marker23.jpg
--- a/modules/aruco/tutorials/aruco_detection/images/marker23.png
+++ b/modules/aruco/tutorials/aruco_detection/images/marker23.png
--- a/modules/aruco/tutorials/aruco_detection/images/markers.jpg
+++ b/modules/aruco/tutorials/aruco_detection/images/markers.jpg
--- a/modules/aruco/tutorials/aruco_detection/images/removeperspective.jpg
+++ b/modules/aruco/tutorials/aruco_detection/images/removeperspective.jpg
--- a/modules/aruco/tutorials/aruco_detection/images/removeperspective.png
+++ b/modules/aruco/tutorials/aruco_detection/images/removeperspective.png
--- a/modules/aruco/tutorials/aruco_detection/images/singlemarkersaxes.jpg
+++ b/modules/aruco/tutorials/aruco_detection/images/singlemarkersaxes.jpg
--- a/modules/aruco/tutorials/aruco_detection/images/singlemarkersaxis.png
+++ b/modules/aruco/tutorials/aruco_detection/images/singlemarkersaxis.png
--- a/modules/aruco/tutorials/aruco_detection/images/singlemarkersbrokenthresh.png
+++ b/modules/aruco/tutorials/aruco_detection/images/singlemarkersbrokenthresh.png
--- a/modules/aruco/tutorials/aruco_detection/images/singlemarkersdetection.jpg
+++ b/modules/aruco/tutorials/aruco_detection/images/singlemarkersdetection.jpg
--- a/modules/aruco/tutorials/aruco_detection/images/singlemarkersdetection.png
+++ b/modules/aruco/tutorials/aruco_detection/images/singlemarkersdetection.png
--- a/modules/aruco/tutorials/aruco_detection/images/singlemarkersoriginal.jpg
+++ b/modules/aruco/tutorials/aruco_detection/images/singlemarkersoriginal.jpg
--- a/modules/aruco/tutorials/aruco_detection/images/singlemarkersoriginal.png
+++ b/modules/aruco/tutorials/aruco_detection/images/singlemarkersoriginal.png
--- a/modules/aruco/tutorials/aruco_detection/images/singlemarkersrejected.jpg
+++ b/modules/aruco/tutorials/aruco_detection/images/singlemarkersrejected.jpg
--- a/modules/aruco/tutorials/aruco_detection/images/singlemarkersrejected.png
+++ b/modules/aruco/tutorials/aruco_detection/images/singlemarkersrejected.png
--- a/modules/aruco/tutorials/aruco_detection/images/singlemarkerssource.png
+++ b/modules/aruco/tutorials/aruco_detection/images/singlemarkerssource.png
--- a/modules/aruco/tutorials/aruco_detection/images/singlemarkersthresh.png
+++ b/modules/aruco/tutorials/aruco_detection/images/singlemarkersthresh.png
--- a/modules/aruco/tutorials/table_of_content_aruco.markdown
+++ b/modules/aruco/tutorials/table_of_content_aruco.markdown
@@ -20,7 +20,7 @@ and without artifacts.

    *Compatibility:* \> OpenCV 3.0

-    *Author:* Sergio Garrido
+    *Author:* Sergio Garrido, Steve Nicholson

    Basic detection and pose estimation from single ArUco markers.