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

Merge pull request #5570 from paroj:qsliderfix

Browse Source
This commit is contained in:
Alexander Alekhin 2015-10-24 14:38:38 +00:00
commit c3eb1254cf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -664,7 +664,7 @@ CV_IMPL void cvSetTrackbarMax(const char* name_bar, const char* window_name, int
QPointer<CvTrackbar> t = icvFindTrackBarByName(name_bar, window_name); QPointer<CvTrackbar> t = icvFindTrackBarByName(name_bar, window_name);
if (t) if (t)
{ {
int minval = t->slider->getMinimum(); int minval = t->slider->minimum();
maxval = (maxval>minval)?maxval:minval; maxval = (maxval>minval)?maxval:minval;
t->slider->setMaximum(maxval); t->slider->setMaximum(maxval);
} }
@ -679,7 +679,7 @@ CV_IMPL void cvSetTrackbarMin(const char* name_bar, const char* window_name, int
QPointer<CvTrackbar> t = icvFindTrackBarByName(name_bar, window_name); QPointer<CvTrackbar> t = icvFindTrackBarByName(name_bar, window_name);
if (t) if (t)
{ {
int maxval = t->slider->getMaximum(); int maxval = t->slider->maximum();
minval = (maxval<minval)?maxval:minval; minval = (maxval<minval)?maxval:minval;
t->slider->setMinimum(minval); t->slider->setMinimum(minval);
} }