diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-07-15 02:28:10 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-07-15 17:29:59 +0300 |
| commit | ed1b290aab18cfd9bf97a4e85f79b4d65d1906ca (patch) | |
| tree | 9c9c49370b1934ef46698c15ede3b20a9b6d3025 | |
| parent | 6c0afb8b33a1586b2e5bb5543edca5103769af0e (diff) | |
libcamera: pipeline: simple: Use std::make_tuple()
Prior to N4387 ([1]), the std::tuple::tuple(const Types&...) constructor
was unconditionally explicit. gcc 5 doesn't implement N4387, leading to
a compilation error in the simple pipeline handler. Use
std::make_tuple() to fix it.
[1] http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4387.html
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
| -rw-r--r-- | src/libcamera/pipeline/simple/converter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp index dc7c0463..75fb297e 100644 --- a/src/libcamera/pipeline/simple/converter.cpp +++ b/src/libcamera/pipeline/simple/converter.cpp @@ -271,9 +271,9 @@ SimpleConverter::strideAndFrameSize(const Size &size, int ret = m2m_->capture()->tryFormat(&format); if (ret < 0) - return { 0, 0 }; + return std::make_tuple(0, 0); - return { format.planes[0].bpl, format.planes[0].size }; + return std::make_tuple(format.planes[0].bpl, format.planes[0].size); } } /* namespace libcamera */ |