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

Merge remote-tracking branch 'origin/2.4' into merge-2.4

Browse Source 
Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/initialization.cpp
	modules/ocl/test/main.cpp
	modules/superres/CMakeLists.txt
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/input_array_utility.hpp
	modules/superres/src/optical_flow.cpp
This commit is contained in:
Roman Donchenko
2013-07-15 18:40:54 +04:00
parent 52a9378257 886c009da6
commit feaa12a274
32 changed files with 2342 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/ocl/test/main.cpp
View File

@@ -73,14 +73,12 @@ void print_info()
#endif
}
std::string workdir;
int main(int argc, char **argv)
{
TS::ptr()->init("ocl");
TS::ptr()->init(".");
InitGoogleTest(&argc, argv);
const char *keys =
"{ h | false | print help message }"
"{ w | ../../../samples/c/| set working directory i.e. -w=C:\\}"
"{ t | gpu | set device type:i.e. -t=cpu or gpu}"
"{ p | 0 | set platform id i.e. -p=0}"
"{ d | 0 | set device id i.e. -d=0}";
@@ -92,7 +90,6 @@ int main(int argc, char **argv)
cmd.printMessage();
return 0;
}
workdir = cmd.get<string>("w");
string type = cmd.get<string>("t");
unsigned int pid = cmd.get<unsigned int>("p");
int device = cmd.get<int>("d");