Applied the patch, received from akamaev. Also made some changes in CMake files to fix Android camera issue.

2012-02-09 15:02:21 +00:00
parent 7c03b301c1
commit 3ef5bfa185
3 changed files with 7 additions and 11 deletions
@@ -210,7 +210,8 @@ if(APPLE)
    endif()
 endif(APPLE)

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