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

d700cc60 · Roman Donchenko · OpenCV Buildbot · df279150 · fa70f952 · d700cc60
Commit d700cc60 authored Oct 18, 2013 by Roman Donchenko Committed by OpenCV Buildbot Oct 18, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

window_w32.cpp modules/highgui/src/window_w32.cpp +1 -6

No files found.
--- a/modules/highgui/src/window_w32.cpp
+++ b/modules/highgui/src/window_w32.cpp
@@ -1087,12 +1087,7 @@ cvShowImage( const char* name, const CvArr* arr )
    window = icvFindWindowByName(name);
    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);
    }