From patchwork Tue Jul 20 10:13:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 13052 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 ACBDCC0109 for ; Tue, 20 Jul 2021 10:13:27 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6BCDD68548; Tue, 20 Jul 2021 12:13:27 +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="QgRYHm0v"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A2F9E68542 for ; Tue, 20 Jul 2021 12:13:25 +0200 (CEST) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id DEB70443; Tue, 20 Jul 2021 12:13:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1626776005; bh=VbLW1FiuGdE15Hs8cWDAmhkYGKTN+Pxz7VADKZyAqzM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QgRYHm0vBPHfpIQUgbvT/fGDjlmPyEul65OdeeDb7STvy39ElQwfNFyvzc6snM7jk YF24d0TGJrAMyZ2uX3agms7VIo5ZIWmtioG+TbYmgmoikNCEGniTc8ID37hFCUorxh go6MMSQFhIylIuq9fFNjiyGqV73mvlvDaj0fUQ/M= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Tue, 20 Jul 2021 19:13:01 +0900 Message-Id: <20210720101307.26010-4-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210720101307.26010-1-paul.elder@ideasonboard.com> References: <20210720101307.26010-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 3/9] android: metadata: Fix addEntry template type 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" Since we set entries with android tags directly, which are enums and not arithmetic types, the addEntry template fails to match. Fix this by also allowing enum values in addEntry. Signed-off-by: Paul Elder Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- New in v4 --- src/android/camera_metadata.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h index 72ba4db2..6e51efb5 100644 --- a/src/android/camera_metadata.h +++ b/src/android/camera_metadata.h @@ -44,7 +44,8 @@ public: bool hasEntry(uint32_t tag) const; template> * = nullptr> + std::enable_if_t || + std::is_enum_v> * = nullptr> bool addEntry(uint32_t tag, const T &data) { return addEntry(tag, &data, 1, sizeof(T));