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

This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.

modules/videostab/include/opencv2/videostab/global_motion.hpp

@@ -52,8 +52,8 @@
 #include "opencv2/videostab/motion_core.hpp"
 #include "opencv2/videostab/outlier_rejection.hpp"
 
-#ifdef HAVE_OPENCV_GPUIMGPROC
-#  include "opencv2/gpuimgproc.hpp"
+#ifdef HAVE_OPENCV_GPU
+  #include "opencv2/gpu.hpp"
 #endif
 
 namespace cv
@@ -199,8 +199,7 @@ private:
     std::vector<Point2f> pointsPrevGood_, pointsGood_;
 };
 
-#if defined(HAVE_OPENCV_GPUIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW)
-
+#ifdef HAVE_OPENCV_GPU
 class CV_EXPORTS KeypointBasedMotionEstimatorGpu : public ImageMotionEstimatorBase
 {
 public:
@@ -229,8 +228,7 @@ private:
     std::vector<Point2f> hostPointsPrevTmp_, hostPointsTmp_;
     std::vector<uchar> rejectionStatus_;
 };
-
-#endif // defined(HAVE_OPENCV_GPUIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW)
+#endif
 
 CV_EXPORTS Mat getMotion(int from, int to, const std::vector<Mat> &motions);
 

modules/videostab/include/opencv2/videostab/optical_flow.hpp

@@ -46,8 +46,8 @@
 #include "opencv2/core.hpp"
 #include "opencv2/opencv_modules.hpp"
 
-#ifdef HAVE_OPENCV_GPUOPTFLOW
-  #include "opencv2/gpuoptflow.hpp"
+#ifdef HAVE_OPENCV_GPU
+  #include "opencv2/gpu.hpp"
 #endif
 
 namespace cv
@@ -99,8 +99,7 @@ public:
             OutputArray status, OutputArray errors);
 };
 
-#ifdef HAVE_OPENCV_GPUOPTFLOW
-
+#ifdef HAVE_OPENCV_GPU
 class CV_EXPORTS SparsePyrLkOptFlowEstimatorGpu
         : public PyrLkOptFlowEstimatorBase, public ISparseOptFlowEstimator
 {
@@ -136,7 +135,6 @@ private:
     gpu::PyrLKOpticalFlow optFlowEstimator_;
     gpu::GpuMat frame0_, frame1_, flowX_, flowY_, errors_;
 };
-
 #endif
 
 } // namespace videostab

modules/videostab/include/opencv2/videostab/wobble_suppression.hpp

@@ -45,10 +45,13 @@
 
 #include <vector>
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpumat.hpp"
 #include "opencv2/videostab/global_motion.hpp"
 #include "opencv2/videostab/log.hpp"
 
+#ifdef HAVE_OPENCV_GPU
+  #include "opencv2/gpu.hpp"
+#endif
+
 namespace cv
 {
 namespace videostab