Merge pull request #75 from StevenPuttemans/fix_build_includes

fixing build with extra modules
10 years ago · 1ce1522712
parent e4cfe59a99 e7d9d119ef
commit 1ce1522712
2 changed files with 4 additions and 4 deletions
--- a/modules/xfeatures2d/perf/perf_precomp.hpp
+++ b/modules/xfeatures2d/perf/perf_precomp.hpp
@ -18,11 +18,11 @@
 #include "opencv2/opencv_modules.hpp"

 #ifdef HAVE_OPENCV_OCL
-#  include "opencv2/nonfree/ocl.hpp"
+#  include "opencv2/ocl.hpp"
 #endif

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

 #ifdef GTEST_CREATE_SHARED_LIBRARY
--- a/modules/xfeatures2d/test/test_precomp.hpp
+++ b/modules/xfeatures2d/test/test_precomp.hpp
@ -22,11 +22,11 @@
 #include "cvconfig.h"

 #ifdef HAVE_OPENCV_OCL
-#  include "opencv2/nonfree/ocl.hpp"
+#  include "opencv2/ocl.hpp"
 #endif

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

 #endif