{"id":13161,"url":"https://patchwork.libcamera.org/api/patches/13161/?format=json","web_url":"https://patchwork.libcamera.org/patch/13161/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210730103536.81117-4-paul.elder@ideasonboard.com>","date":"2021-07-30T10:35:30","name":"[libcamera-devel,v6,3/9] android: metadata: Fix addEntry template type","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"bec8b54c3c8395217e7c85489efccea0831e047d","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13161/mbox/","series":[{"id":2291,"url":"https://patchwork.libcamera.org/api/series/2291/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2291","date":"2021-07-30T10:35:27","name":"android: Support capability and hardware level detection","version":6,"mbox":"https://patchwork.libcamera.org/series/2291/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13161/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13161/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 77C86C322E\n\tfor ;\n\tFri, 30 Jul 2021 10:35:54 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 33D32687C5;\n\tFri, 30 Jul 2021 12:35:54 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 858F4687C5\n\tfor ;\n\tFri, 30 Jul 2021 12:35:52 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 74B8A89B;\n\tFri, 30 Jul 2021 12:35:50 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"CDFZ3dIr\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1627641352;\n\tbh=p8G1JKPuNPdvaenXuSuSXd6bmEPidMoekfecbNAVe0Q=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=CDFZ3dIr+SotljuDZItQJwkeeoXeM1bRTgjdLSvm6y3mmDtLVJbZ9u2mFT2burUau\n\ta8yV9eQym9sc2YLQ/tz2473ABSEFyHCQ7BASwCFyB9aH3YYB2ti0W3WLynqe+UDDgl\n\tMZtW4qTqWXAKiuiAGVjMuo9i9phJmnPkrxlKlF5M=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 30 Jul 2021 19:35:30 +0900","Message-Id":"<20210730103536.81117-4-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20210730103536.81117-1-paul.elder@ideasonboard.com>","References":"<20210730103536.81117-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v6 3/9] android: metadata: Fix addEntry\n\ttemplate type","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Since we set entries with android tags directly, which are enums and not\narithmetic types, the addEntry template fails to match. Fix this by also\nallowing enum values in addEntry.\n\nSigned-off-by: Paul Elder \nReviewed-by: Jacopo Mondi \nReviewed-by: Laurent Pinchart \n\n---\nNew in v4\n---\n src/android/camera_metadata.h | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)","diff":"diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h\nindex 03b3e701..60be416c 100644\n--- a/src/android/camera_metadata.h\n+++ b/src/android/camera_metadata.h\n@@ -34,7 +34,8 @@ public:\n \tbool hasEntry(uint32_t tag) const;\n \n \ttemplate> * = nullptr>\n+\t\t std::enable_if_t ||\n+\t\t\t\t std::is_enum_v> * = nullptr>\n \tbool addEntry(uint32_t tag, const T &data)\n \t{\n \t\treturn addEntry(tag, &data, 1, sizeof(T));\n","prefixes":["libcamera-devel","v6","3/9"]}