From fe463fb15181a9c25e390327b0a20e6c423f2b11 Mon Sep 17 00:00:00 2001
From: Sebastian Hahta <joseha@utu.fi>
Date: Fri, 13 Sep 2019 15:54:27 +0300
Subject: [PATCH] fix merge
---
components/rgbd-sources/include/ftl/rgbd/frame.hpp | 4 ----
components/rgbd-sources/src/stereovideo.cpp | 6 ------
2 files changed, 10 deletions(-)
diff --git a/components/rgbd-sources/include/ftl/rgbd/frame.hpp b/components/rgbd-sources/include/ftl/rgbd/frame.hpp
index c07fc1494..a1822fd16 100644
--- a/components/rgbd-sources/include/ftl/rgbd/frame.hpp
+++ b/components/rgbd-sources/include/ftl/rgbd/frame.hpp
@@ -59,11 +59,7 @@ public:
*/
bool hasChannel(const ftl::rgbd::channel_t& channel)
{
-<<<<<<< HEAD
- return available_[_channelIdx(channel)];
-=======
return (channel == ftl::rgbd::kChanNone) ? true : available_[_channelIdx(channel)];
->>>>>>> master
}
/* @brief Method to get reference to the channel content
diff --git a/components/rgbd-sources/src/stereovideo.cpp b/components/rgbd-sources/src/stereovideo.cpp
index b5b7e3bd6..d718d1f7e 100644
--- a/components/rgbd-sources/src/stereovideo.cpp
+++ b/components/rgbd-sources/src/stereovideo.cpp
@@ -192,15 +192,9 @@ bool StereoVideoSource::retrieve() {
if (frames_[1].hasChannel(kChanLeftGray))
{
-<<<<<<< HEAD
auto &left_gray_prev = frames_[1].getChannel<cv::cuda::GpuMat>(kChanLeftGray, stream2_);
auto &optflow = frame.setChannel<cv::cuda::GpuMat>(kChanFlow);
nvof_->calc(left_gray, left_gray_prev, optflow, stream2_);
-=======
- auto &left_gray_prev = frame.getChannel<cv::cuda::GpuMat>(kChanLeftGray, stream2_);
- auto &optflow = frame.setChannel<cv::cuda::GpuMat>(kChanFlow);
- nvof_->calc(left_gray, left_gray_prev, optflow_, stream2_);
->>>>>>> master
// nvof_->upSampler() isn't implemented with CUDA
// cv::cuda::resize() does not work wiht 2-channel input
// cv::cuda::resize(optflow_, optflow, left.size(), 0.0, 0.0, cv::INTER_NEAREST, stream2_);
--
GitLab