Revert "Revert "Merge pull request #836 from jet47:gpu-modules""

2013-06-04 13:32:35 +04:00
parent 10340fe234
commit 3eeaa9189c
472 changed files with 29894 additions and 23019 deletions
--- a/samples/gpu/bgfg_segm.cpp
+++ b/samples/gpu/bgfg_segm.cpp
@@ -6,6 +6,12 @@
 #include "opencv2/gpu.hpp"
 #include "opencv2/highgui.hpp"

+#include "opencv2/opencv_modules.hpp"
+
+#ifdef HAVE_OPENCV_NONFREE
+#  include "opencv2/nonfree/gpu.hpp"
+#endif
+
 using namespace std;
 using namespace cv;
 using namespace cv::gpu;