From a8b25eaceacd9aa58022d5da72f92fcc98eb6c1b Mon Sep 17 00:00:00 2001 From: Dan Austin Date: Thu, 31 Mar 2016 13:41:08 -0700 Subject: Typecasting to disambiguate abs call in preparation for libcxx rebase. Change-Id: Id9f1e442a8b9c8988a8f99d6a6c4570874ff0299 --- cv/src/mycvHaarDetectObjects.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cv/src/mycvHaarDetectObjects.cpp b/cv/src/mycvHaarDetectObjects.cpp index 18b946c..739ef7a 100644 --- a/cv/src/mycvHaarDetectObjects.cpp +++ b/cv/src/mycvHaarDetectObjects.cpp @@ -457,9 +457,9 @@ isqrt(int x) unsigned int isqrt1(int number) { unsigned int n = 1; - unsigned int n1 = NEXT(n, number); + unsigned int n1 = NEXT(n, (unsigned int)number); - while(abs(n1 - n) > 1) { + while(abs((int)(n1 - n)) > 1) { n = n1; n1 = NEXT(n, number); } -- cgit v1.2.3