potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Alekhin
2019-04-05 19:02:24 +00:00
parent aa1359dc19 28925572f6
commit c9fc27b337
16 changed files with 131 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/tutorials/calib3d/camera_calibration_pattern/camera_calibration_pattern.markdown
+6 -1
View File
@@ -30,4 +30,9 @@ If you want to change unit use -u option (mm inches, px, m)
If you want to change page size use -w and -h options
If you want to create a ChArUco board read tutorial Detection of ChArUco Corners in opencv_contrib tutorial(https://docs.opencv.org/3.4/df/d4a/tutorial_charuco_detection.html)
@cond HAVE_opencv_aruco
If you want to create a ChArUco board read @ref tutorial_charuco_detection "tutorial Detection of ChArUco Corners" in opencv_contrib tutorial.
@endcond
@cond !HAVE_opencv_aruco
If you want to create a ChArUco board read tutorial Detection of ChArUco Corners in opencv_contrib tutorial.
@endcond