|
|
@ -259,11 +259,11 @@ void cv::imshow( const string& winname, InputArray _img ) |
|
|
|
const Size size = _img.size(); |
|
|
|
const Size size = _img.size(); |
|
|
|
#ifndef HAVE_OPENGL |
|
|
|
#ifndef HAVE_OPENGL |
|
|
|
CV_Assert(size.width>0 && size.height>0); |
|
|
|
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); |
|
|
|
CV_Assert(size.width>0 && size.height>0); |
|
|
|