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

Revert "add new version of CommandLineParser. add empty docs"

Browse Source 
This reverts commit 54a202b3d5.

Conflicts:
	modules/core/doc/command_line_parser.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/cmdparser.cpp
	modules/gpu/perf/main.cpp
	modules/gpu/test/main.cpp
	modules/ts/src/ts_perf.cpp
This commit is contained in:
Andrey Kamaev
2012-10-15 19:46:57 +04:00
parent 52e490ef88
commit d566c6bc86
21 changed files with 182 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
samples/gpu/performance/performance.cpp
View File

@@ -165,23 +165,22 @@ int main(int argc, const char* argv[])
redirectError(cvErrorCallback);
const char* keys =
"{ h help | | print help message }"
"{ f filter | | filter for test }"
"{ w workdir | | set working directory }"
"{ l list | | show all tests }"
"{ d device | 0 | device id }"
"{ i iters | 10 | iteration count }";
"{ h | help | false | print help message }"
"{ f | filter | | filter for test }"
"{ w | workdir | | set working directory }"
"{ l | list | false | show all tests }"
"{ d | device | 0 | device id }"
"{ i | iters | 10 | iteration count }";
CommandLineParser cmd(argc, argv, keys);
if (cmd.has("help") || !cmd.check())
if (cmd.get<bool>("help"))
{
cmd.printMessage();
cmd.printErrors();
cout << "Avaible options:" << endl;
cmd.printParams();
return 0;
}
int device = cmd.get<int>("device");
if (device < 0 || device >= num_devices)
{
@@ -199,7 +198,7 @@ int main(int argc, const char* argv[])
string filter = cmd.get<string>("filter");
string workdir = cmd.get<string>("workdir");
bool list = cmd.has("list");
bool list = cmd.get<bool>("list");
int iters = cmd.get<int>("iters");
if (!filter.empty())