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

pull/903/head
alex77git 12 years ago
parent 6e7b1ef252
commit bc59428b3a
  1. 12
      modules/highgui/src/window.cpp

@ -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
Mat img = _img.getMat(); CV_Assert(size.width>0 && size.height>0);
CvMat c_img = img; {
cvShowImage(winname.c_str(), &c_img); Mat img = _img.getMat();
CvMat c_img = 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);
} }

Loading…
Cancel
Save