From 2483476531a89138cc5ad81be6707087b8a226c6 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Fri, 9 Aug 2019 12:42:48 +0300
Subject: [PATCH] Fix for bad merge
---
components/rgbd-sources/src/source.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/rgbd-sources/src/source.cpp b/components/rgbd-sources/src/source.cpp
index 787c0e29f..c5efd26fc 100644
--- a/components/rgbd-sources/src/source.cpp
+++ b/components/rgbd-sources/src/source.cpp
@@ -244,7 +244,7 @@ bool Source::compute(int N, int B) {
return true;
} else if (impl_ && impl_->compute(N,B)) {
timestamp_ = impl_->timestamp_;
- cv::Mat tmp;
+ /*cv::Mat tmp;
rgb_.create(impl_->rgb_.size(), impl_->rgb_.type());
depth_.create(impl_->depth_.size(), impl_->depth_.type());
tmp = rgb_;
@@ -252,7 +252,7 @@ bool Source::compute(int N, int B) {
impl_->rgb_ = tmp;
tmp = depth_;
depth_ = impl_->depth_;
- impl_->depth_ = tmp;
+ impl_->depth_ = tmp;*/
// TODO:(Nick) Reduce buffer copies
impl_->rgb_.copyTo(rgb_);
--
GitLab