generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug: CommandLineParserParams's comparator would fail with equal arguments.

Browse Source
This commit is contained in:
Roman Donchenko
2013-07-04 17:09:29 +04:00
parent 4692d4b36e
commit 0daf4b800a
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/core/src/command_line_parser.cpp
View File

@@ -136,18 +136,13 @@ void CommandLineParser::getByIndex(int index, bool space_delete, int type, void*
static bool cmp_params(const CommandLineParserParams & p1, const CommandLineParserParams & p2) static bool cmp_params(const CommandLineParserParams & p1, const CommandLineParserParams & p2)
{ {
if (p1.number < p2.number)
return true;
if (p1.number > p2.number) if (p1.number > p2.number)
return false; return false;
if (p1.number == -1 && p2.number == -1) return p1.keys[0].compare(p2.keys[0]) < 0;
{
if (p1.keys[0].compare(p2.keys[0]) > 0)
{
return false;
}
}
return true;
} }
CommandLineParser::CommandLineParser(int argc, const char* const argv[], const String& keys) CommandLineParser::CommandLineParser(int argc, const char* const argv[], const String& keys)