From patchwork Fri Sep 2 22:49:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Rauch X-Patchwork-Id: 17283 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 E7886C327D for ; Fri, 2 Sep 2022 22:49:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9A29762003; Sat, 3 Sep 2022 00:49:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1662158985; bh=43Wc/2BpudvfrX/o3utclvPD0GpzMKvzRuoMqKNZyAc=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=aQuJPRWiXa3tyYwXG5gxwfYBBEl9/InlRX/4ARbP6qZEpgia9NziFuvYBd5tbOG8M 30HGrsTXl7VYBxslH8j98xn4cdnhbPrmh18HYano9eTdlxBVeQssViu0Y40pH64vzT p0SDr5+TBXN+4wDaRTPrxze46j45/0t8eP9dfPxTmAen9POVw1Xx8mpCEvNEVk4IAP c/FXV+uXh46NgLmRDt+ZaPAHOyjIsJ21gv2JaEx++POTXxkDqYoHwJVDfLNYcceaYz GLenlN8UTozjxtBvkAz9h3WpUzk9EvVPunyuuirfLrrekh5zlY5Xv0YXuoIB6gtAyO XBYlIcxvsFMUw== Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C32B161F98 for ; Sat, 3 Sep 2022 00:49:42 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=gmx.net header.i=@gmx.net header.b="IA35MEPn"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1662158982; bh=43Wc/2BpudvfrX/o3utclvPD0GpzMKvzRuoMqKNZyAc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=IA35MEPnHro8EySkf/GvRkBwE1ViYjQnP9SKMeG2tzGjEhkDmzMhRNRmzqxIXIGgQ 0tcgwp81spMPwlmBNcn5MRaNjXQlAHZmQvEu5Rnkb4+irnKWxW+QKXXPX/WsL20Uh/ 19glWxpZ7JOu19ISmOWtYsIV7z8nhon+tWnOV5AI= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from voyager ([88.152.184.103]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MWASY-1os0mC1PwI-00Xeyb; Sat, 03 Sep 2022 00:49:42 +0200 To: libcamera-devel@lists.libcamera.org Date: Sat, 3 Sep 2022 00:49:39 +0200 Message-Id: <20220902224939.111640-2-Rauch.Christian@gmx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220902224939.111640-1-Rauch.Christian@gmx.de> References: <20220902224939.111640-1-Rauch.Christian@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:+U2dkuPU9DeXru8ShUM4nvi5GxyK1y2QAPuaJ7fqhAgu6GtELSK jjTyl709jJGl7PVSRSLp7Go1V2iT2nYivJAvhZvZQoAs5z8W6LgjlU9M7W/Xz2FpImeYXeZ 3Kcf5ugKJU238b9f3M581wOc3K546A9viBY1hvkKW6/biYSYzEtK1ZUvLbhhLPVGT4hi4OV zbzP3v7HdpOdO5KEkWM9g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:+3mYHzLqsa4=:UCsUUrJ0l5GyIqZmc8dFO9 U/YRifkBDGfGf2ViDzqmNBzbH72BShAA+zscJc3YOayvds7qCvic4QB6rhX+2k7/0wtjME1u/ JGzm7l/kbYGnWlbOC580jJX+vFJeuXyBNA4DepiC2ddd98A2smKmf6V5PsP8RQTbBmyJ69Srx LPagpAIx+Lyvx1ssMvKyg98pjCh11E7DVfBfQxKbRH08Jo9cnz/A2DMvopRniSTTZomuq/mCr Rzp3mO/mf5uGF81wJe3NCbeF8sSzpgCUVTObc2BA6+s66an6yR7/x9DwCRuXr7bCaTCtucpm2 HAWls7b9Usmm3N4K/MDFbVoPV0EVY972M140HULsxTRGJwhyu3oc4DLwr15dZ0iQNmgQyjX0W CLf9l0nDt3BaEfXjSRsIHzAtLH94fQvusxKD9cQ7+ScP/1+3UHVCXwQgd+zrd392qLlcG+hYc Kyoljf/dUI44DnfDcUEhkcEfSYsSvVvEE4ZZntH1N5RCK55k7KTC1Xlt0yR/hrtmZm3a5GY1O e0VsGk0UdQUGQCKm+gBkoWuhYwN2hU1Lm7Nqhl+RvO2O8QyNG15MtfOMjuqPqPUqnAs9VGR+9 O6MswCT0tgjS7/kOdAjfjXUyAOgsHuNQ/LuRdHx2TiLnIuip6O/423fDp410ILY1Zji/NyWrx jeH2yXDH2Xj5VD5wdTubWKLT70hA4LjC04H+FyMLG2m5638sS8mAERfg+zXKf8RDbF61wkJUN kUl6JkXafDSXrY9hyI8ttDko4a4VRlriNi2LpTzwmwNjqgkKyY7OV2RjRq0ARrLeGSE5GqFDg 6bQKSj/aBXlF5d8FK6WG4L+nVK8188qGcir2+05adbEmNpPWIrJ5Pgp6PpxZ0Fzq4ZjbJSCJz xLAzetuvhjAQNU/oDpNDTYARY8R4YMOhu/EPHjhVGY/80j0novfOshDewQUBFURg6YwJZtBOE c7x4fSK5xwV4dkhnG8eaHG9bUelT23IjWDSBRWXADJr2PPp2/j9/XyjvlH1Yhj88dRsZxCAuI m6yc2oYxDiG0GRKhuBFh9QFE2Pl7zbVFNxSU4+iQUIMOWQZ+NBTN/uz+oJ9nNGKk7YUUWW56b FDVqohG8XJ4d1OImN0aqweZJBMlRi70DSXhdZnUp85cE2QSG/iDL7IUB0LMcYyV/plUmjKIa0 guzt3aLH06LVcnUvfdA58dwpHm Subject: [libcamera-devel] [PATCH v3 2/2] libcamera: control: initialise control info to ControlTypeNone by default 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: , X-Patchwork-Original-From: Christian Rauch via libcamera-devel From: Christian Rauch Reply-To: Christian Rauch Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The default ControlInfo constructor allows to partially initialised the min/max/def values. Uninitialised values are assigned to 0 by default. This implicit initialisation makes it impossible to distinguish between and uninitialised and an explicitly 0-initialised ControlValue. Default construct the ControlValue in the ControlInfo default contructor to explicitly represent uninitialised values by the ControlTypeNone type. Signed-off-by: Christian Rauch Reviewed-by: Paul Elder --- include/libcamera/controls.h | 6 +++--- test/controls/control_info.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) -- 2.34.1 diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index ebc168fc..38d0a3e8 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -268,9 +268,9 @@ private: class ControlInfo { public: - explicit ControlInfo(const ControlValue &min = 0, - const ControlValue &max = 0, - const ControlValue &def = 0); + explicit ControlInfo(const ControlValue &min = {}, + const ControlValue &max = {}, + const ControlValue &def = {}); explicit ControlInfo(Span values, const ControlValue &def = {}); explicit ControlInfo(std::set values, bool def); diff --git a/test/controls/control_info.cpp b/test/controls/control_info.cpp index 2827473b..56b4101f 100644 --- a/test/controls/control_info.cpp +++ b/test/controls/control_info.cpp @@ -26,8 +26,8 @@ protected: */ ControlInfo brightness; - if (brightness.min().get() != 0 || - brightness.max().get() != 0) { + if (brightness.min().type() != ControlType::ControlTypeNone || + brightness.max().type() != ControlType::ControlTypeNone) { cout << "Invalid control range for Brightness" << endl; return TestFail; }