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/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"
--- 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
    ;
 }