From patchwork Wed Apr 2 11:50:10 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: 23107 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 BBBE8C3213 for ; Wed, 2 Apr 2025 11:50:19 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8174F68985; Wed, 2 Apr 2025 13:50:19 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="XqbzXMxV"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9B18168979 for ; Wed, 2 Apr 2025 13:50:17 +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 C079F6A2 for ; Wed, 2 Apr 2025 13:48:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1743594504; bh=KjLu3jU0ANnTnaFWpdyKCq9IGZtLk2iYgrIt8kBH2jY=; h=From:To:Subject:Date:From; b=XqbzXMxVs9StsQ0xdcZL1TMqGw8svHoTWyCO7CZ3gVv+TUlCZb0fiL6GgTwxAtH/j eJAmXjxByfZmsRQRjRRB42cj2HqNxLp0f1jYeEwl3coiQWiVoPXHQ7ZHEU/Qpg9nfA 3ggixeK2Uqi6yDyG1vM6JFZ0bCtIdfARjzhq94Sg= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1] libcamera: controls: Fix `ControlInfoMap::count(unsigned int)` Date: Wed, 2 Apr 2025 13:50:10 +0200 Message-ID: <20250402115010.937137-1-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.49.0 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" The two overloads of `find()` and `at()` have the same behaviour regardless of the argument type: `unsigned int` or `const ControlId *`. However, `count()` is not so because `count(unsigned int)` only checks the `ControlIdMap`, and it does not check if the given id is actually present in the map storing the `ControlInfo` objects. So `count()` returns 1 for every control id that is present in the associated `ControlIdMap` regardless of whether there is an actual entry for the `ControlId` associated with the given numeric id. Fix that by simply using `find()` to determine the return value. Signed-off-by: Barnabás Pőcze Reviewed-by: Jacopo Mondi --- src/libcamera/controls.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 70f6f6092..98fa7583d 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -857,15 +857,7 @@ const ControlInfoMap::mapped_type &ControlInfoMap::at(unsigned int id) const */ ControlInfoMap::size_type ControlInfoMap::count(unsigned int id) const { - if (!idmap_) - return 0; - - /* - * The ControlInfoMap and its idmap have a 1:1 mapping between their - * entries, we can thus just count the matching entries in idmap to - * avoid an additional lookup. - */ - return idmap_->count(id); + return find(id) != end(); } /**