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

2020-03-04 20:49:09 +00:00
parent bc036e1e86 4f288a1e28
commit d4a17da7b2
47 changed files with 750 additions and 353 deletions
@@ -571,8 +571,8 @@ class CppHeaderParser(object):
                    arg_type, arg_name, modlist, argno = self.parse_arg(a, argno)
                    if self.wrap_mode:
                        # TODO: Vectors should contain UMat, but this is not very easy to support and not very needed
-                        vector_mat = "vector_{}".format("Mat")
-                        vector_mat_template = "vector<{}>".format("Mat")
+                        vector_mat = "vector_{}".format(mat)
+                        vector_mat_template = "vector<{}>".format(mat)

                        if arg_type == "InputArray":
                            arg_type = mat