Migrate GFTT to features module.

Author: asmorkalov

modules/cudaimgproc/perf/perf_gftt.cpp modules/cudafeatures2d/perf/perf_gftt.cppmodules/cudaimgproc/perf/perf_gftt.cpp renamed to modules/cudafeatures2d/perf/perf_gftt.cpp

@@ -9,6 +9,7 @@
 #define OPENCV_GAPI_IMGPROC_HPP
 
 #include <opencv2/imgproc.hpp>
+#include <opencv2/features.hpp>
 
 #include <utility> // std::tuple
 

modules/cudaimgproc/src/cuda/gftt.cu modules/cudafeatures2d/src/cuda/gftt.cumodules/cudaimgproc/src/cuda/gftt.cu renamed to modules/cudafeatures2d/src/cuda/gftt.cu

@@ -12,6 +12,7 @@
 #  include <opencv2/core.hpp>
 #  include <opencv2/core/utils/configuration.private.hpp>
 #  include <opencv2/imgproc.hpp>
+#  include <opencv2/features.hpp>
 #  include <opencv2/gapi/core.hpp>
 #  include <opencv2/gapi/imgproc.hpp>
 #endif //  !defined(GAPI_STANDALONE)

modules/cudaimgproc/src/gftt.cpp modules/cudafeatures2d/src/gftt.cppmodules/cudaimgproc/src/gftt.cpp renamed to modules/cudafeatures2d/src/gftt.cpp

@@ -11,6 +11,7 @@
 #include "../../include/opencv2/gapi/imgproc.hpp"
 
 #include <opencv2/imgproc.hpp>
+#include <opencv2/features.hpp>
 
 namespace opencv_test
 {

modules/cudaimgproc/test/test_gftt.cpp modules/cudafeatures2d/test/test_gftt.cppmodules/cudaimgproc/test/test_gftt.cpp renamed to modules/cudafeatures2d/test/test_gftt.cpp

@@ -1,2 +1,2 @@
 set(the_description "Optical Flow Algorithms")
-ocv_define_module(optflow opencv_core opencv_imgproc opencv_3d opencv_video opencv_ximgproc opencv_imgcodecs opencv_flann WRAP python)
+ocv_define_module(optflow opencv_core opencv_imgproc opencv_features opencv_3d opencv_video opencv_ximgproc opencv_imgcodecs opencv_flann WRAP python)

modules/gapi/include/opencv2/gapi/imgproc.hpp

@@ -45,6 +45,7 @@ the use of this software, even if advised of the possibility of such damage.
 #include <opencv2/optflow.hpp>
 #include <opencv2/video.hpp>
 #include <opencv2/imgproc.hpp>
+#include <opencv2/features.hpp>
 #include "opencv2/core/utility.hpp"
 #include "opencv2/core/private.hpp"
 #include "opencv2/core/ocl.hpp"

modules/gapi/src/precomp.hpp

@@ -44,6 +44,7 @@
 
 #include "opencv2/core.hpp"
 #include "opencv2/imgproc.hpp"
+#include "opencv2/features.hpp"
 #include "opencv2/stereo.hpp"
 
 #include "opencv2/xstereo.hpp"