From patchwork Wed Dec 29 22:22:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 15232 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 80C40BE080 for ; Wed, 29 Dec 2021 22:23:06 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D072D608FF; Wed, 29 Dec 2021 23:23:05 +0100 (CET) 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="OfgsrXQo"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D90F2608E9 for ; Wed, 29 Dec 2021 23:23:03 +0100 (CET) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 5BD9333F for ; Wed, 29 Dec 2021 23:23:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1640816583; bh=eL782lyImlywaX2y8Jbl+1oCzi8DU896wqOMrjNqtGE=; h=From:To:Subject:Date:From; b=OfgsrXQoC7/mCilxBrpavVD81kqqq4X7kzG1ypLfChT5q9rH29pnBOVqOtxWJqMfz Ah1pblMABmPc4mTEV+yrDNvrbCdWlJyQnwmP8fRcIsDnckunBVOj7ssa9czPjZu5SR 7CpljviVhKvn0jtc6MBN7KKikuJ4+agx9gbaKGNQ= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Thu, 30 Dec 2021 00:22:58 +0200 Message-Id: <20211229222258.12691-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: controls: Use ASSERT() instead of assert() 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 ASSERT() macro integrates with the logging infrastructure, use it to replace assert(). Signed-off-by: Laurent Pinchart Reviewed-by: Umang Jain Reviewed-by: Kieran Bingham --- src/libcamera/controls.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 030e6f389e2d0fa3f10a47634f3609378ccaf70e prerequisite-patch-id: 2c7bab8c8f15090cf10a19aaed62e33de1264351 prerequisite-patch-id: 10478d16a049f895236c9b7bafcbe6d3a9b69ef9 prerequisite-patch-id: f6f3784841cc8648c6b6cfdd12b7903751856f75 prerequisite-patch-id: 41c39d0df627b7c1856cc8bc4d099f408983d6cd prerequisite-patch-id: 80397d3462f248e4ca0e9f3bcb2d793178b03142 prerequisite-patch-id: 490c8f45203ef4d2281bddf2b36855ed99e1b2a4 prerequisite-patch-id: 06537d8dd2471934bca5772ddb6556a85a32ee9c prerequisite-patch-id: e1c7842e5c488f6d3790a9c45b69974d8624dce4 prerequisite-patch-id: 55a68f42975a115ab642766965a5e6c8f2c07026 prerequisite-patch-id: 8601bcfa3c7da8d9984ac08e182610b5b52cbba9 prerequisite-patch-id: 8bb54baf7b5a46c0d14606c2f1020e943633954e prerequisite-patch-id: f9b1926bdaa91bb4879b8e28f6849df8d6a9ae64 prerequisite-patch-id: 2c928f3693350ad60bff02897240e379ab8fab1a diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 0d8c0a5c39c9..03ac6345247c 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -527,7 +527,7 @@ ControlInfo::ControlInfo(Span values, ControlInfo::ControlInfo(std::set values, bool def) : min_(false), max_(true), def_(def), values_({ false, true }) { - assert(values.count(def) && values.size() == 2); + ASSERT(values.count(def) && values.size() == 2); } /**