ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-11 16:19:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Backward compatibility with OpenCV 2x

Browse Source
This commit is contained in:
vsr 2021-03-16 14:26:59 +03:00
parent 5d251af706
commit 016f03aaff
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
View File

@ -27,14 +27,6 @@
#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
@ -169,7 +161,7 @@ bool ShapeRec_FeatureDetector::ComputeContours( bool useROI, ShapeRec_Parameters
cvCvtColor(sample_image, sample_hsv, CV_BGR2HSV);
cvCvtPixToPlane(sample_hsv, sample_h_plane, sample_s_plane, 0, 0);
cvSplit(sample_hsv, sample_h_plane, sample_s_plane, 0, 0);
IplImage* sample_planes[] = { sample_h_plane, sample_s_plane };
// Create the hue / saturation histogram of the SAMPLE image.
@ -223,7 +215,7 @@ bool ShapeRec_FeatureDetector::ComputeContours( bool useROI, ShapeRec_Parameters
// Get hue and saturation planes of the INPUT image
cvCvtColor(input_image, input_hsv, CV_BGR2HSV);
cvCvtPixToPlane(input_hsv, input_hplane, input_splane, 0, 0);
cvSplit(input_hsv, input_hplane, input_splane, 0, 0);
IplImage* input_planes[] = { input_hplane, input_splane };
// Compute the back projection

10
src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
View File

@ -28,13 +28,11 @@
// This workaround will be removed after correction of the
// https://tracker.dev.opencascade.org/view.php?id=28457 issue.
#ifdef HAVE_TBB
#undef HAVE_TBB
#include <opencv2/imgproc/imgproc.hpp>
#include <opencv2/highgui/highgui.hpp>
#define HAVE_TBB
#undef HAVE_TBB
#include <opencv2/opencv.hpp>
#define HAVE_TBB
#else
#include <opencv2/imgproc/imgproc.hpp>
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/opencv.hpp>
#endif
// Qt