From cc17400849cf1456b3509a20bb8283478671cf2a Mon Sep 17 00:00:00 2001 From: saskatchewancatch Date: Tue, 29 Aug 2017 00:16:02 -0600 Subject: [PATCH] i9403: Removing checks from trackbar min/max set functions. Removing unnecessary range checks for QT backend support's setTrackbarMin and setTrackbarMax fucntions Fixes --- modules/highgui/src/window_QT.cpp | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/modules/highgui/src/window_QT.cpp b/modules/highgui/src/window_QT.cpp index 1233993e0a..28c50f8819 100644 --- a/modules/highgui/src/window_QT.cpp +++ b/modules/highgui/src/window_QT.cpp @@ -673,30 +673,20 @@ CV_IMPL void cvSetTrackbarPos(const char* name_bar, const char* window_name, int CV_IMPL void cvSetTrackbarMax(const char* name_bar, const char* window_name, int maxval) { - if (maxval >= 0) + QPointer t = icvFindTrackBarByName(name_bar, window_name); + if (t) { - QPointer t = icvFindTrackBarByName(name_bar, window_name); - if (t) - { - int minval = t->slider->minimum(); - maxval = (maxval>minval)?maxval:minval; - t->slider->setMaximum(maxval); - } + t->slider->setMaximum(maxval); } } CV_IMPL void cvSetTrackbarMin(const char* name_bar, const char* window_name, int minval) { - if (minval >= 0) + QPointer t = icvFindTrackBarByName(name_bar, window_name); + if (t) { - QPointer t = icvFindTrackBarByName(name_bar, window_name); - if (t) - { - int maxval = t->slider->maximum(); - minval = (maxvalslider->setMinimum(minval); - } + t->slider->setMinimum(minval); } }