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

2018-07-17 19:26:50 +03:00
parent 3f65924c45 6c4f618db5
commit 4560909a5e
123 changed files with 7034 additions and 2453 deletions
@@ -17,6 +17,9 @@
            ]
        }
    },
+    "namespaces_dict": {
+        "cv.fisheye": "fisheye"
+    },
    "func_arg_fix" : {
        "findFundamentalMat"  : { "points1" : {"ctype" : "vector_Point2f"},
                                  "points2" : {"ctype" : "vector_Point2f"} },