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

Fix merge bug

parent edcb0234
No related branches found
No related tags found
No related merge requests found
Pipeline #19947 passed
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment