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

This reverts commit fba72cb60d, reversing changes made to 02131ffb62.
2013-04-18 15:03:50 +04:00
parent fba72cb60d
commit 416fb50594
472 changed files with 22945 additions and 29803 deletions
--- a/samples/gpu/bgfg_segm.cpp
+++ b/samples/gpu/bgfg_segm.cpp
@@ -6,12 +6,6 @@
 #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;