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

Merge pull request #373 from ilysenkov:bugfix_2440

Browse Source
This commit is contained in:
Andrey Kamaev 2013-01-30 19:37:16 +04:00 committed by OpenCV Buildbot
commit 9b4f2d1b53
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/highgui/src/window_QT.cpp
View File

@ -499,7 +499,7 @@ CV_IMPL void cvDestroyWindow(const char* name)
CV_IMPL void cvDestroyAllWindows() CV_IMPL void cvDestroyAllWindows()
{ {
if (!guiMainThread) if (!guiMainThread)
CV_Error( CV_StsNullPtr, "NULL guiReceiver (please create a window)" ); return;
QMetaObject::invokeMethod(guiMainThread, QMetaObject::invokeMethod(guiMainThread,
"destroyAllWindow", "destroyAllWindow",

3
modules/highgui/test/test_gui.cpp
View File

@ -58,6 +58,9 @@ void Foo(int /*k*/, void* /*z*/) {}
void CV_HighGuiOnlyGuiTest::run( int /*start_from */) void CV_HighGuiOnlyGuiTest::run( int /*start_from */)
{ {
ts->printf(ts->LOG, "GUI 0\n");
cvDestroyAllWindows();
ts->printf(ts->LOG, "GUI 1\n"); ts->printf(ts->LOG, "GUI 1\n");
namedWindow("Win"); namedWindow("Win");