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

merge #ifs in highgui bindings

Browse Source
This commit is contained in:
Matthew Skolaut 2016-06-21 17:16:16 -05:00
parent 7284a77cd3
commit f861d0d643
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1251,7 +1251,6 @@ static void OnChange(int pos, void *param)
} }
#ifdef HAVE_OPENCV_HIGHGUI #ifdef HAVE_OPENCV_HIGHGUI
static PyObject *pycvCreateTrackbar(PyObject*, PyObject *args) static PyObject *pycvCreateTrackbar(PyObject*, PyObject *args)
{ {
PyObject *on_change; PyObject *on_change;
@ -1269,7 +1268,6 @@ static PyObject *pycvCreateTrackbar(PyObject*, PyObject *args)
ERRWRAP2(createTrackbar(trackbar_name, window_name, value, count, OnChange, Py_BuildValue("OO", on_change, Py_None))); ERRWRAP2(createTrackbar(trackbar_name, window_name, value, count, OnChange, Py_BuildValue("OO", on_change, Py_None)));
Py_RETURN_NONE; Py_RETURN_NONE;
} }
#endif
static void OnButtonChange(int state, void *param) static void OnButtonChange(int state, void *param)
{ {
@ -1294,8 +1292,6 @@ static void OnButtonChange(int state, void *param)
PyGILState_Release(gstate); PyGILState_Release(gstate);
} }
#ifdef HAVE_OPENCV_HIGHGUI
static PyObject *pycvCreateButton(PyObject*, PyObject *args, PyObject *kw) static PyObject *pycvCreateButton(PyObject*, PyObject *args, PyObject *kw)
{ {
const char* keywords[] = {"buttonName", "onChange", "userData", "buttonType", "initialButtonState", NULL}; const char* keywords[] = {"buttonName", "onChange", "userData", "buttonType", "initialButtonState", NULL};