Salome HOME
projects
/
modules
/
geom.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7dbab99
)
Remove deprecated OpenCV includes
author
vsr
<vsr@opencascade.com>
Wed, 3 Mar 2021 17:30:15 +0000
(20:30 +0300)
committer
vsr
<vsr@opencascade.com>
Wed, 3 Mar 2021 17:30:15 +0000
(20:30 +0300)
src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
patch
|
blob
|
history
diff --git
a/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
b/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
index eedaf97f28f7ecf4cf41dbdac1ca3a11d26c95b1..f068387ba989b036d975b715b4125d4eb6d77d4b 100644
(file)
--- a/
src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
+++ b/
src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
@@
-29,14
+29,10
@@
// https://tracker.dev.opencascade.org/view.php?id=28457 issue.
#ifdef HAVE_TBB
#undef HAVE_TBB
- #include <cv.h>
- #include <highgui.h>
#include <opencv2/imgproc/imgproc.hpp>
#include <opencv2/highgui/highgui.hpp>
#define HAVE_TBB
#else
- #include <cv.h>
- #include <highgui.h>
#include <opencv2/imgproc/imgproc.hpp>
#include <opencv2/highgui/highgui.hpp>
#endif