diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-12-16 18:43:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-16 18:43:08 +0000 |
| commit | 70a06ce5365b0248e0ad39df681d6c934d3618f3 (patch) | |
| tree | 5ce27c8fc93811f2f7f73c938269a847412246d2 | |
| parent | fc68457d6ba93570aaebf0706a9b2567eaea27c1 (diff) | |
| parent | 3b32d12f234ef200e148868a315d438237cd10e0 (diff) | |
| download | opencv-70a06ce5365b0248e0ad39df681d6c934d3618f3.tar.gz | |
Merge "Suppress clang -Wc++11-narrowing warnings."android-wear-5.1.1_r1android-wear-5.1.0_r1android-n-preview-2android-n-preview-1android-m-preview-2android-m-preview-1android-m-previewandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1master-soongmarshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-release
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -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 \ |