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

CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.

Browse Source
This commit is contained in:
Alexander Smorkalov 2013-12-27 11:18:10 +04:00
parent 41fd711ab0
commit c48777a1c3
7 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/OpenCVGenAndroidMK.cmake
View File

@ -70,7 +70,9 @@ if(ANDROID)
endif() endif()
# GPU module enabled separately # GPU module enabled separately
list(REMOVE_ITEM OPENCV_MODULES_CONFIGMAKE "gpu") list(REMOVE_ITEM OPENCV_MODULES_CONFIGMAKE "opencv_gpu")
list(REMOVE_ITEM OPENCV_MODULES_CONFIGMAKE "opencv_dynamicuda")
if(HAVE_opencv_gpu) if(HAVE_opencv_gpu)
set(OPENCV_HAVE_GPU_MODULE_CONFIGMAKE "on") set(OPENCV_HAVE_GPU_MODULE_CONFIGMAKE "on")
endif() endif()

7
modules/nonfree/CMakeLists.txt
View File

@ -4,4 +4,9 @@ endif()
set(the_description "Functionality with possible limitations on the use") set(the_description "Functionality with possible limitations on the use")
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
ocv_define_module(nonfree opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_gpu opencv_ocl) if (ENABLE_DYNAMIC_CUDA)
set(HAVE_CUDA FALSE)
ocv_define_module(nonfree opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_ocl)
else()
ocv_define_module(nonfree opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_gpu opencv_ocl)
endif()

2
modules/nonfree/include/opencv2/nonfree/gpu.hpp
View File

@ -45,7 +45,7 @@
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"
#if defined(HAVE_OPENCV_GPU) #if defined(HAVE_OPENCV_GPU) && !defined(ANDROID)
#include "opencv2/gpu/gpu.hpp" #include "opencv2/gpu/gpu.hpp"

2
modules/nonfree/src/cuda/surf.cu
View File

@ -42,7 +42,7 @@
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_GPU #if defined(HAVE_OPENCV_GPU) && !defined(ANDROID)
#include "opencv2/gpu/device/common.hpp" #include "opencv2/gpu/device/common.hpp"
#include "opencv2/gpu/device/limits.hpp" #include "opencv2/gpu/device/limits.hpp"

2
modules/nonfree/src/precomp.hpp
View File

@ -51,7 +51,7 @@
#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/core/internal.hpp" #include "opencv2/core/internal.hpp"
#if defined(HAVE_OPENCV_GPU) #if defined(HAVE_OPENCV_GPU) && !defined(ANDROID)
#include "opencv2/nonfree/gpu.hpp" #include "opencv2/nonfree/gpu.hpp"
#if defined(HAVE_CUDA) #if defined(HAVE_CUDA)

4
modules/nonfree/src/surf_gpu.cpp
View File

@ -42,7 +42,7 @@
#include "precomp.hpp" #include "precomp.hpp"
#if defined(HAVE_OPENCV_GPU) #if defined(HAVE_OPENCV_GPU) && !defined(ANDROID)
using namespace cv; using namespace cv;
using namespace cv::gpu; using namespace cv::gpu;
@ -422,4 +422,4 @@ void cv::gpu::SURF_GPU::releaseMemory()
#endif // !defined (HAVE_CUDA) #endif // !defined (HAVE_CUDA)
#endif // defined(HAVE_OPENCV_GPU) #endif // defined(HAVE_OPENCV_GPU) && !defined(ANDROID)

4
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
View File

@ -48,7 +48,7 @@
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"
#if defined(HAVE_OPENCV_NONFREE) && defined(HAVE_OPENCV_GPU) #if defined(HAVE_OPENCV_NONFREE) && defined(HAVE_OPENCV_GPU) && !defined(ANDROID)
#include "opencv2/nonfree/gpu.hpp" #include "opencv2/nonfree/gpu.hpp"
#endif #endif
@ -104,7 +104,7 @@ private:
}; };
#if defined(HAVE_OPENCV_NONFREE) && defined(HAVE_OPENCV_GPU) #if defined(HAVE_OPENCV_NONFREE) && defined(HAVE_OPENCV_GPU) && !defined(ANDROID)
class CV_EXPORTS SurfFeaturesFinderGpu : public FeaturesFinder class CV_EXPORTS SurfFeaturesFinderGpu : public FeaturesFinder
{ {
public: public: