From 1fb8d60fd227bcd1aa9a08614c978a890610a198 Mon Sep 17 00:00:00 2001 From: Zihao Mu Date: Mon, 22 Aug 2022 11:14:59 +0800 Subject: [PATCH] remove whitespace --- modules/videoio/include/opencv2/videoio.hpp | 8 ++++---- modules/videoio/src/cap_obsensor/obsensor_stream_channel_msmf.hpp | 2 +- modules/videoio/src/cap_obsensor/obsensor_uvc_stream_channel.cpp | 2 +- samples/cpp/videocapture_obsensor.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/videoio/include/opencv2/videoio.hpp b/modules/videoio/include/opencv2/videoio.hpp index 3a4b599..bbe3922 100644 --- a/modules/videoio/include/opencv2/videoio.hpp +++ b/modules/videoio/include/opencv2/videoio.hpp @@ -659,21 +659,21 @@ enum { CAP_PROP_IMAGES_BASE = 18000, @{ */ //! OBSENSOR data given from image generator -enum VideoCaptureOBSensorDataType{ +enum VideoCaptureOBSensorDataType{ CAP_OBSENSOR_DEPTH_MAP = 0, //!< Depth values in mm (CV_16UC1) CAP_OBSENSOR_BGR_IMAGE = 1, //!< Data given from BGR stream generator CAP_OBSENSOR_IR_IMAGE = 2 //!< Data given from IR stream generator(CV_16UC1) }; //! OBSENSOR stream generator -enum VideoCaptureOBSensorGenerators{ +enum VideoCaptureOBSensorGenerators{ CAP_OBSENSOR_DEPTH_GENERATOR = 1 << 29, CAP_OBSENSOR_IMAGE_GENERATOR = 1 << 28, - CAP_OBSENSOR_IR_GENERATOR = 1 << 27, + CAP_OBSENSOR_IR_GENERATOR = 1 << 27, CAP_OBSENSOR_GENERATORS_MASK = CAP_OBSENSOR_DEPTH_GENERATOR + CAP_OBSENSOR_IMAGE_GENERATOR + CAP_OBSENSOR_IR_GENERATOR }; -//!OBSENSOR properties +//!OBSENSOR properties enum VideoCaptureOBSensorProperties{ // INTRINSIC CAP_PROP_OBSENSOR_INTRINSIC_FX=26001, diff --git a/modules/videoio/src/cap_obsensor/obsensor_stream_channel_msmf.hpp b/modules/videoio/src/cap_obsensor/obsensor_stream_channel_msmf.hpp index 2891ff4..4019899 100644 --- a/modules/videoio/src/cap_obsensor/obsensor_stream_channel_msmf.hpp +++ b/modules/videoio/src/cap_obsensor/obsensor_stream_channel_msmf.hpp @@ -42,7 +42,7 @@ #include #include //IKsTopologyInfo #include //IKsControl -#include +#include namespace cv { namespace obsensor { diff --git a/modules/videoio/src/cap_obsensor/obsensor_uvc_stream_channel.cpp b/modules/videoio/src/cap_obsensor/obsensor_uvc_stream_channel.cpp index ff038f8..aa2b7f9 100644 --- a/modules/videoio/src/cap_obsensor/obsensor_uvc_stream_channel.cpp +++ b/modules/videoio/src/cap_obsensor/obsensor_uvc_stream_channel.cpp @@ -61,7 +61,7 @@ StreamType parseUvcDeviceNameToStreamType(const std::string& devName) std::string uvcDevName = devName; for (size_t i = 0; i < uvcDevName.length(); i++) { - uvcDevName[i] = (char)tolower(uvcDevName[i]); + uvcDevName[i] = (char)tolower(uvcDevName[i]); } if (uvcDevName.find(" depth") != std::string::npos) { diff --git a/samples/cpp/videocapture_obsensor.cpp b/samples/cpp/videocapture_obsensor.cpp index 6af73de..98eb9f4 100644 --- a/samples/cpp/videocapture_obsensor.cpp +++ b/samples/cpp/videocapture_obsensor.cpp @@ -17,7 +17,7 @@ int main() double cx = obsensorCapture.get(CAP_PROP_OBSENSOR_INTRINSIC_CX); double cy = obsensorCapture.get(CAP_PROP_OBSENSOR_INTRINSIC_CY); std::cout << "obsensor camera intrinsic params: fx=" << fx << ", fy=" << fy << ", cx=" << cx << ", cy=" << cy << std::endl; - + Mat image; Mat depthMap; Mat adjDepthMap; -- 2.7.4