Android camera: fix logging macro part 2

This commit is contained in:
Andrey Kamaev 2012-08-28 14:44:46 +04:00
parent 396e4517ff
commit 7744b1d600

View File

@ -48,15 +48,14 @@
#include <android/log.h> #include <android/log.h>
#include <camera_activity.hpp> #include <camera_activity.hpp>
//#if !defined(LOGD) && !defined(LOGI) && !defined(LOGE) #undef LOG_TAG
#undef LOGD #undef LOGD
#undef LOGE #undef LOGE
#undef LOGI #undef LOGI
#define LOG_TAG "CV_CAP" #define LOG_TAG "OpenCV::camera"
#define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)) #define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__))
#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)) #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__))
#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)) #define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__))
//#endif
class HighguiAndroidCameraActivity; class HighguiAndroidCameraActivity;