Merge pull request #2224 from Nuzhny007:master

alalek · alalek · commit b56b3739c830 · 2019-08-15T11:20:22.000Z
diff --git a/modules/superres/src/super_resolution.cpp b/modules/superres/src/super_resolution.cpp
@@ -63,7 +63,7 @@ void cv::superres::SuperResolution::nextFrame(OutputArray frame)
 {
     CV_INSTRUMENT_REGION();
 
-    isUmat_ = frame.isUMat();
+    isUmat_ = frame.isUMat() && cv::ocl::useOpenCL();
 
     if (firstCall_)
     {

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ void cv::superres::SuperResolution::nextFrame(OutputArray frame)`
`63`	`63`	`{`
`64`	`64`	`CV_INSTRUMENT_REGION();`
`65`	`65`
`66`		`- isUmat_ = frame.isUMat();`
	`66`	`+ isUmat_ = frame.isUMat() && cv::ocl::useOpenCL();`
`67`	`67`
`68`	`68`	`if (firstCall_)`
`69`	`69`	`{`