Merge pull request opencv#9210 from whizzzkid/fixing-cuda

whizzzkid · alalek · commit 98db804541ac · 2017-08-17T16:32:53.000Z
Fixing explicitly call download method for cuda::GpuMat object
diff --git a/modules/stitching/src/matchers.cpp b/modules/stitching/src/matchers.cpp
@@ -51,6 +51,10 @@ using namespace cv::cuda;
 using xfeatures2d::SURF;
 #endif
 
+#ifdef HAVE_OPENCV_CUDAIMGPROC
+#  include "opencv2/cudaimgproc.hpp"
+#endif
+
 namespace {
 
 struct DistIdxPair
@@ -583,7 +587,12 @@ void SurfFeaturesFinderGpu::find(InputArray image, ImageFeatures &features)
     image_.upload(image);
 
     ensureSizeIsEnough(image.size(), CV_8UC1, gray_image_);
+
+#ifdef HAVE_OPENCV_CUDAIMGPROC
+    cv::cuda::cvtColor(image_, gray_image_, COLOR_BGR2GRAY);
+#else
     cvtColor(image_, gray_image_, COLOR_BGR2GRAY);
+#endif
 
     surf_.nOctaves = num_octaves_;
     surf_.nOctaveLayers = num_layers_;
