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>
This commit is contained in:
Laurent Pinchart 2020-07-15 02:28:10 +03:00
parent 6c0afb8b33
commit ed1b290aab

View file

@ -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 */