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

Merge remote-tracking branch 'upstream/2.4' into 2.4

Browse Source
This commit is contained in:
Prof. Dr. Rudolf Haussmann
2015-03-25 13:38:49 +01:00
parent 756c1a22d9 5678ba1227
commit e5e6367223
7 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -406,13 +406,14 @@ static CvBar* icvFindBarByName(QBoxLayout* layout, QString name_bar, typeBar typ
static CvTrackbar* icvFindTrackBarByName(const char* name_trackbar, const char* name_window, QBoxLayout* layout = NULL)
{
QString nameQt(name_trackbar);
QString nameWinQt(name_window);
if (!name_window && global_control_panel) //window name is null and we have a control panel
if (nameWinQt.isEmpty() && global_control_panel) //window name is null and we have a control panel
layout = global_control_panel->myLayout;
if (!layout)
{
QPointer<CvWindow> w = icvFindWindowByName(QLatin1String(name_window));
QPointer<CvWindow> w = icvFindWindowByName(nameWinQt);
if (!w)
CV_Error(CV_StsNullPtr, "NULL window handler");