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

added accuracy and performance tests

Browse Source
This commit is contained in:
Vladislav Vinogradov
2012-08-14 11:36:32 +04:00
parent 3703722a72
commit 1eefc69927
4 changed files with 156 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/gpu/src/hough.cpp
View File

@@ -74,7 +74,12 @@ void cv::gpu::HoughLinesGet(const GpuMat& accum, GpuMat& lines, float rho, float
CV_Assert(accum.type() == CV_32SC1);
lines.create(2, maxLines, CV_32FC2);
lines.cols = hough::linesGetResult_gpu(accum, lines.ptr<float2>(0), lines.ptr<int>(1), maxLines, threshold, theta, rho, doSort);
int count = hough::linesGetResult_gpu(accum, lines.ptr<float2>(0), lines.ptr<int>(1), maxLines, threshold, theta, rho, doSort);
if (count > 0)
lines.cols = std::min(count, maxLines);
else
lines.release();
}
void cv::gpu::HoughLines(const GpuMat& src, GpuMat& lines, float rho, float theta, int threshold, bool doSort, int maxLines)
@@ -91,6 +96,16 @@ void cv::gpu::HoughLines(const GpuMat& src, GpuMat& lines, GpuMat& accum, float
void cv::gpu::HoughLinesDownload(const GpuMat& d_lines, OutputArray h_lines_, OutputArray h_voices_)
{
if (d_lines.empty())
{
h_lines_.release();
if (h_voices_.needed())
h_voices_.release();
return;
}
CV_Assert(d_lines.rows == 2 && d_lines.type() == CV_32FC2);
h_lines_.create(1, d_lines.cols, CV_32FC2);
cv::Mat h_lines = h_lines_.getMat();
d_lines.row(0).download(h_lines);