generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CUDA warning fix/supporession for Android.

Browse Source
This commit is contained in:
Alexander Smorkalov 2013-12-24 12:23:50 +04:00
parent 4aa9f83100
commit 1e038e2837
3 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/core/src/gpumat.cpp
View File

@ -68,6 +68,19 @@
#endif
#ifdef ANDROID
# ifdef LOG_TAG
# undef LOG_TAG
# endif
# ifdef LOGE
# undef LOGE
# endif
# ifdef LOGD
# undef LOGD
# endif
# ifdef LOGI
# undef LOGI
# endif
# include <android/log.h>
# define LOG_TAG "OpenCV::CUDA"

2
modules/dynamicuda/CMakeLists.txt
View File

@ -5,7 +5,7 @@ endif()
set(the_description "Dynamic CUDA linkage")
add_definitions(-DUSE_CUDA)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wshadow)
ocv_module_include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/include")
set(OPENCV_MODULE_TYPE SHARED)
if (BUILD_FAT_JAVA_LIB)