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

Merge branch '2.4'

Browse Source
This commit is contained in:
Andrey Kamaev
2013-02-28 11:10:40 +04:00
parent c5e979ceb7 2be893a21e
commit 891d7da6ee
39 changed files with 6898 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gpu/test/test_hough.cpp
View File

@@ -130,7 +130,7 @@ GPU_TEST_P(HoughCircles, Accuracy)
const bool useRoi = GET_PARAM(2);
const float dp = 2.0f;
const float minDist = 10.0f;
const float minDist = 0.0f;
const int minRadius = 10;
const int maxRadius = 20;
const int cannyThreshold = 100;
@@ -163,7 +163,7 @@ GPU_TEST_P(HoughCircles, Accuracy)
{
cv::Vec3f gold = circles_gold[j];
if (std::fabs(cur[0] - gold[0]) < minDist && std::fabs(cur[1] - gold[1]) < minDist && std::fabs(cur[2] - gold[2]) < minDist)
if (std::fabs(cur[0] - gold[0]) < 5 && std::fabs(cur[1] - gold[1]) < 5 && std::fabs(cur[2] - gold[2]) < 5)
{
found = true;
break;