diff options
| author | Dan Austin <danielaustin@google.com> | 2016-04-12 22:15:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-12 22:15:10 +0000 |
| commit | 73227f2b3cb9ef7d14e446b77b002261f1bfec22 (patch) | |
| tree | c4f926c7229e9f374371a5cddd7f70b78a4a4bd9 | |
| parent | 3b08021e73ae94cbb5a180cf6861011c2083e3ea (diff) | |
| parent | cfe412b8850151d4dd6baa9e42ab7591b547166d (diff) | |
| download | opencv-73227f2b3cb9ef7d14e446b77b002261f1bfec22.tar.gz | |
Merge "Typecasting to disambiguate abs call in preparation for libcxx rebase." am: f6556f0
am: cfe412b
* commit 'cfe412b8850151d4dd6baa9e42ab7591b547166d':
Typecasting to disambiguate abs call in preparation for libcxx rebase.
Change-Id: I81afab71580c63c1a14ae7e7be0c22e68342824d
| -rw-r--r-- | cv/src/mycvHaarDetectObjects.cpp | 4 |
1 files 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); } |