mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 04:52:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20420 from berak:python_fix_trackbar_warning

Browse Source
This commit is contained in:
Alexander Alekhin 2021-07-15 20:06:22 +00:00
commit eb9218a86b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/python/src2/cv2.cpp
View File

@ -1971,15 +1971,23 @@ static void OnChange(int pos, void *param)
} }
#ifdef HAVE_OPENCV_HIGHGUI #ifdef HAVE_OPENCV_HIGHGUI
// workaround for #20408, use nullptr, set value later
static int _createTrackbar(const String &trackbar_name, const String &window_name, int value, int count,
TrackbarCallback onChange, PyObject* py_callback_info)
{
int n = createTrackbar(trackbar_name, window_name, NULL, count, onChange, py_callback_info);
setTrackbarPos(trackbar_name, window_name, value);
return n;
}
static PyObject *pycvCreateTrackbar(PyObject*, PyObject *args) static PyObject *pycvCreateTrackbar(PyObject*, PyObject *args)
{ {
PyObject *on_change; PyObject *on_change;
char* trackbar_name; char* trackbar_name;
char* window_name; char* window_name;
int *value = new int; int value;
int count; int count;
if (!PyArg_ParseTuple(args, "ssiiO", &trackbar_name, &window_name, value, &count, &on_change)) if (!PyArg_ParseTuple(args, "ssiiO", &trackbar_name, &window_name, &value, &count, &on_change))
return NULL; return NULL;
if (!PyCallable_Check(on_change)) { if (!PyCallable_Check(on_change)) {
PyErr_SetString(PyExc_TypeError, "on_change must be callable"); PyErr_SetString(PyExc_TypeError, "on_change must be callable");
@ -1998,7 +2006,7 @@ static PyObject *pycvCreateTrackbar(PyObject*, PyObject *args)
{ {
registered_callbacks.insert(std::pair<std::string, PyObject*>(name, py_callback_info)); registered_callbacks.insert(std::pair<std::string, PyObject*>(name, py_callback_info));
} }
ERRWRAP2(createTrackbar(trackbar_name, window_name, value, count, OnChange, py_callback_info)); ERRWRAP2(_createTrackbar(trackbar_name, window_name, value, count, OnChange, py_callback_info));
Py_RETURN_NONE; Py_RETURN_NONE;
} }