diff options
| author | Dan Austin <danielaustin@google.com> | 2016-04-12 22:12:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-12 22:12:20 +0000 |
| commit | cfe412b8850151d4dd6baa9e42ab7591b547166d (patch) | |
| tree | 41a1efcf4dfcdd7752ef3c62e3369a60202416b4 | |
| parent | 70a06ce5365b0248e0ad39df681d6c934d3618f3 (diff) | |
| parent | f6556f0b1c0a5ed13e7cbb2d7e05d2ca10d8811f (diff) | |
| download | opencv-cfe412b8850151d4dd6baa9e42ab7591b547166d.tar.gz | |
Merge "Typecasting to disambiguate abs call in preparation for libcxx rebase."
am: f6556f0
* commit 'f6556f0b1c0a5ed13e7cbb2d7e05d2ca10d8811f':
Typecasting to disambiguate abs call in preparation for libcxx rebase.
Change-Id: Ie2aa601c81dcde20228425c386f02b7a9924833e
| -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); } |