diff options
author | Mark Salyzyn <salyzyn@google.com> | 2016-10-10 22:41:35 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-10-10 22:41:35 +0000 |
commit | d5dd79690eaa95097ce5601961f058f248cdf0c1 (patch) | |
tree | 697716e5257c46ca1bf30432cb6abe289910e9c6 | |
parent | 124398c834bfce6b4a6e82ac942179b03c90ed6f (diff) | |
parent | bf14626be306849488aacc171a8e85a0dead645b (diff) | |
download | opencv-d5dd79690eaa95097ce5601961f058f248cdf0c1.tar.gz |
Merge "define LOG_TAG before including android/log.h" am: 35dcc67558 am: 6f5dc6b03d am: ea6bae3f7c
am: bf14626be3
Change-Id: I22118554f60130018dc4144e64d12492e674828b
-rw-r--r-- | otherlibs/highgui/cvcap_socket.cpp | 6 |
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 |