From patchwork Tue Jul 14 23:33:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 8799 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id E4FCDBD790 for ; Tue, 14 Jul 2020 23:33:36 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 699AD6091A; Wed, 15 Jul 2020 01:33:36 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="A+gL7fsE"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8E78B60745 for ; Wed, 15 Jul 2020 01:33:35 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1471371D for ; Wed, 15 Jul 2020 01:33:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1594769615; bh=FTYUw724r9q63EcbnJUAlCikQ2XAK1vdZjRAeClqEqE=; h=From:To:Subject:Date:From; b=A+gL7fsEIq5DF3kNnYvpugxRZGXna3gId7gHOP+5U9dGkwx8DqhSrfBbPKMa9LfYG o1E1IMlepDrIFjnBIXIA7VV+w5M8xASvi7HyX1nDp168OCe8EuKgn8Fec6yfY7RO0W y5xsRZV854o6bEqawcLSkDPzb0mo00HwI68p7spE= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Wed, 15 Jul 2020 02:33:25 +0300 Message-Id: <20200714233325.14951-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: pipeline: simple: Use std::make_tuple() X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" 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 Reviewed-by: Niklas Söderlund Reviewed-by: Kieran Bingham --- src/libcamera/pipeline/simple/converter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp index dc7c046329f1..75fb297ebd58 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 */