diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-11-10 01:11:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-10 01:11:38 +0000 |
| commit | 573b2b325140470d4ce0721bb3203fb722c3dd6f (patch) | |
| tree | e4f52089b72f321689d2041e63d3d7464816828d | |
| parent | 899de9664941820eaae3f23555f8b3b506a6087f (diff) | |
| parent | 6dfd058c4be1a9140281363db77349c99d43dffa (diff) | |
| download | opencv-573b2b325140470d4ce0721bb3203fb722c3dd6f.tar.gz | |
Merge "C++17 compatibility."HEADandroid-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-n-iot-release-ihome-igv1oreo-mr1-iot-releasenougat-iot-releasemastermain
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | cv/src/mycvHaarDetectObjects.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -70,7 +70,6 @@ LOCAL_CFLAGS += \ -Wall -Werror \ -Wno-implicit-fallthrough \ -Wno-sizeof-pointer-memaccess \ - -Wno-deprecated-register \ -Wno-sign-compare \ -Wno-parentheses-equality \ -Wno-unused-variable diff --git a/cv/src/mycvHaarDetectObjects.cpp b/cv/src/mycvHaarDetectObjects.cpp index 739ef7a..12d111c 100644 --- a/cv/src/mycvHaarDetectObjects.cpp +++ b/cv/src/mycvHaarDetectObjects.cpp @@ -432,7 +432,7 @@ isqrt(int x) * whether (op - res - one) underflowed. */ - register int op, res, one; + int op, res, one; op = x; res = 0; |