diff --git a/samples/api/CMakeLists.txt b/samples/api/CMakeLists.txt index 4c27086..8100370 100644 --- a/samples/api/CMakeLists.txt +++ b/samples/api/CMakeLists.txt @@ -30,12 +30,8 @@ make_executable(camera_a ## get_depth_with_region -if(OpenCV_VERSION VERSION_LESS 4.0) - make_executable(get_depth_with_region SRCS get_depth_with_region.cc LINK_LIBS mynteye ${OpenCV_LIBS} DLL_SEARCH_PATHS ${PRO_DIR}/_install/bin ${OpenCV_LIB_SEARCH_PATH} ) - -endif() diff --git a/samples/api/get_depth_with_region.cc b/samples/api/get_depth_with_region.cc index 25fc417..f9b5ff0 100644 --- a/samples/api/get_depth_with_region.cc +++ b/samples/api/get_depth_with_region.cc @@ -30,17 +30,17 @@ class DepthRegion { */ void OnMouse(const int &event, const int &x, const int &y, const int &flags) { MYNTEYE_UNUSED(flags) - if (event != CV_EVENT_MOUSEMOVE && event != CV_EVENT_LBUTTONDOWN) { + if (event != cv::EVENT_MOUSEMOVE && event != cv::EVENT_LBUTTONDOWN) { return; } show_ = true; - if (event == CV_EVENT_MOUSEMOVE) { + if (event == cv::EVENT_MOUSEMOVE) { if (!selected_) { point_.x = x; point_.y = y; } - } else if (event == CV_EVENT_LBUTTONDOWN) { + } else if (event == cv::EVENT_LBUTTONDOWN) { if (selected_) { if (x >= static_cast(point_.x - n_) && x <= static_cast(point_.x + n_) && diff --git a/samples/tutorials/CMakeLists.txt b/samples/tutorials/CMakeLists.txt index 8e1eefa..911318b 100644 --- a/samples/tutorials/CMakeLists.txt +++ b/samples/tutorials/CMakeLists.txt @@ -129,8 +129,6 @@ make_executable2(ctrl_manual_exposure if(PCL_FOUND) -if(OpenCV_VERSION VERSION_LESS 4.0) - make_executable2(get_depth_and_points SRCS intermediate/get_depth_and_points.cc util/cv_painter.cc util/pc_viewer.cc WITH_OPENCV WITH_PCL @@ -138,6 +136,4 @@ make_executable2(get_depth_and_points endif() -endif() - # advanced level diff --git a/samples/tutorials/intermediate/get_depth_and_points.cc b/samples/tutorials/intermediate/get_depth_and_points.cc index ea3901f..349a767 100644 --- a/samples/tutorials/intermediate/get_depth_and_points.cc +++ b/samples/tutorials/intermediate/get_depth_and_points.cc @@ -34,17 +34,17 @@ class DepthRegion { */ void OnMouse(const int &event, const int &x, const int &y, const int &flags) { MYNTEYE_UNUSED(flags) - if (event != CV_EVENT_MOUSEMOVE && event != CV_EVENT_LBUTTONDOWN) { + if (event != cv::EVENT_MOUSEMOVE && event != cv::EVENT_LBUTTONDOWN) { return; } show_ = true; - if (event == CV_EVENT_MOUSEMOVE) { + if (event == cv::EVENT_MOUSEMOVE) { if (!selected_) { point_.x = x; point_.y = y; } - } else if (event == CV_EVENT_LBUTTONDOWN) { + } else if (event == cv::EVENT_LBUTTONDOWN) { if (selected_) { if (x >= static_cast(point_.x - n_) && x <= static_cast(point_.x + n_) &&