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 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-10-05 15:45:31 +00:00
parent c54753c185 98fc098216
commit 626bfbf309
23 changed files with 222 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/linefit.cpp
+15 -4
View File
@@ -408,8 +408,14 @@ static void fitLine2D( const Point2f * points, int count, int dist,
}
/* calculate distances */
err = calcDist2D( points, count, _line, r );
if( err < EPS )
break;
if (err < min_err)
{
min_err = err;
memcpy(line, _line, 4 * sizeof(line[0]));
if (err < EPS)
break;
}
/* calculate weights */
if( calc_weights )
@@ -550,8 +556,13 @@ static void fitLine3D( Point3f * points, int count, int dist,
}
/* calculate distances */
err = calcDist3D( points, count, _line, r );
//if( err < FLT_EPSILON*count )
// break;
if (err < min_err)
{
min_err = err;
memcpy(line, _line, 6 * sizeof(line[0]));
if (err < EPS)
break;
}
/* calculate weights */
if( calc_weights )