]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
Migration to OpenCASCADE CMake configuration: small fix. rnv/opencasacade_cmake_config
authorrnv <rnv@opencascade.com>
Wed, 31 Jan 2018 14:00:05 +0000 (17:00 +0300)
committerrnv <rnv@opencascade.com>
Wed, 31 Jan 2018 14:00:05 +0000 (17:00 +0300)
1  2 
src/ShapeRecognition/ShapeRec_FeatureDetector.hxx

index 7a9a0cec0b2d7f2cfc4787b1068f9737b882643e,7a9a0cec0b2d7f2cfc4787b1068f9737b882643e..e7b5d7b07516b266d29dccc1ab379601d243c8f9
  //      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