potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2026-05-25 16:29:45 +03:00
parent c2594b41bf e0d604378f
commit d8263a9899
54 changed files with 523 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/python/aruco_detect_board_charuco.py
+2 -1
View File
@@ -36,7 +36,8 @@ def main():
parser.add_argument("-d", help="dictionary: DICT_4X4_50=0, DICT_4X4_100=1, DICT_4X4_250=2, DICT_4X4_1000=3,"
"DICT_5X5_50=4, DICT_5X5_100=5, DICT_5X5_250=6, DICT_5X5_1000=7, DICT_6X6_50=8,"
"DICT_6X6_100=9, DICT_6X6_250=10, DICT_6X6_1000=11, DICT_7X7_50=12, DICT_7X7_100=13,"
"DICT_7X7_250=14, DICT_7X7_1000=15, DICT_ARUCO_ORIGINAL = 16}",
"DICT_7X7_250=14, DICT_7X7_1000=15, DICT_ARUCO_ORIGINAL=16,"
"DICT_APRILTAG_16h5=17, DICT_APRILTAG_25h9=18, DICT_APRILTAG_36h10=19, DICT_APRILTAG_36h11=20, DICT_ARUCO_MIP_36h12=21}",
default="0", action="store", dest="d", type=int)
parser.add_argument("-ci", help="Camera id if input doesnt come from video (-v)", default="0", action="store",
dest="ci", type=int)
samples/python/calibrate.py
+2 -1
View File
@@ -100,7 +100,8 @@ def main():
'DICT_APRILTAG_16h5': cv.aruco.DICT_APRILTAG_16h5,
'DICT_APRILTAG_25h9': cv.aruco.DICT_APRILTAG_25h9,
'DICT_APRILTAG_36h10': cv.aruco.DICT_APRILTAG_36h10,
'DICT_APRILTAG_36h11': cv.aruco.DICT_APRILTAG_36h11
'DICT_APRILTAG_36h11': cv.aruco.DICT_APRILTAG_36h11,
'DICT_ARUCO_MIP_36h12': cv.aruco.DICT_ARUCO_MIP_36h12
}
if (aruco_dict_name not in set(aruco_dicts.keys())):