Fixed build with OpenCV4

src/AddObjectDialog.cpp

@@ -44,6 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <opencv2/imgproc/imgproc.hpp>
 #include <opencv2/highgui/highgui.hpp>
+#include <opencv2/imgproc/imgproc_c.h>
 
 namespace find_object {
 

src/Camera.cpp

@@ -32,6 +32,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <stdio.h>
 #include <opencv2/imgproc/imgproc.hpp>
+#if CV_MAJOR_VERSION > 3
+#include <opencv2/videoio/videoio_c.h>
+#endif
 #include <QtCore/QFile>
 #include "utilite/UDirectory.h"
 #include "CameraTcpServer.h"

src/FindObject.cpp

@@ -42,6 +42,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <QGraphicsRectItem>
 #include <stdio.h>
 
+#if CV_MAJOR_VERSION > 3
+#include <opencv2/core/types_c.h>
+#endif
+
 namespace find_object {
 
 FindObject::FindObject(bool keepImagesInRAM, QObject * parent) :

src/Settings.cpp

@@ -817,7 +817,11 @@ Feature2D * Settings::createKeypointDetector()
 								getFeature2D_ORB_edgeThreshold(),
 								getFeature2D_ORB_firstLevel(),
 								getFeature2D_ORB_WTA_K(),
+#if CV_MAJOR_VERSION > 3
+								(cv::ORB::ScoreType)getFeature2D_ORB_scoreType(),
+#else
 								getFeature2D_ORB_scoreType(),
+#endif
 								getFeature2D_ORB_patchSize(),
 								getFeature2D_Fast_threshold()));
 #endif
@@ -1061,7 +1065,11 @@ Feature2D * Settings::createDescriptorExtractor()
 								getFeature2D_ORB_edgeThreshold(),
 								getFeature2D_ORB_firstLevel(),
 								getFeature2D_ORB_WTA_K(),
+#if CV_MAJOR_VERSION > 3
+								(cv::ORB::ScoreType)getFeature2D_ORB_scoreType(),
+#else
 								getFeature2D_ORB_scoreType(),
+#endif
 								getFeature2D_ORB_patchSize(),
 								getFeature2D_Fast_threshold()));
 #endif