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

diff --git a/modules/stitching/include/opencv2/stitching/detail/matchers.hpp b/modules/stitching/include/opencv2/stitching/detail/matchers.hpp
index d87a1fff4464ab34f722b493d33d491e563daf35..c0fb5d9d5a15deb440fc9ea7a534d0bf69bb3079 100644 (file)
--- 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:

diff --git a/modules/stitching/src/matchers.cpp b/modules/stitching/src/matchers.cpp
index a512e352549d772c79221a63ae9862f2c17f6202..45e97257fd826f28799fa49eb1a46e80f0229edf 100644 (file)
--- a/modules/stitching/src/matchers.cpp
+++ b/modules/stitching/src/matchers.cpp
@@ -46,10 +46,10 @@ using namespace cv;
 using namespace cv::detail;
 using namespace cv::cuda;
 
-#ifdef HAVE_OPENCV_NONFREE
-#include "opencv2/nonfree.hpp"
+#ifdef HAVE_OPENCV_XFEATURES2D
+#include "opencv2/xfeatures2d.hpp"
 
-static bool makeUseOfNonfree = initModule_nonfree();
+static bool makeUseOfNonfree = initModule_xfeatures2d();
 #endif
 
 namespace {
@@ -443,7 +443,7 @@ void OrbFeaturesFinder::find(InputArray image, ImageFeatures &features)
     }
 }
 
-#ifdef HAVE_OPENCV_NONFREE
+#ifdef HAVE_OPENCV_XFEATURES2D
 SurfFeaturesFinderGpu::SurfFeaturesFinderGpu(double hess_thresh, int num_octaves, int num_layers,
                                              int num_octaves_descr, int num_layers_descr)
 {

diff --git a/modules/stitching/src/precomp.hpp b/modules/stitching/src/precomp.hpp
index 759d03635dfe56826b72aa6baf2109c529212ff2..c70d9f9a45589dfa1bf393deba96f5eb2becfb89 100644 (file)
--- a/modules/stitching/src/precomp.hpp
+++ b/modules/stitching/src/precomp.hpp
@@ -87,8 +87,8 @@
 #  include "opencv2/cuda.hpp"
 #endif
 
-#ifdef HAVE_OPENCV_NONFREE
-#  include "opencv2/nonfree/cuda.hpp"
+#ifdef HAVE_OPENCV_XFEATURES2D
+#  include "opencv2/xfeatures2d/cuda.hpp"
 #endif
 
 #include "../../imgproc/src/gcgraph.hpp"

diff --git a/modules/stitching/src/stitcher.cpp b/modules/stitching/src/stitcher.cpp
index 0d4623af8f155336af940728dea1e0b122805971..f3bbe38c327495113dd2bd3a76b192010daccda2 100644 (file)
--- a/modules/stitching/src/stitcher.cpp
+++ b/modules/stitching/src/stitcher.cpp
@@ -59,7 +59,7 @@ Stitcher Stitcher::createDefault(bool try_use_gpu)
 #ifdef HAVE_OPENCV_CUDA
     if (try_use_gpu && cuda::getCudaEnabledDeviceCount() > 0)
     {
-#ifdef HAVE_OPENCV_NONFREE
+#ifdef HAVE_OPENCV_XFEATURES2D
         stitcher.setFeaturesFinder(makePtr<detail::SurfFeaturesFinderGpu>());
 #else
         stitcher.setFeaturesFinder(makePtr<detail::OrbFeaturesFinder>());
@@ -70,7 +70,7 @@ Stitcher Stitcher::createDefault(bool try_use_gpu)
     else
 #endif
     {
-#ifdef HAVE_OPENCV_NONFREE
+#ifdef HAVE_OPENCV_XFEATURES2D
         stitcher.setFeaturesFinder(makePtr<detail::SurfFeaturesFinder>());
 #else
         stitcher.setFeaturesFinder(makePtr<detail::OrbFeaturesFinder>());

diff --git a/modules/stitching/test/test_matchers.cpp b/modules/stitching/test/test_matchers.cpp
index c7f068b7fe7d6fd03c4b15b8bec4d5732e6f4c10..6deed7b75f4433545addf83cc0aa4de1203f53cb 100644 (file)
--- a/modules/stitching/test/test_matchers.cpp
+++ b/modules/stitching/test/test_matchers.cpp
@@ -42,7 +42,7 @@
 #include "test_precomp.hpp"
 #include "opencv2/opencv_modules.hpp"
 
-#ifdef HAVE_OPENCV_NONFREE
+#ifdef HAVE_OPENCV_XFEATURES2D
 
 using namespace cv;
 using namespace std;

diff --git a/modules/world/src/precomp.hpp b/modules/world/src/precomp.hpp
index a46e470b43ac876e20f0652d5b5054bee6e2750d..4e8ab39751465667d15c3da40275e33b3b76e6ad 100644 (file)
--- a/modules/world/src/precomp.hpp
+++ b/modules/world/src/precomp.hpp
@@ -53,8 +53,8 @@
 #ifdef HAVE_OPENCV_FEATURES2D
 #include "opencv2/features2d.hpp"
 #endif
-#ifdef HAVE_OPENCV_NONFREE
-#include "opencv2/nonfree.hpp"
+#ifdef HAVE_OPENCV_XFEATURES2D
+#include "opencv2/xfeatures2d/nonfree.hpp"
 #endif
 
 #include "opencv2/world.hpp"

diff --git a/modules/world/src/world_init.cpp b/modules/world/src/world_init.cpp
index 685e44bdf7f64796a14806bcb20e53a095f48d1c..c8b31ebcade190c1b1c8229ac63ea36b1d82d009 100644 (file)
--- a/modules/world/src/world_init.cpp
+++ b/modules/world/src/world_init.cpp
@@ -51,8 +51,8 @@ bool cv::initAll()
 #ifdef HAVE_OPENCV_FEATURES2D
     && initModule_features2d()
 #endif
-#ifdef HAVE_OPENCV_NONFREE
-    && initModule_nonfree()
+#ifdef HAVE_OPENCV_XFEATURES2D
+    && initModule_xfeatures2d()
 #endif
     ;
 }

diff --git a/samples/cpp/stitching_detailed.cpp b/samples/cpp/stitching_detailed.cpp
index b6fd1e91b80773367c70bfd983661f18c10a5801..0d9b4a683ca84de51b3ee0a2a8a02a25ed16337f 100644 (file)
--- a/samples/cpp/stitching_detailed.cpp
+++ b/samples/cpp/stitching_detailed.cpp
@@ -384,7 +384,7 @@ int main(int argc, char* argv[])
     Ptr<FeaturesFinder> finder;
     if (features_type == "surf")
     {
-#ifdef HAVE_OPENCV_NONFREE
+#ifdef HAVE_OPENCV_XFEATURES2D
         if (try_cuda && cuda::getCudaEnabledDeviceCount() > 0)
             finder = makePtr<SurfFeaturesFinderGpu>();
         else

diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt
index 09952955446bd2832f52f632a5c6c60091e5acdb..65fe4ef8cfd38a30c56dd4da499da21505fa86da 100644 (file)
--- a/samples/gpu/CMakeLists.txt
+++ b/samples/gpu/CMakeLists.txt
@@ -19,8 +19,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
     "${OpenCV_SOURCE_DIR}/modules/gpu/src/nvidia/core"
     )
 
-  if(HAVE_opencv_nonfree)
-    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/nonfree/include")
+  if(HAVE_opencv_xfeatures2d)
+    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/xfeatures2d/include")
   endif()
 
   if(HAVE_opencv_cudacodec)
@@ -52,8 +52,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
       ocv_target_link_libraries(${the_target} ${CUDA_CUDA_LIBRARY})
     endif()
 
-    if(HAVE_opencv_nonfree)
-      ocv_target_link_libraries(${the_target} opencv_nonfree)
+    if(HAVE_opencv_xfeatures2d)
+      ocv_target_link_libraries(${the_target} opencv_xfeatures2d)
     endif()
     if(HAVE_opencv_cudacodec)
       ocv_target_link_libraries(${the_target} opencv_cudacodec)

diff --git a/samples/gpu/performance/CMakeLists.txt b/samples/gpu/performance/CMakeLists.txt
index 07125c2eb2723f90ed6b945d187f83ab887f5c67..0b256633ce28a8e9d6aed6a119d9b87b192511c7 100644 (file)
--- a/samples/gpu/performance/CMakeLists.txt
+++ b/samples/gpu/performance/CMakeLists.txt
@@ -3,15 +3,15 @@ set(the_target "example_gpu_performance")
 file(GLOB sources "performance/*.cpp")
 file(GLOB headers "performance/*.h")
 
-if(HAVE_opencv_nonfree)
-  ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/nonfree/include")
+if(HAVE_opencv_xfeatures2d)
+  ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/xfeatures2d/include")
 endif()
 
 add_executable(${the_target} ${sources} ${headers})
 ocv_target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_CUDA_SAMPLES_REQUIRED_DEPS})
 
-if(HAVE_opencv_nonfree)
-  ocv_target_link_libraries(${the_target} opencv_nonfree)
+if(HAVE_opencv_xfeatures2d)
+  ocv_target_link_libraries(${the_target} opencv_xfeatures2d)
 endif()
 
 set_target_properties(${the_target} PROPERTIES

diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp
index 3ca9e6a72fb02d1ba1e897f4d6dbe1b58b6fbb38..4d6f778a48d8ff7903d2bab7d67fec04d401aaee 100644 (file)
--- a/samples/gpu/performance/tests.cpp
+++ b/samples/gpu/performance/tests.cpp
@@ -17,9 +17,9 @@
 
 #include "opencv2/opencv_modules.hpp"
 
-#ifdef HAVE_OPENCV_NONFREE
-#include "opencv2/nonfree/cuda.hpp"
-#include "opencv2/nonfree/nonfree.hpp"
+#ifdef HAVE_OPENCV_XFEATURES2D
+#include "opencv2/xfeatures2d/cuda.hpp"
+#include "opencv2/xfeatures2d/nonfree.hpp"
 #endif
 
 using namespace std;
@@ -274,7 +274,7 @@ TEST(meanShift)
     }
 }
 
-#ifdef HAVE_OPENCV_NONFREE
+#ifdef HAVE_OPENCV_XFEATURES2D
 
 TEST(SURF)
 {

diff --git a/samples/gpu/surf_keypoint_matcher.cpp b/samples/gpu/surf_keypoint_matcher.cpp
index c267dd47212ffdc944eae45f965183a87c28c730..21cbc9d61aed71d6b6273f647abc573c51f2accd 100644 (file)
--- a/samples/gpu/surf_keypoint_matcher.cpp
+++ b/samples/gpu/surf_keypoint_matcher.cpp
@@ -2,13 +2,13 @@
 
 #include "opencv2/opencv_modules.hpp"
 
-#ifdef HAVE_OPENCV_NONFREE
+#ifdef HAVE_OPENCV_XFEATURES2D
 
 #include "opencv2/core/core.hpp"
 #include "opencv2/features2d/features2d.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/cudafeatures2d.hpp"
-#include "opencv2/nonfree/cuda.hpp"
+#include "opencv2/xfeatures2d/cuda.hpp"
 
 using namespace std;
 using namespace cv;