potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Alekhin
2020-12-18 20:47:56 +00:00
parent 3e9158acd6 ef27c11d50
commit dac298ef41
20 changed files with 480 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/include/opencv2/core/bindings_utils.hpp
+6
View File
@@ -58,6 +58,12 @@ String dumpCString(const char* argument)
return cv::format("String: %s", argument);
}
CV_WRAP static inline
String dumpString(const String& argument)
{
return cv::format("String: %s", argument.c_str());
}
CV_WRAP static inline
AsyncArray testAsyncArray(InputArray argument)
{