Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright update 2022
[modules/geom.git]
/
src
/
ShapeRecognition
/
ShapeRec_FeatureDetector.cxx
diff --git
a/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
b/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
index c667720d91e5814de58bdc2e5ddaa9b47bed86e1..af6df93cf41209c3944dada7ee4d2c7d7d5ef87e 100644
(file)
--- a/
src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
+++ b/
src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-202
2
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-27,14
+27,6
@@
#include <stdio.h>
#include "utilities.h"
#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
// 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);
cvCvtColor(sample_image, sample_hsv, CV_BGR2HSV);
- cv
CvtPixToPlane
(sample_hsv, sample_h_plane, sample_s_plane, 0, 0);
+ cv
Split
(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.
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);
// Get hue and saturation planes of the INPUT image
cvCvtColor(input_image, input_hsv, CV_BGR2HSV);
- cv
CvtPixToPlane
(input_hsv, input_hplane, input_splane, 0, 0);
+ cv
Split
(input_hsv, input_hplane, input_splane, 0, 0);
IplImage* input_planes[] = { input_hplane, input_splane };
// Compute the back projection
IplImage* input_planes[] = { input_hplane, input_splane };
// Compute the back projection