diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2016-07-07 22:00:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-07 22:00:52 +0000 |
| commit | 1785798e08c93cdfb9d3f26361aec777c59d51c9 (patch) | |
| tree | 6e000c228700e7f0df6b2bbb86b3c90b4f1af5e0 | |
| parent | 73227f2b3cb9ef7d14e446b77b002261f1bfec22 (diff) | |
| parent | 1c46dddf52d6825cb100cb8f749ea4906d63b88f (diff) | |
| download | opencv-1785798e08c93cdfb9d3f26361aec777c59d51c9.tar.gz | |
Merge \\\"Suppress warnings in external/opencv\\\" am: 37a00df8cc am: d37fe1bc1a
am: 1c46dddf52
Change-Id: I4b001b6df53acc1da53da37b9f6ffb547dfb041c
| -rw-r--r-- | Android.mk | 19 | ||||
| -rw-r--r-- | cvaux/src/cvtexture.cpp | 4 |
2 files changed, 21 insertions, 2 deletions
@@ -9,6 +9,8 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/cxcore/include LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) +LOCAL_CFLAGS += -Wno-unused-parameter + # cxmathfuncs.cpp has implicit cast of int struct fields. LOCAL_CLANG_CFLAGS += -Wno-c++11-narrowing @@ -59,6 +61,11 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/cv/include LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) +LOCAL_CFLAGS += -Wno-sizeof-pointer-memaccess \ + -Wno-deprecated-register \ + -Wno-sign-compare \ + -Wno-parentheses-equality + LOCAL_SRC_FILES := \ cv/src/cvaccum.cpp \ cv/src/cvadapthresh.cpp \ @@ -140,6 +147,13 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/cvaux/include LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) +LOCAL_CFLAGS += -Wno-unused-parameter \ + -Wno-logical-op-parentheses \ + -Wno-dangling-else \ + -Wno-missing-field-initializers \ + -Wno-self-assign \ + -Wno-sizeof-pointer-memaccess + LOCAL_SRC_FILES := \ cvaux/src/camshift.cpp \ cvaux/src/cvaux.cpp \ @@ -203,6 +217,9 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/ml/include LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) +LOCAL_CFLAGS += -Wno-logical-op-parentheses \ + -Wno-tautological-compare + LOCAL_SRC_FILES := \ ml/src/ml.cpp \ ml/src/mlann_mlp.cpp \ @@ -237,6 +254,8 @@ LOCAL_SHARED_LIBRARIES += libjpeg LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) -DHAVE_JPEG +LOCAL_CFLAGS += -Wno-unused-parameter -Wno-logical-op-parentheses + # grfmt_tiff.cpp has implicit cast of int struct fields. LOCAL_CLANG_CFLAGS += -Wno-c++11-narrowing diff --git a/cvaux/src/cvtexture.cpp b/cvaux/src/cvtexture.cpp index 434baaf..0229161 100644 --- a/cvaux/src/cvtexture.cpp +++ b/cvaux/src/cvtexture.cpp @@ -515,8 +515,8 @@ icvCreateGLCMDescriptors_AllowDoubleNest( CvGLCM* destGLCM, int matrixIndex ) correlationStdDeviation += (actualSideLoop1-correlationMean) * (actualSideLoop1-correlationMean) * sideEntryValueSum; } - HXY1 =- HXY1; - HXY2 =- HXY2; + HXY1 = -HXY1; + HXY2 = -HXY2; descriptors[ CV_GLCMDESC_CORRELATIONINFO1 ] = ( HXY - HXY1 ) / ( correlationMean ); descriptors[ CV_GLCMDESC_CORRELATIONINFO2 ] = sqrt( 1.0 - exp( -2.0 * (HXY2 - HXY ) ) ); |