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

Merge commit 'b51a1a7d' (PR #895 from 2.4)

Browse Source 
Conflicts:
	modules/ocl/CMakeLists.txt
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/precomp.cpp
	modules/ocl/perf/precomp.hpp
This commit is contained in:
Roman Donchenko
2013-05-22 17:21:19 +04:00
parent 61567adc5d b51a1a7d15
commit 5e0e1fac87
24 changed files with 1192 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ocl/perf/perf_hough.cpp
View File

@@ -80,18 +80,18 @@ PERF_TEST_P(Size_Dp_MinDist, OCL_HoughCircles,
cv::circle(src, center, radius, cv::Scalar::all(255), -1);
}
cv::ocl::oclMat ocl_src(src);
cv::ocl::oclMat ocl_circles;
declare.time(10.0).iterations(25);
TEST_CYCLE()
{
cv::ocl::HoughCircles(ocl_src, ocl_circles, CV_HOUGH_GRADIENT, dp, minDist, cannyThreshold, votesThreshold, minRadius, maxRadius);
cv::ocl::HoughCircles(ocl_src, ocl_circles, HOUGH_GRADIENT, dp, minDist, cannyThreshold, votesThreshold, minRadius, maxRadius);
}
cv::Mat circles(ocl_circles);
cv::Mat circles(ocl_circles);
SANITY_CHECK(circles);
}