Skip to content

Commit b947d6f

Browse files
authored
fix: fix runtime error for libcamera0.7 (#205)
* fix: fix runtime error when overwriting Request::controls() * fix: fix MergePolicy of merge operation Signed-off-by: Patrick Gehrsitz <mryel00.github@gmail.com>
1 parent d4a8ea9 commit b947d6f

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

device/libcamera/buffer.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@ int libcamera_buffer_enqueue(buffer_t *buf, const char *who)
8080
auto const &camera = buf->buf_list->dev->libcamera->camera;
8181

8282
request->reuse(libcamera::Request::ReuseBuffers);
83-
request->controls() = std::move(buf->buf_list->dev->libcamera->controls);
83+
request->controls().merge(
84+
buf->buf_list->dev->libcamera->controls,
85+
libcamera::ControlList::MergePolicy::OverwriteExisting
86+
);
8487

8588
if (camera->queueRequest(buf->libcamera->request.get()) < 0) {
8689
LOG_ERROR(buf, "Can't queue buffer.");

0 commit comments

Comments
 (0)