Skip to content
Snippets Groups Projects
Commit 6e377594 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Auto merge bug fix

parent 1d80b05c
No related branches found
No related tags found
2 merge requests!86Fixes for multi swap in net buffers,!85Partial fixes from chunk sync
Pipeline #12675 passed
Stage: all
Hide whitespace changes
Inline Side-by-side
components/rgbd-sources/src/source.cpp
+ 8
− 8
View file @ 6e377594
...@@ -165,10 +165,10 @@ ftl::rgbd::detail::Source *Source::_createDeviceImpl(const ftl::URI &uri) { ...@@ -165,10 +165,10 @@ ftl::rgbd::detail::Source *Source::_createDeviceImpl(const ftl::URI &uri) {
void Source::getFrames(cv::Mat &rgb, cv::Mat &depth) { void Source::getFrames(cv::Mat &rgb, cv::Mat &depth) {
SHARED_LOCK(mutex_,lk); SHARED_LOCK(mutex_,lk);
//rgb_.copyTo(rgb); rgb_.copyTo(rgb);
//depth_.copyTo(depth); depth_.copyTo(depth);
rgb = rgb_; //rgb = rgb_;
depth = depth_; //depth = depth_;
/*cv::Mat tmp; /*cv::Mat tmp;
tmp = rgb; tmp = rgb;
...@@ -244,7 +244,7 @@ bool Source::compute(int N, int B) { ...@@ -244,7 +244,7 @@ bool Source::compute(int N, int B) {
return true; return true;
} else if (impl_ && impl_->compute(N,B)) { } else if (impl_ && impl_->compute(N,B)) {
timestamp_ = impl_->timestamp_; timestamp_ = impl_->timestamp_;
/*cv::Mat tmp; cv::Mat tmp;
rgb_.create(impl_->rgb_.size(), impl_->rgb_.type()); rgb_.create(impl_->rgb_.size(), impl_->rgb_.type());
depth_.create(impl_->depth_.size(), impl_->depth_.type()); depth_.create(impl_->depth_.size(), impl_->depth_.type());
tmp = rgb_; tmp = rgb_;
...@@ -252,10 +252,10 @@ bool Source::compute(int N, int B) { ...@@ -252,10 +252,10 @@ bool Source::compute(int N, int B) {
impl_->rgb_ = tmp; impl_->rgb_ = tmp;
tmp = depth_; tmp = depth_;
depth_ = impl_->depth_; depth_ = impl_->depth_;
impl_->depth_ = tmp;*/ impl_->depth_ = tmp;
impl_->rgb_.copyTo(rgb_); //impl_->rgb_.copyTo(rgb_);
impl_->depth_.copyTo(depth_); //impl_->depth_.copyTo(depth_);
return true; return true;
} }
return false; return false;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment