From patchwork Tue Apr 1 13:19:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 23097 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 C1D06C3285 for ; Tue, 1 Apr 2025 13:19:53 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 185E768990; Tue, 1 Apr 2025 15:19:49 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="JC3Y7/52"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BFC3068986 for ; Tue, 1 Apr 2025 15:19:43 +0200 (CEST) Received: from pb-laptop.local (185.221.143.221.nat.pool.zt.hu [185.221.143.221]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 92B7B741 for ; Tue, 1 Apr 2025 15:17:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1743513471; bh=EpkGhHNS5HImyJZXfISov2jRw9zVlkHDv1JtN4TxPNE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=JC3Y7/52MJp3RO/L8eO7i7YDTm2zQOcXROXiya2ZmemJfYLD7WNWnC2L1t7BEFgkI DvvRsD2p4gcpfpERwbbfM2ZezYMcEgrxJMMxQKa7sqvf0AKYWAXqjSac05wbbl7jkf LXNzw9Ca7kwZX7K9qtMrZKG0qeGrqiVdQ68W+bZ4= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 3/4] libcamera: controls: Arrays of arrays are not supported Date: Tue, 1 Apr 2025 15:19:38 +0200 Message-ID: <20250401131939.749583-4-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250401131939.749583-1-barnabas.pocze@ideasonboard.com> References: <20250401131939.749583-1-barnabas.pocze@ideasonboard.com> MIME-Version: 1.0 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" Arrays of arrays, even arrays of strings, are not supported by the current `ControlValue` mechanism, so disable them to trigger comptime errors if attempts are made to use them. Signed-off-by: Barnabás Pőcze --- include/libcamera/controls.h | 2 +- src/apps/cam/capture_script.cpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index d35347f4c..85c724ec1 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -120,7 +120,7 @@ struct control_type { }; template -struct control_type> : public control_type> { +struct control_type, std::enable_if_t>::size == 0>> : public control_type> { static constexpr std::size_t size = N; }; diff --git a/src/apps/cam/capture_script.cpp b/src/apps/cam/capture_script.cpp index fc1dfa75f..f3262af98 100644 --- a/src/apps/cam/capture_script.cpp +++ b/src/apps/cam/capture_script.cpp @@ -600,10 +600,6 @@ ControlValue CaptureScript::parseArrayControl(const ControlId *id, value = Span(values.data(), values.size()); break; } - case ControlTypeString: { - value = Span(repr.data(), repr.size()); - break; - } default: std::cerr << "Unsupported control type" << std::endl; break;