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/cpp/tutorial_code/gpu/gpu-basics-similarity/gpu-basics-similarity.cpp
+++ b/samples/cpp/tutorial_code/gpu/gpu-basics-similarity/gpu-basics-similarity.cpp
@@ -5,10 +5,7 @@
 #include <opencv2/core/utility.hpp>
 #include <opencv2/imgproc.hpp>// Image processing methods for the CPU
 #include <opencv2/highgui.hpp>// Read images
-
-// GPU structures and methods
-#include <opencv2/gpuarithm.hpp>
-#include <opencv2/gpufilters.hpp>
+#include <opencv2/gpu.hpp>        // GPU structures and methods

 using namespace std;
 using namespace cv;