mirror of
https://github.com/opencv/opencv.git
synced 2026-07-29 15:23:05 +04:00
highgui: fix trackbar value pointer handling
This commit is contained in:
@@ -1219,9 +1219,6 @@ void GuiReceiver::addSlider2(QString bar_name, QString window_name, void* value,
|
||||
if (t) //trackbar exists
|
||||
return;
|
||||
|
||||
if (!value)
|
||||
CV_Error(CV_StsNullPtr, "NULL value pointer" );
|
||||
|
||||
if (count <= 0) //count is the max value of the slider, so must be bigger than 0
|
||||
CV_Error(CV_StsNullPtr, "Max value of the slider must be bigger than 0" );
|
||||
|
||||
@@ -1342,7 +1339,8 @@ void CvTrackbar::create(CvWindow* arg, QString name, int* value, int _count)
|
||||
slider->setMinimum(0);
|
||||
slider->setMaximum(_count);
|
||||
slider->setPageStep(5);
|
||||
slider->setValue(*value);
|
||||
if (dataSlider)
|
||||
slider->setValue(*dataSlider);
|
||||
slider->setTickPosition(QSlider::TicksBelow);
|
||||
|
||||
|
||||
@@ -1409,7 +1407,8 @@ void CvTrackbar::update(int myvalue)
|
||||
{
|
||||
setLabel(myvalue);
|
||||
|
||||
*dataSlider = myvalue;
|
||||
if (dataSlider)
|
||||
*dataSlider = myvalue;
|
||||
if (callback)
|
||||
{
|
||||
callback(myvalue);
|
||||
|
||||
Reference in New Issue
Block a user