blob: 5aa6ee8d3caacfb658b323ab44ba1971308e031c [file] [log] [blame]
Andrew Geisslerc5535c92023-01-27 16:10:19 -06001From 0e97896e6a09957f27125957d00b5150ec90b2e9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 24 Jan 2023 01:18:25 -0800
4Subject: [PATCH] file_sink.cpp: Avoid dangling-reference
5
6Fixes following errors with gcc-13
7
8../git/src/cam/file_sink.cpp:92:45: error: possibly dangling reference to a temporary [-Werror=dangling-reference]
9 92 | const FrameMetadata::Plane &meta = buffer->metadata().planes()[i];
10 | ^~~~
11../git/src/cam/file_sink.cpp:92:81: note: the temporary was destroyed at the end of the full expression '(& buffer->libcamera::FrameBuffer::metadata())->libcamera::FrameMetadata::planes().libcamera::Span<const libcamera::FrameMetadata::Plane>::operator[](i)'
12 92 | const FrameMetadata::Plane &meta = buffer->metadata().planes()[i];
13 | ^
14cc1plus: all warnings being treated as errors
15
16Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2023-January/036575.html]
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19 src/cam/file_sink.cpp | 8 ++++----
20 1 file changed, 4 insertions(+), 4 deletions(-)
21
22diff --git a/src/cam/file_sink.cpp b/src/cam/file_sink.cpp
23index 45213d4a..897c4b37 100644
24--- a/src/cam/file_sink.cpp
25+++ b/src/cam/file_sink.cpp
26@@ -89,13 +89,13 @@ void FileSink::writeBuffer(const Stream *stream, FrameBuffer *buffer)
27 Image *image = mappedBuffers_[buffer].get();
28
29 for (unsigned int i = 0; i < buffer->planes().size(); ++i) {
30- const FrameMetadata::Plane &meta = buffer->metadata().planes()[i];
31+ unsigned int bytesused = buffer->metadata().planes()[i].bytesused;
32
33 Span<uint8_t> data = image->data(i);
34- unsigned int length = std::min<unsigned int>(meta.bytesused, data.size());
35+ unsigned int length = std::min<unsigned int>(bytesused, data.size());
36
37- if (meta.bytesused > data.size())
38- std::cerr << "payload size " << meta.bytesused
39+ if (bytesused > data.size())
40+ std::cerr << "payload size " << bytesused
41 << " larger than plane size " << data.size()
42 << std::endl;
43
44--
452.39.1
46