From patchwork Tue Feb 11 17:20:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 22776 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 F0181C32F5 for ; Tue, 11 Feb 2025 17:21:25 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id DDEE568626; Tue, 11 Feb 2025 18:21:24 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="fNmuyBiU"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 842FA685BE for ; Tue, 11 Feb 2025 18:21:23 +0100 (CET) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:266b:fb7d:9d59:9e92]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1B43073E; Tue, 11 Feb 2025 18:20:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1739294406; bh=4/Ua7Z2hfOG+FLdW+SZ7WVVJEzUR/CtpdYosSFTqeFk=; h=From:To:Cc:Subject:Date:From; b=fNmuyBiUZiOZHKDBRdsj9aFr+C36c/1teX3zVgwlZa0RrT4jYwAuzxYjA63b96R6D F91VzGd6LHlKbqLHSzRyNwpNapwvqoS/r38qUJlAnVzmDvSgE4Q/tjOQrM12ghMAkV wpSLW5wEu2loQej832HH7xg0htNEcpqxsHBA3qKA= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug Subject: [PATCH] ipa: rkisp1: agc: Fix build on debian 11 (gcc-9) Date: Tue, 11 Feb 2025 18:20:56 +0100 Message-ID: <20250211172115.210087-1-stefan.klug@ideasonboard.com> X-Mailer: git-send-email 2.43.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" Apparently not every compiler is able to deduce types the same way. Fix compile on gcc-9 by explicitly specifying the type. Fixes: ee918b370a08 ("ipa: rkisp1: agc: Initialize enum controls with a list of values") Signed-off-by: Stefan Klug Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- Hi all, Unfortunately I broke the CI build of mainline :-(. This patch fixes it. A corresponding CI run is here: https://gitlab.freedesktop.org/camera/libcamera/-/pipelines/1362476 Best regards, Stefan src/ipa/rkisp1/algorithms/agc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp index e7c6de757593..45ec72188b3a 100644 --- a/src/ipa/rkisp1/algorithms/agc.cpp +++ b/src/ipa/rkisp1/algorithms/agc.cpp @@ -151,11 +151,11 @@ int Agc::init(IPAContext &context, const YamlObject &tuningData) context.ctrlMap[&controls::ExposureTimeMode] = ControlInfo({ { ControlValue(controls::ExposureTimeModeAuto), ControlValue(controls::ExposureTimeModeManual) } }, - controls::ExposureTimeModeAuto); + ControlValue(controls::ExposureTimeModeAuto)); context.ctrlMap[&controls::AnalogueGainMode] = ControlInfo({ { ControlValue(controls::AnalogueGainModeAuto), ControlValue(controls::AnalogueGainModeManual) } }, - controls::AnalogueGainModeAuto); + ControlValue(controls::AnalogueGainModeAuto)); /* \todo Move this to the Camera class */ context.ctrlMap[&controls::AeEnable] = ControlInfo(false, true, true); context.ctrlMap.merge(controls());