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

Fixed incorrectly merged patch.

Browse Source
This commit is contained in:
Andrey Kamaev
2012-02-09 20:22:36 +00:00
parent 3ef5bfa185
commit 68a54e7f3c
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/androidcamera/CMakeLists.txt
View File

@@ -20,12 +20,14 @@ if(ANDROID_SOURCE_TREE)
endif()
if(NOT "${ANDROID_VERSION}" STREQUAL "")
SET(BUILD_ANDROID_CAMERA_WRAPPER ON)
set(ANDROID_VERSION "${ANDROID_VERSION}" CACHE INTERNAL "Version of Android source tree")
endif()
endif()
set(BUILD_ANDROID_CAMERA_WRAPPER ${BUILD_ANDROID_CAMERA_WRAPPER} CACHE INTERNAL "Build new wrapper for Android")
MARK_AS_ADVANCED(ANDROID_SOURCE_TREE)
# process wrapper libs
if (BUILD_ANDROID_CAMERA_WRAPPER)
if(BUILD_ANDROID_CAMERA_WRAPPER)
add_subdirectory(camera_wrapper)
else()
file(GLOB camera_wrappers "${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/lib/${ANDROID_NDK_ABI_NAME}/libnative_camera_r*.so")

3
modules/highgui/CMakeLists.txt
View File

@@ -210,8 +210,7 @@ if(APPLE)
endif()
endif(APPLE)
set(OPENCV_MODULE_ANDROIDCAMERA "ON") #TODO: fix it
if(HAVE_opencv_androidcamera AND OPENCV_MODULE_ANDROIDCAMERA)
if(HAVE_opencv_androidcamera)
set(highgui_srcs ${highgui_srcs} src/cap_android.cpp)
add_definitions(-DHAVE_ANDROID_NATIVE_CAMERA)#TODO: remove this line
endif()