提交 2dff9f4c 编写于 作者: A Alexander Alekhin

Merge pull request #11136 from tomoaki0705:fixCalib3dClang

...@@ -45,7 +45,8 @@ void solveQuartic(const double *factors, double *realRoots) { ...@@ -45,7 +45,8 @@ void solveQuartic(const double *factors, double *realRoots) {
complex<double> sqrt_2m = sqrt(static_cast<complex<double> >(-2 * p4 / 3 + t)); complex<double> sqrt_2m = sqrt(static_cast<complex<double> >(-2 * p4 / 3 + t));
double B_4A = -a3 / (4 * a4); double B_4A = -a3 / (4 * a4);
double complex1 = 4 * p4 / 3 + t; double complex1 = 4 * p4 / 3 + t;
#if defined(__clang__) && defined(__arm__) && __clang_major__ == 3 && __clang_minor__ <= 7 && !defined(__ANDROID__) #if defined(__clang__) && defined(__arm__) && (__clang_major__ == 3 || __clang_minor__ == 4) && !defined(__ANDROID__)
// details: https://github.com/opencv/opencv/issues/11135
// details: https://github.com/opencv/opencv/issues/11056 // details: https://github.com/opencv/opencv/issues/11056
complex<double> complex2 = 2 * q4; complex<double> complex2 = 2 * q4;
complex2 = complex<double>(complex2.real() / sqrt_2m.real(), 0); complex2 = complex<double>(complex2.real() / sqrt_2m.real(), 0);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册