From: rnv <rnv@opencascade.com>
Date: Mon, 2 Sep 2019 17:31:02 +0000 (+0300)
Subject: Porting to opencv-3.2.0.
X-Git-Tag: V9_4_0a1~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3b33c84634161664c4cea2c19a636147e2a9d874;p=modules%2Fgeom.git

Porting to opencv-3.2.0.
---

diff --git a/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx b/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
index a56e18f7f..c4ac7b14e 100644
--- a/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
+++ b/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
@@ -27,6 +27,14 @@
 #include <stdio.h>
 #include "utilities.h"
 
+#include <opencv2/core/version.hpp>
+
+
+#if CV_MAJOR_VERSION == 3
+#define cvCvtPixToPlane cvSplit
+#endif
+
+
 // TODO : All the following methods but ComputeContours use the C API of OpenCV while ComputContours
 // uses the C++ API of the library.
 // This should be homogenized and preferably by using the C++ API (which is more recent for all the methods
@@ -232,8 +240,12 @@ bool ShapeRec_FeatureDetector::ComputeContours( bool useROI, ShapeRec_Parameters
     cvReleaseImage(&input_hplane);
     cvReleaseImage(&input_splane);
     cvReleaseImage(&backproject);
-  
+
+#if CV_MAJOR_VERSION == 3
+    detected_edges = cv::cvarrToMat(binary_backproject);
+#else
     detected_edges = cv::Mat(binary_backproject);
+#endif
   }
   // else if ( detection_method == RIDGE_DETECTOR )  // Method adapted for engineering drawings (e.g. watershed functionality could be used here cf.OpenCV documentation and samples)
   // {