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

squash

Browse Source
This commit is contained in:
hoangviet1985
2015-11-20 15:03:32 -05:00
parent b3ac274617
commit 3e96b724c2
2 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,6 +44,7 @@
#include "precomp.hpp"
#include "opencl_kernels_core.hpp"
#include <limits>
#include <iostream>
namespace cv
{
@@ -1992,10 +1993,10 @@ int cv::solveCubic( InputArray _coeffs, OutputArray _roots )
double Qcubed = Q * Q * Q;
double d = Qcubed - R * R;
if( d >= 0 )
if( d > 0 )
{
double theta = acos(R / std::sqrt(Qcubed));
double sqrtQ = std::sqrt(Q);
double theta = acos(R / sqrt(Qcubed));
double sqrtQ = sqrt(Q);
double t0 = -2 * sqrtQ;
double t1 = theta * (1./3);
double t2 = a1 * (1./3);
@@ -2004,11 +2005,27 @@ int cv::solveCubic( InputArray _coeffs, OutputArray _roots )
x2 = t0 * cos(t1 + (4.*CV_PI/3)) - t2;
n = 3;
}
else if( d == 0 )
{
if(R >= 0)
{
x0 = -2*pow(R, 1./3) - a1/3;
x1 = pow(R, 1./3) - a1/3;
}
else
{
x0 = 2*pow(-R, 1./3) - a1/3;
x1 = -pow(-R, 1./3) - a1/3;
}
x2 = 0;
n = x0 == x1 ? 1 : 2;
x1 = x0 == x1 ? 0 : x1;
}
else
{
double e;
d = std::sqrt(-d);
e = std::pow(d + fabs(R), 0.333333333333);
d = sqrt(-d);
e = pow(d + fabs(R), 1./3);
if( R > 0 )
e = -e;
x0 = (e + Q / e) - a1 * (1./3);