From 525b5aa108b436ed5e48eea914a174821fb04335 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Mon, 2 Mar 2020 19:31:40 +0200
Subject: [PATCH] Fix segfault in builder
---
components/operators/src/mask.cpp | 2 +-
components/rgbd-sources/src/frameset.cpp | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/components/operators/src/mask.cpp b/components/operators/src/mask.cpp
index 0fe2030c7..1c53630cf 100644
--- a/components/operators/src/mask.cpp
+++ b/components/operators/src/mask.cpp
@@ -90,7 +90,7 @@ bool CullDiscontinuity::apply(ftl::rgbd::Frame &in, ftl::rgbd::Frame &out, cudaS
if (!in.hasChannel(Channel::Depth) || !in.hasChannel(Channel::Mask)) return false;
uint8_t maskID = config()->value("mask_id", (unsigned int)(ftl::cuda::Mask::kMask_Discontinuity | ftl::cuda::Mask::kMask_Bad));
- unsigned int radius = config()->value("radius", 2);
+ unsigned int radius = config()->value("radius", 0);
bool inverted = config()->value("invert", false);
out.clearPackets(Channel::Depth); // Force reset
diff --git a/components/rgbd-sources/src/frameset.cpp b/components/rgbd-sources/src/frameset.cpp
index 785d991ad..4ee8a89c7 100644
--- a/components/rgbd-sources/src/frameset.cpp
+++ b/components/rgbd-sources/src/frameset.cpp
@@ -171,9 +171,8 @@ void Builder::markPartial(int64_t ts) {
{
UNIQUE_LOCK(mutex_, lk);
fs = _findFrameset(ts);
+ if (fs) fs->set(ftl::data::FSFlag::PARTIAL);
}
-
- fs->set(ftl::data::FSFlag::PARTIAL);
}
void Builder::_schedule() {
--
GitLab