From: Tomoaki Teshima Date: Thu, 22 Mar 2018 09:28:47 +0000 (+0900) Subject: apply the workaround to correct range X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1^2~720^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08e0c69dbf6ace1069998f0503d1449f17010073;p=platform%2Fupstream%2Fopencv.git apply the workaround to correct range --- diff --git a/modules/calib3d/src/ap3p.cpp b/modules/calib3d/src/ap3p.cpp index c22a2db..5a7fc60 100644 --- a/modules/calib3d/src/ap3p.cpp +++ b/modules/calib3d/src/ap3p.cpp @@ -45,7 +45,8 @@ void solveQuartic(const double *factors, double *realRoots) { complex sqrt_2m = sqrt(static_cast >(-2 * p4 / 3 + t)); double B_4A = -a3 / (4 * a4); 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 complex complex2 = 2 * q4; complex2 = complex(complex2.real() / sqrt_2m.real(), 0);