mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-16 14:50:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9210 from whizzzkid/fixing-cuda

Browse Source 
Fixing explicitly call download method for cuda::GpuMat object
This commit is contained in:
Nishant Arora 2017-08-17 10:32:53 -06:00 committed by Alexander Alekhin
parent a5b5684670
commit 98db804541
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/stitching/src/matchers.cpp
View File

@ -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)
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_;