From da8500bf514338859b72f393ce71bb2b785ffa67 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Sun, 2 Feb 2020 11:46:05 +0200
Subject: [PATCH] Fix merge bug
---
.../rgbd-sources/src/sources/screencapture/screencapture.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/rgbd-sources/src/sources/screencapture/screencapture.cpp b/components/rgbd-sources/src/sources/screencapture/screencapture.cpp
index 50079368b..5fb014344 100644
--- a/components/rgbd-sources/src/sources/screencapture/screencapture.cpp
+++ b/components/rgbd-sources/src/sources/screencapture/screencapture.cpp
@@ -134,8 +134,8 @@ bool ScreenCapture::compute(int n, int b) {
img = cv::Mat(params_.height, params_.width, CV_8UC4, impl_state_->ximg->data);
#endif
- sframe_.reset();
- sframe_.setOrigin(&state_);
+ frame_.reset();
+ frame_.setOrigin(&state_);
if (!img.empty()) {
frame_.create<cv::Mat>(Channel::Colour) = img;
--
GitLab