Merge branch '2.4'

2013-01-31 14:35:27 +04:00
parent 7572b4d400 53b0df87f1
commit 57d3152cd0
23 changed files with 418 additions and 55 deletions
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp
@@ -499,7 +499,7 @@ CV_IMPL void cvDestroyWindow(const char* name)
 CV_IMPL void cvDestroyAllWindows()
 {
    if (!guiMainThread)
-        CV_Error( CV_StsNullPtr, "NULL guiReceiver (please create a window)" );
+        return;

    QMetaObject::invokeMethod(guiMainThread,
        "destroyAllWindow",