From: rnv <rnv@opencascade.com>
Date: Wed, 31 Jan 2018 14:00:05 +0000 (+0300)
Subject: Migration to OpenCASCADE CMake configuration: small fix.
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c9b703f9d939a0d0f12106f5b8590c87dbd54e9a;p=modules%2Fgeom.git

Migration to OpenCASCADE CMake configuration: small fix.
---

c9b703f9d939a0d0f12106f5b8590c87dbd54e9a
diff --cc src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
index 7a9a0cec0,7a9a0cec0..e7b5d7b07
--- a/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
+++ b/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
@@@ -28,12 -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