summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2016-10-07 13:29:32 -0700
committerMark Salyzyn <salyzyn@google.com>2016-10-07 14:01:04 -0700
commit2923347474df7d73d455d21e21d530b6306371cf (patch)
tree6d16b16715ea23811a59fc3052ceeedc139729d6
parentd37fe1bc1a1b808e35e173cace69eacf92b873e3 (diff)
downloadopencv-2923347474df7d73d455d21e21d530b6306371cf.tar.gz
define LOG_TAG before including android/log.h
Warning suppression Test: compile Bug: 31992412 Change-Id: Ibcc6e7f2c532b6d11403c0fb2a374977cd3bb2a3
-rw-r--r--otherlibs/highgui/cvcap_socket.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/otherlibs/highgui/cvcap_socket.cpp b/otherlibs/highgui/cvcap_socket.cpp
index 6e2f01e..96e4f0d 100644
--- a/otherlibs/highgui/cvcap_socket.cpp
+++ b/otherlibs/highgui/cvcap_socket.cpp
@@ -47,15 +47,15 @@
// capture video from a socket connection
//
+#define LOG_TAG "CVJNI"
+#define LOGV(...) __android_log_print(ANDROID_LOG_SILENT, LOG_TAG, __VA_ARGS__)
+
#include "_highgui.h"
#include <android/log.h>
#include <errno.h>
#include <netdb.h>
#include <unistd.h>
-#define LOGV(...) __android_log_print(ANDROID_LOG_SILENT, LOG_TAG, __VA_ARGS__)
-#define LOG_TAG "CVJNI"
-
#ifdef NDEBUG
#define CV_WARN(message)
#else