Merge branch 4.x

2026-07-29 07:13:02 +04:00 · 2023-06-01 09:37:38 +03:00
parent d24ffe9a65 fc5d412ba7
commit 5af40a0269
565 changed files with 84396 additions and 17589 deletions
@@ -618,6 +618,8 @@ class CppHeaderParser(object):
                                                             ("InputOutputArray", mat),
                                                             ("OutputArray", mat),
                                                             ("noArray", arg_type)]).strip()
+                    if '/IO' in modlist and '/O' in modlist:
+                        modlist.remove('/O')
                    args.append([arg_type, arg_name, defval, modlist])
                npos = arg_start-1