Merge pull request #2224 from Nuzhny007:master

b56b3739 · Alexander Alekhin · 54e75b4a · 8f7e58ab · b56b3739
Commit b56b3739 authored Aug 15, 2019 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

super_resolution.cpp modules/superres/src/super_resolution.cpp +1 -1

No files found.
--- 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_)
    {