merged gpunonfree and nonfree module

2013-03-18 16:14:37 +04:00
parent 3b065e38be
commit 0a65f2f4af
40 changed files with 300 additions and 593 deletions
--- a/modules/stitching/include/opencv2/stitching/detail/matchers.hpp
+++ b/modules/stitching/include/opencv2/stitching/detail/matchers.hpp
@@ -47,8 +47,9 @@
 #include "opencv2/features2d/features2d.hpp"

 #include "opencv2/opencv_modules.hpp"
-#ifdef HAVE_OPENCV_GPUNONFREE
-#include "opencv2/gpunonfree/gpunonfree.hpp"
+
+#if defined(HAVE_OPENCV_NONFREE) && defined(HAVE_OPENCV_GPU)
+    #include "opencv2/nonfree/gpu.hpp"
 #endif

 namespace cv {
@@ -103,7 +104,7 @@ private:
 };


-#ifdef HAVE_OPENCV_GPUNONFREE
+#if defined(HAVE_OPENCV_NONFREE) && defined(HAVE_OPENCV_GPU)
 class CV_EXPORTS SurfFeaturesFinderGpu : public FeaturesFinder
 {
 public: