generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug #2966, insert CV_Assert(size.width>0 && size.height>0); in imshow()

Browse Source
This commit is contained in:
alex77git
2013-05-20 02:28:40 +02:00
parent 6e7b1ef252
commit bc59428b3a
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/highgui/src/window.cpp
View File

@@ -256,12 +256,17 @@ namespace
void cv::imshow( const string& winname, InputArray _img ) void cv::imshow( const string& winname, InputArray _img )
{ {
const Size size = _img.size();
#ifndef HAVE_OPENGL #ifndef HAVE_OPENGL
CV_Assert(size.width>0 && size.height>0);
{
Mat img = _img.getMat(); Mat img = _img.getMat();
CvMat c_img = img; CvMat c_img = img;
cvShowImage(winname.c_str(), &c_img); cvShowImage(winname.c_str(), &c_img);
}
#else #else
const double useGl = getWindowProperty(winname, WND_PROP_OPENGL); const double useGl = getWindowProperty(winname, WND_PROP_OPENGL);
CV_Assert(size.width>0 && size.height>0);
if (useGl <= 0) if (useGl <= 0)
{ {
@@ -275,7 +280,6 @@ void cv::imshow( const string& winname, InputArray _img )
if (autoSize > 0) if (autoSize > 0)
{ {
Size size = _img.size();
resizeWindow(winname, size.width, size.height); resizeWindow(winname, size.width, size.height);
} }