Merge pull request #1641 from jet47:imshow-opengl-fix

This commit is contained in:
Roman Donchenko 2013-10-18 18:22:59 +04:00 committed by OpenCV Buildbot
commit d700cc60be

View File

@ -1087,12 +1087,7 @@ cvShowImage( const char* name, const CvArr* arr )
window = icvFindWindowByName(name); window = icvFindWindowByName(name);
if(!window) if(!window)
{ {
#ifndef HAVE_OPENGL
cvNamedWindow(name, CV_WINDOW_AUTOSIZE); cvNamedWindow(name, CV_WINDOW_AUTOSIZE);
#else
cvNamedWindow(name, CV_WINDOW_AUTOSIZE | CV_WINDOW_OPENGL);
#endif
window = icvFindWindowByName(name); window = icvFindWindowByName(name);
} }