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 'origin/2.4' into merge-2.4

Browse Source 
Conflicts:
	apps/CMakeLists.txt
	modules/contrib/CMakeLists.txt
	modules/core/include/opencv2/core/version.hpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/columnsum.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_imgproc.cpp
	samples/gpu/CMakeLists.txt
This commit is contained in:
Roman Donchenko
2013-10-22 14:28:00 +04:00
parent 29f37fc130 a54d36bde8
commit 4036f6a3d0
153 changed files with 26590 additions and 9161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ocl/test/main.cpp
+21 -1
View File
@@ -55,4 +55,24 @@
#include "opencv2/ocl/private/opencl_dumpinfo.hpp"
CV_TEST_MAIN(".", dumpOpenCLDevice())
int LOOP_TIMES = 1;
void readLoopTimes(int argc, char ** argv)
{
const char * const command_line_keys =
"{ test_loop_times |1 |count of iterations per each test}"
"{h help |false |print help info}";
cv::CommandLineParser parser(argc, argv, command_line_keys);
if (parser.has("help"))
{
std::cout << "\nAvailable options besides google test option: \n";
parser.printMessage();
}
LOOP_TIMES = parser.get<int>("test_loop_times");
CV_Assert(LOOP_TIMES > 0);
}
CV_TEST_MAIN(".", dumpOpenCLDevice(),
readLoopTimes(argc, argv))