From f861d0d64377b76a7ebf7d9369c6d40f706578da Mon Sep 17 00:00:00 2001
From: Matthew Skolaut <tech2077@gmail.com>
Date: Tue, 21 Jun 2016 17:16:16 -0500
Subject: [PATCH] merge #ifs in highgui bindings

---
 modules/python/src2/cv2.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp
index 537e85422b..4b07e60fa4 100644
--- a/modules/python/src2/cv2.cpp
+++ b/modules/python/src2/cv2.cpp
@@ -1251,7 +1251,6 @@ static void OnChange(int pos, void *param)
 }
 
 #ifdef HAVE_OPENCV_HIGHGUI
-
 static PyObject *pycvCreateTrackbar(PyObject*, PyObject *args)
 {
     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)));
     Py_RETURN_NONE;
 }
-#endif
 
 static void OnButtonChange(int state, void *param)
 {
@@ -1294,8 +1292,6 @@ static void OnButtonChange(int state, void *param)
     PyGILState_Release(gstate);
 }
 
-#ifdef HAVE_OPENCV_HIGHGUI
-
 static PyObject *pycvCreateButton(PyObject*, PyObject *args, PyObject *kw)
 {
     const char* keywords[] = {"buttonName", "onChange", "userData", "buttonType", "initialButtonState", NULL};
-- 
GitLab