From: Björn Wöldecke <webmaster@trooper.de>
Date: Wed, 6 Aug 2014 17:02:48 +0000 (+0200)
Subject: fix misinterpretation of empty window name
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~220^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3aa4bdf5941f413282d3400359e946bf812e2e0;p=profile%2Fivi%2Fopencv.git

fix misinterpretation of empty window name

The documentation states, that a NULL or an empty window name can be used
to refer to the control panel. But the string parameters of the C++ frontend
methods cannot be NULL and converting an empty string to a const char* by
c_str() doesn't produce a NULL pointer, but an empty string. Unfortunately,
the const char* pointer is just passed on to the standard C functions in
the QT backend, which doesn't check for the empty string case.

There are two places where the empty string check could have been introduced:
inside the frontend or inside the backend. As long as the documentation only
mentions this as a special case for the QT backend, the best place seems to
be there.
---

diff --git a/modules/highgui/src/window_QT.cpp b/modules/highgui/src/window_QT.cpp
index 1433f74..d4dfc98 100644
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp
@@ -401,7 +401,7 @@ static CvTrackbar* icvFindTrackBarByName(const char* name_trackbar, const char*
 {
     QString nameQt(name_trackbar);
 
-    if (!name_window && global_control_panel) //window name is null and we have a control panel
+    if ((!name_window || !name_window[0]) && global_control_panel) //window name is null and we have a control panel
         layout = global_control_panel->myLayout;
 
     if (!layout)