Merge pull request #21528 from sturkmen72:patch-5

3 years ago · 1f6444fbea
parent 9cab808c5d 439ef6447d
commit 1f6444fbea
1 changed files with 2 additions and 3 deletions
--- a/modules/highgui/src/window.cpp
+++ b/modules/highgui/src/window.cpp
@ -963,6 +963,8 @@ void cv::imshow( const String& winname, InputArray _img )
 {
    CV_TRACE_FUNCTION();

+    const Size size = _img.size();
+    CV_Assert(size.width>0 && size.height>0);
    {
        cv::AutoLock lock(cv::getWindowMutex());
        cleanupClosedWindows_();
@ -995,9 +997,7 @@ void cv::imshow( const String& winname, InputArray _img )
        }
    }

-    const Size size = _img.size();
 #ifndef HAVE_OPENGL
-    CV_Assert(size.width>0 && size.height>0);
    {
        Mat img = _img.getMat();
        CvMat c_img = cvMat(img);
@ -1005,7 +1005,6 @@ void cv::imshow( const String& winname, InputArray _img )
    }
 #else
    const double useGl = getWindowProperty(winname, WND_PROP_OPENGL);
-    CV_Assert(size.width>0 && size.height>0);

    if (useGl <= 0)
    {