adapted all nonfree header inclusion since it doesn't exist anymore as a module

2014-08-22 15:33:24 +02:00
parent f624f92e7a
commit 564a8ed208
12 changed files with 31 additions and 31 deletions
--- a/modules/stitching/include/opencv2/stitching/detail/matchers.hpp
+++ b/modules/stitching/include/opencv2/stitching/detail/matchers.hpp
@@ -48,8 +48,8 @@

 #include "opencv2/opencv_modules.hpp"

-#ifdef HAVE_OPENCV_NONFREE
-#  include "opencv2/nonfree/cuda.hpp"
+#ifdef HAVE_OPENCV_XFEATURES2D
+#  include "opencv2/xfeatures2d/cuda.hpp"
 #endif

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


-#ifdef HAVE_OPENCV_NONFREE
+#ifdef HAVE_OPENCV_XFEATURES2D
 class CV_EXPORTS SurfFeaturesFinderGpu : public FeaturesFinder
 {
 public: