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

2021-08-07 17:25:06 +00:00
parent e1cafa3834 f7c82baee9
commit 424eaba4c5
18 changed files with 111 additions and 7 deletions
@@ -116,6 +116,12 @@ String dumpRange(const Range& argument)
    }
 }

+CV_WRAP static inline
+String testReservedKeywordConversion(int positional_argument, int lambda = 2, int from = 3)
+{
+    return format("arg=%d, lambda=%d, from=%d", positional_argument, lambda, from);
+}
+
 CV_WRAP static inline
 void testRaiseGeneralException()
 {