From c53dd50730d51be6bad1ff313457c6517096accc Mon Sep 17 00:00:00 2001 From: John Zhao Date: Tue, 17 Jul 2018 15:12:35 +0800 Subject: [PATCH] Remove flags of opencv windows --- samples/api/get_depth_with_region.cc | 13 +++---------- .../tutorials/intermediate/get_depth_and_points.cc | 13 +++---------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/samples/api/get_depth_with_region.cc b/samples/api/get_depth_with_region.cc index 9ea78b4..0bd075c 100644 --- a/samples/api/get_depth_with_region.cc +++ b/samples/api/get_depth_with_region.cc @@ -18,13 +18,6 @@ #include "mynteye/api.h" -#ifdef USE_OPENCV3 -#define WIN_FLAGS \ - cv::WINDOW_AUTOSIZE | cv::WINDOW_KEEPRATIO | cv::WINDOW_GUI_NORMAL -#else -#define WIN_FLAGS cv::WINDOW_AUTOSIZE -#endif - namespace { class DepthRegion { @@ -163,9 +156,9 @@ int main(int argc, char *argv[]) { api->Start(Source::VIDEO_STREAMING); - cv::namedWindow("frame", WIN_FLAGS); - cv::namedWindow("depth", WIN_FLAGS); - cv::namedWindow("region", WIN_FLAGS); + cv::namedWindow("frame"); + cv::namedWindow("depth"); + cv::namedWindow("region"); DepthRegion depth_region(3); auto depth_info = []( diff --git a/samples/tutorials/intermediate/get_depth_and_points.cc b/samples/tutorials/intermediate/get_depth_and_points.cc index 754d39b..c137954 100644 --- a/samples/tutorials/intermediate/get_depth_and_points.cc +++ b/samples/tutorials/intermediate/get_depth_and_points.cc @@ -21,13 +21,6 @@ #include "util/cv_painter.h" #include "util/pc_viewer.h" -#ifdef USE_OPENCV3 -#define WIN_FLAGS \ - cv::WINDOW_AUTOSIZE | cv::WINDOW_KEEPRATIO | cv::WINDOW_GUI_NORMAL -#else -#define WIN_FLAGS cv::WINDOW_AUTOSIZE -#endif - namespace { class DepthRegion { @@ -166,9 +159,9 @@ int main(int argc, char *argv[]) { api->Start(Source::VIDEO_STREAMING); - cv::namedWindow("frame", WIN_FLAGS); - cv::namedWindow("depth", WIN_FLAGS); - cv::namedWindow("region", WIN_FLAGS); + cv::namedWindow("frame"); + cv::namedWindow("depth"); + cv::namedWindow("region"); DepthRegion depth_region(3); auto depth_info = [](