From patchwork Wed May 8 11:52:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 20019 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 EDECFBDE6B for ; Wed, 8 May 2024 11:53:03 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 07BE962C9F; Wed, 8 May 2024 13:53:03 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="hN6xYV9b"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id AED4961A73 for ; Wed, 8 May 2024 13:53:00 +0200 (CEST) Received: from Monstersaurus.local (cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 97253B0B; Wed, 8 May 2024 13:52:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1715169177; bh=7Jx5+njQ3Xzit6jAEbBDBUjAfIo/McX+bzSu2l3KLP0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hN6xYV9bJbTCnT0hFGoTfCjkMsyTsswQYRx4uLz9ImgmXwQcgGGgcpLhL3nhqs/Ex TGlKLODlz+fqxIpuk+zPonM+EqMzIa9kQyf6hPSqT2QcgnuK6n/PPuotCIDvNO8BAt 8bEiznfQkDQrDTHY9cDx/nm4nunBPNBBSNDPUPgk= From: Kieran Bingham To: libcamera devel , Daniel Scally Cc: Kieran Bingham Subject: [PATCH 1/2] fixup! ipa: libipa: Add AgcMeanLuminance base class Date: Wed, 8 May 2024 12:52:49 +0100 Message-Id: <20240508115249.4182914-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240502133046.1976565-5-dan.scally@ideasonboard.com> References: <20240502133046.1976565-5-dan.scally@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" I will apply this series with the following fixup. Fixes: FAILED: src/ipa/libipa/libipa.a.p/agc_mean_luminance.cpp.o clang++ -Isrc/ipa/libipa/libipa.a.p -Isrc/ipa/libipa -I../src/ipa/libipa -Iinclude -I../include -Iinclude/libcamera/ipa -Iinclude/libcamera -fcolor-diagnostics -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -std=c++17 -O0 -g -stdlib=libc++ -Wextra-semi -Wthread-safety -Wshadow -include /builds/camera/libcamera/build/config.h -Wno-c99-designator -fPIC -DLIBCAMERA_BASE_PRIVATE -MD -MQ src/ipa/libipa/libipa.a.p/agc_mean_luminance.cpp.o -MF src/ipa/libipa/libipa.a.p/agc_mean_luminance.cpp.o.d -o src/ipa/libipa/libipa.a.p/agc_mean_luminance.cpp.o -c ../src/ipa/libipa/agc_mean_luminance.cpp In file included from ../src/ipa/libipa/agc_mean_luminance.cpp:8: ../src/ipa/libipa/agc_mean_luminance.h:94:2: error: extra ';' outside of a function is incompatible with C++98 [-Werror,-Wc++98-compat-extra-semi] }; /* namespace ipa */ ^ ../src/ipa/libipa/agc_mean_luminance.h:96:2: error: extra ';' outside of a function is incompatible with C++98 [-Werror,-Wc++98-compat-extra-semi] }; /* namespace libcamera */ ^ ../src/ipa/libipa/agc_mean_luminance.cpp:575:2: error: extra ';' outside of a function is incompatible with C++98 [-Werror,-Wc++98-compat-extra-semi] }; /* namespace ipa */ ^ ../src/ipa/libipa/agc_mean_luminance.cpp:577:2: error: extra ';' outside of a function is incompatible with C++98 [-Werror,-Wc++98-compat-extra-semi] }; /* namespace libcamera */ ^ 4 errors generated. Signed-off-by: Kieran Bingham --- src/ipa/libipa/agc_mean_luminance.cpp | 4 ++-- src/ipa/libipa/agc_mean_luminance.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ipa/libipa/agc_mean_luminance.cpp b/src/ipa/libipa/agc_mean_luminance.cpp index 004d84d8c5d8..2bf84d05b6dd 100644 --- a/src/ipa/libipa/agc_mean_luminance.cpp +++ b/src/ipa/libipa/agc_mean_luminance.cpp @@ -572,6 +572,6 @@ AgcMeanLuminance::calculateNewEv(uint32_t constraintModeIndex, * their configure() function. */ -}; /* namespace ipa */ +} /* namespace ipa */ -}; /* namespace libcamera */ +} /* namespace libcamera */ diff --git a/src/ipa/libipa/agc_mean_luminance.h b/src/ipa/libipa/agc_mean_luminance.h index ef8ba28fd6ab..0a81c6d285b8 100644 --- a/src/ipa/libipa/agc_mean_luminance.h +++ b/src/ipa/libipa/agc_mean_luminance.h @@ -91,6 +91,6 @@ private: ControlInfoMap::Map controls_; }; -}; /* namespace ipa */ +} /* namespace ipa */ -}; /* namespace libcamera */ +} /* namespace libcamera */