i9403: Removing checks from trackbar min/max set functions.

saskatchewancatch · saskatchewancatch · commit cc17400849cf · 2017-08-31T17:52:29.000-06:00
Removing unnecessary range checks for QT backend support's setTrackbarMin and setTrackbarMax fucntions

Fixes
diff --git 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<CvTrackbar> t = icvFindTrackBarByName(name_bar, window_name);
+    if (t)
     {
-        QPointer<CvTrackbar> 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<CvTrackbar> t = icvFindTrackBarByName(name_bar, window_name);
+    if (t)
     {
-        QPointer<CvTrackbar> t = icvFindTrackBarByName(name_bar, window_name);
-        if (t)
-        {
-            int maxval = t->slider->maximum();
-            minval = (maxval<minval)?maxval:minval;
-            t->slider->setMinimum(minval);
-        }
+        t->slider->setMinimum(minval);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -673,30 +673,20 @@ CV_IMPL void cvSetTrackbarPos(const char* name_bar, const char* window_name, int`
`673`	`673`
`674`	`674`	`CV_IMPL void cvSetTrackbarMax(const char* name_bar, const char* window_name, int maxval)`
`675`	`675`	`{`
`676`		`- if (maxval >= 0)`
	`676`	`+ QPointer<CvTrackbar> t = icvFindTrackBarByName(name_bar, window_name);`
	`677`	`+ if (t)`
`677`	`678`	`{`
`678`		`- QPointer<CvTrackbar> t = icvFindTrackBarByName(name_bar, window_name);`
`679`		`- if (t)`
`680`		`- {`
`681`		`- int minval = t->slider->minimum();`
`682`		`- maxval = (maxval>minval)?maxval:minval;`
`683`		`- t->slider->setMaximum(maxval);`
`684`		`- }`
	`679`	`+ t->slider->setMaximum(maxval);`
`685`	`680`	`}`
`686`	`681`	`}`
`687`	`682`
`688`	`683`
`689`	`684`	`CV_IMPL void cvSetTrackbarMin(const char* name_bar, const char* window_name, int minval)`
`690`	`685`	`{`
`691`		`- if (minval >= 0)`
	`686`	`+ QPointer<CvTrackbar> t = icvFindTrackBarByName(name_bar, window_name);`
	`687`	`+ if (t)`
`692`	`688`	`{`
`693`		`- QPointer<CvTrackbar> t = icvFindTrackBarByName(name_bar, window_name);`
`694`		`- if (t)`
`695`		`- {`
`696`		`- int maxval = t->slider->maximum();`
`697`		`- minval = (maxval<minval)?maxval:minval;`
`698`		`- t->slider->setMinimum(minval);`
`699`		`- }`
	`689`	`+ t->slider->setMinimum(minval);`
`700`	`690`	`}`
`701`	`691`	`}`
`702`	`692`