From 56df078838684348326265367a6c6625bcf07513 Mon Sep 17 00:00:00 2001
From: Simon Giraudot <simon.giraudot@geometryfactory.com>
Date: Mon, 23 Sep 2019 10:53:21 +0200
Subject: [PATCH 1/4] Fix OpenCV includes (tested with OpenCV 2.4, 3.2 and 4.1)

---
 .../Classification/OpenCV_random_forest_classifier.h  | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Classification/include/CGAL/Classification/OpenCV_random_forest_classifier.h b/Classification/include/CGAL/Classification/OpenCV_random_forest_classifier.h
index 091396b1b14..e875f77a132 100644
--- a/Classification/include/CGAL/Classification/OpenCV_random_forest_classifier.h
+++ b/Classification/include/CGAL/Classification/OpenCV_random_forest_classifier.h
@@ -25,13 +25,10 @@
 
 #include <CGAL/Classification/Feature_set.h>
 #include <CGAL/Classification/Label_set.h>
-#if (CV_MAJOR_VERSION < 3)
-#include <cv.h>
-#include <ml.h>
-#else
-#include <opencv/cv.h>
-#include <opencv/ml.h>
-#endif
+
+#include <opencv2/opencv.hpp>
+#include <opencv2/ml.hpp>
+
 
 namespace CGAL {
 

From 379c8c632b71062043b109e6c584a2c461a1ffef Mon Sep 17 00:00:00 2001
From: Simon Giraudot <simon.giraudot@geometryfactory.com>
Date: Thu, 26 Sep 2019 10:35:55 +0200
Subject: [PATCH 2/4] Add OpenCV ML module to travis installation

---
 .travis/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/install.sh b/.travis/install.sh
index 4d78446fc74..5cb280eff6a 100644
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -18,7 +18,7 @@ do
   DONE=1 && sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install clang-3.6 zsh \
 flex bison cmake graphviz libgmp-dev libmpfr-dev libmpfi-dev zlib1g-dev libeigen3-dev  libboost1.55-dev \
 libboost-system1.55-dev libboost-program-options1.55-dev libboost-thread1.55-dev libboost-iostreams1.55-dev \
-qt55base qt55script qt55svg qt55tools qt55graphicaleffects libopencv-dev mesa-common-dev libmetis-dev libglu1-mesa-dev \
+qt55base qt55script qt55svg qt55tools qt55graphicaleffects libopencv-dev libopencv-ml-dev mesa-common-dev libmetis-dev libglu1-mesa-dev \
 || DONE=0 && sudo apt-get update
 done
 exit 0

From 583b0ae3c3b9b3fac78c11db8735d589173257ab Mon Sep 17 00:00:00 2001
From: Maxime Gimeno <maxime.gimeno@gmail.com>
Date: Thu, 26 Sep 2019 15:57:13 +0200
Subject: [PATCH 3/4] conditional include

---
 .../CGAL/Classification/OpenCV_random_forest_classifier.h  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Classification/include/CGAL/Classification/OpenCV_random_forest_classifier.h b/Classification/include/CGAL/Classification/OpenCV_random_forest_classifier.h
index e875f77a132..449d0d0696c 100644
--- a/Classification/include/CGAL/Classification/OpenCV_random_forest_classifier.h
+++ b/Classification/include/CGAL/Classification/OpenCV_random_forest_classifier.h
@@ -27,7 +27,14 @@
 #include <CGAL/Classification/Label_set.h>
 
 #include <opencv2/opencv.hpp>
+
+#if CV_VERSION_MAJOR > 2 \
+||  (CV_VERSION_MINOR == 4 && CV_VERSION_REVISION >= 11)
 #include <opencv2/ml.hpp>
+#else
+#include <opencv2/ml/ml.hpp>
+#endif
+
 
 
 namespace CGAL {

From bdab125c8a8625f6bb6f4200f141130661fb177a Mon Sep 17 00:00:00 2001
From: Maxime Gimeno <maxime.gimeno@gmail.com>
Date: Fri, 27 Sep 2019 09:12:42 +0200
Subject: [PATCH 4/4] Test EPOCH.

---
 .../OpenCV_random_forest_classifier.h            | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Classification/include/CGAL/Classification/OpenCV_random_forest_classifier.h b/Classification/include/CGAL/Classification/OpenCV_random_forest_classifier.h
index 449d0d0696c..de52d8dee34 100644
--- a/Classification/include/CGAL/Classification/OpenCV_random_forest_classifier.h
+++ b/Classification/include/CGAL/Classification/OpenCV_random_forest_classifier.h
@@ -28,12 +28,18 @@
 
 #include <opencv2/opencv.hpp>
 
-#if CV_VERSION_MAJOR > 2 \
-||  (CV_VERSION_MINOR == 4 && CV_VERSION_REVISION >= 11)
-#include <opencv2/ml.hpp>
+//In opencv version 2.X the first digit is named EPOCH,
+//until version 3.0 where EPOCH disappears and it becomes MAJOR. Hence this
+//weird condition
+#ifdef CV_VERSION_EPOCH
+  #if  CV_VERSION_MAJOR == 4 && CV_VERSION_MINOR>= 11
+    #include <opencv2/ml.hpp>
+  #else
+    #include <opencv2/ml/ml.hpp>
+  #endif
 #else
-#include <opencv2/ml/ml.hpp>
-#endif
+  #include <opencv2/ml.hpp>
+#endif`