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

correct 2 bugs in cvSolveCubic (linear and quadratic cases: tickets #525 and #364)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-11-07 19:23:48 +00:00
parent d81e940ccc
commit 402ef4c9cb
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/core/src/mathfuncs.cpp
View File

@ -2285,7 +2285,7 @@ cvSolveCubic( const CvMat* coeffs, CvMat* roots )
else else
{ {
// linear equation // linear equation
x0 = a3/a2; x0 = -a3/a2;
n = 1; n = 1;
} }
} }
@ -2296,9 +2296,18 @@ cvSolveCubic( const CvMat* coeffs, CvMat* roots )
if( d >= 0 ) if( d >= 0 )
{ {
d = sqrt(d); d = sqrt(d);
double q = (-a2 + (a2 < 0 ? -d : d)) * 0.5; double q1 = (-a2 + d) * 0.5;
x0 = q / a1; double q2 = (a2 + d) * -0.5;
x1 = a3 / q; if( fabs(q1) > fabs(q2) )
{
x0 = q1 / a1;
x1 = a3 / q1;
}
else
{
x0 = q2 / a1;
x1 = a3 / q2;
}
n = d > 0 ? 2 : 1; n = d > 0 ? 2 : 1;
} }
} }