Skip to content

O
opencv
Commit 98db8045 authored by Nishant Arora's avatar Nishant Arora Committed by Alexander Alekhin
Browse files
Options

Merge pull request #9210 from whizzzkid/fixing-cuda 

Fixing explicitly call download method for cuda::GpuMat object
parent a5b56846
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 0 deletions
modules/stitching/src/matchers.cpp
View file @ 98db8045
...@@ -51,6 +51,10 @@ using namespace cv::cuda; ...@@ -51,6 +51,10 @@ using namespace cv::cuda;
using xfeatures2d::SURF; using xfeatures2d::SURF;
#endif #endif
#ifdef HAVE_OPENCV_CUDAIMGPROC
# include "opencv2/cudaimgproc.hpp"
#endif
namespace { namespace {
struct DistIdxPair struct DistIdxPair
...@@ -583,7 +587,12 @@ void SurfFeaturesFinderGpu::find(InputArray image, ImageFeatures &features) ...@@ -583,7 +587,12 @@ void SurfFeaturesFinderGpu::find(InputArray image, ImageFeatures &features)
image_.upload(image); image_.upload(image);
ensureSizeIsEnough(image.size(), CV_8UC1, gray_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); cvtColor(image_, gray_image_, COLOR_BGR2GRAY);
#endif
surf_.nOctaves = num_octaves_; surf_.nOctaves = num_octaves_;
surf_.nOctaveLayers = num_layers_; surf_.nOctaveLayers = num_layers_;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment