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

Merge branch 2.4

Browse Source
This commit is contained in:
Andrey Kamaev
2012-12-24 17:10:07 +04:00
parent 2128bd25e4 014a500f79
commit 13b6a3a15e
20 changed files with 67 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/command_line_parser.cpp
+1 -1
View File
@@ -295,7 +295,7 @@ void CommandLineParser::Impl::sort_params()
sort(data[i].keys.begin(), data[i].keys.end());
}
sort (data.begin(), data.end(), cmp_params);
std::sort (data.begin(), data.end(), cmp_params);
}
string CommandLineParser::Impl::cat_string(const string& str) const