potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #20584 from AleksandrPanov:fix_HoughCircles_ALT_dimensions

Browse Source 
Fix hough circles alt dimensions

* fix OutputArray _circles dimensions

* add houghcircles_alt test

* fix warnings

* add shape assert

* change asserts
This commit is contained in:
Alexander Panov
2021-08-24 22:29:40 +03:00
committed by GitHub
parent 65ef82a946
commit 6f4160c014
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/hough.cpp
+4 -2
View File
@@ -2301,14 +2301,16 @@ static void HoughCircles( InputArray _image, OutputArray _circles,
std::vector<Vec4f> cw(ncircles);
for( i = 0; i < ncircles; i++ )
cw[i] = GetCircle4f(circles[i]);
Mat(cw).copyTo(_circles);
if (ncircles > 0)
Mat(1, (int)ncircles, cv::traits::Type<Vec4f>::value, &cw[0]).copyTo(_circles);
}
else if( type == CV_32FC3 )
{
std::vector<Vec3f> cwow(ncircles);
for( i = 0; i < ncircles; i++ )
cwow[i] = GetCircle(circles[i]);
Mat(cwow).copyTo(_circles);
if (ncircles > 0)
Mat(1, (int)ncircles, cv::traits::Type<Vec3f>::value, &cwow[0]).copyTo(_circles);
}
else
CV_Error(Error::StsError, "Internal error");