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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@
#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"
#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
{
public: