summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-12-12 19:13:26 -0800
committerChih-Hung Hsieh <chh@google.com>2014-12-12 19:14:10 -0800
commit3b32d12f234ef200e148868a315d438237cd10e0 (patch)
tree5ce27c8fc93811f2f7f73c938269a847412246d2
parentfc68457d6ba93570aaebf0706a9b2567eaea27c1 (diff)
downloadopencv-3b32d12f234ef200e148868a315d438237cd10e0.tar.gz
Suppress clang -Wc++11-narrowing warnings.
Clang compiler gives warning to implicit conversions of literal structure fields, although the compiler generated implicit conversions are what we want in these cases. Change-Id: I4d2331e13352f4d963f81a20778ea09e9f308e0a
-rw-r--r--Android.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 6c71d0c..5fe3a68 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,6 +9,9 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/cxcore/include
LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%)
+# cxmathfuncs.cpp has implicit cast of int struct fields.
+LOCAL_CLANG_CFLAGS += -Wno-c++11-narrowing
+
LOCAL_SRC_FILES := \
cxcore/src/cxalloc.cpp \
cxcore/src/cxarithm.cpp \
@@ -234,6 +237,9 @@ LOCAL_SHARED_LIBRARIES += libjpeg
LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) -DHAVE_JPEG
+# grfmt_tiff.cpp has implicit cast of int struct fields.
+LOCAL_CLANG_CFLAGS += -Wno-c++11-narrowing
+
LOCAL_SRC_FILES := \
otherlibs/highgui/bitstrm.cpp \
otherlibs/highgui/grfmt_base.cpp \