potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +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-05-28 23:35:11 +00:00
parent d3aaf2d3a3 e58e545584
commit c3e8a82c9c
25 changed files with 837 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/system.cpp
+1 -1
View File
@@ -1888,7 +1888,7 @@ inline size_t parseOption(const std::string &value)
}
cv::String valueStr = value.substr(0, pos);
cv::String suffixStr = value.substr(pos, value.length() - pos);
int v = atoi(valueStr.c_str());
size_t v = (size_t)std::stoull(valueStr);
if (suffixStr.length() == 0)
return v;
else if (suffixStr == "MB" || suffixStr == "Mb" || suffixStr == "mb")