surf: fix OpenCL condition

alalek · alalek · commit 85a284c031c8 · 2017-09-28T19:03:27.000+03:00
diff --git a/modules/xfeatures2d/src/surf.cpp b/modules/xfeatures2d/src/surf.cpp
@@ -893,7 +893,7 @@ void SURF_Impl::detectAndCompute(InputArray _img, InputArray _mask,
     CV_Assert(_descriptors.needed() || !useProvidedKeypoints);
 
 #ifdef HAVE_OPENCL
-    if( ocl::useOpenCL() )
+    if( ocl::useOpenCL() && _img.isUMat())
     {
         SURF_OCL ocl_surf;
         UMat gpu_kpt;

Original file line number	Diff line number	Diff line change
`@@ -893,7 +893,7 @@ void SURF_Impl::detectAndCompute(InputArray _img, InputArray _mask,`
`893`	`893`	`CV_Assert(_descriptors.needed() \|\| !useProvidedKeypoints);`
`894`	`894`
`895`	`895`	`#ifdef HAVE_OPENCL`
`896`		`- if( ocl::useOpenCL() )`
	`896`	`+ if( ocl::useOpenCL() && _img.isUMat())`
`897`	`897`	`{`
`898`	`898`	`SURF_OCL ocl_surf;`
`899`	`899`	`UMat gpu_kpt;`