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

Migration to OpenCASCADE CMake configuration: additional commit

Browse Source
This commit is contained in:
rnv 2018-03-13 11:40:25 +03:00
parent 9fe1f193a4
commit 93bb870bc5
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
View File

@ -28,12 +28,17 @@
// 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 <cv.h>
#include <highgui.h>
#include <opencv2/imgproc/imgproc.hpp>
#include <opencv2/highgui/highgui.hpp>
#define 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
// Qt