commit 70a06ce5365b0248e0ad39df681d6c934d3618f3
author Chih-Hung Hsieh <chh@google.com> Tue Dec 16 18:43:07 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 16 18:43:08 2014 +0000
tree 5ce27c8fc93811f2f7f73c938269a847412246d2
parent fc68457d6ba93570aaebf0706a9b2567eaea27c1
parent 3b32d12f234ef200e148868a315d438237cd10e0

Merge "Suppress clang -Wc++11-narrowing warnings."

Android.mk

diff --git a/Android.mk b/Android.mk
index 6c71d0c..5fe3a68 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,6 +9,9 @@
         $(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_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 \