From c88b6e259c00dd4fca9ce20d103eefd7a9514987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Fri, 3 Apr 2026 12:20:48 +0200 Subject: [PATCH] libcamera: software_isp: debayer: Add missing `override` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add the missing `override` specifiers in the derived classes of `Debayer`, so that the compiler can ensure that the functions in the derived classes really override the functions in the base class. Signed-off-by: Barnabás Pőcze Reviewed-by: Kieran Bingham Reviewed-by: Bryan O'Donoghue --- src/libcamera/software_isp/debayer_cpu.h | 18 +++++++++--------- src/libcamera/software_isp/debayer_egl.h | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h index 05fecc8f..39a0ea6e 100644 --- a/src/libcamera/software_isp/debayer_cpu.h +++ b/src/libcamera/software_isp/debayer_cpu.h @@ -36,16 +36,16 @@ public: int configure(const StreamConfiguration &inputCfg, const std::vector> &outputCfgs, - bool ccmEnabled); - Size patternSize(PixelFormat inputFormat); - std::vector formats(PixelFormat input); + bool ccmEnabled) override; + Size patternSize(PixelFormat inputFormat) override; + std::vector formats(PixelFormat input) override; std::tuple - strideAndFrameSize(const PixelFormat &outputFormat, const Size &size); - void process(uint32_t frame, FrameBuffer *input, FrameBuffer *output, const DebayerParams ¶ms); - int start(); - void stop(); - SizeRange sizes(PixelFormat inputFormat, const Size &inputSize); - const SharedFD &getStatsFD() { return stats_->getStatsFD(); } + strideAndFrameSize(const PixelFormat &outputFormat, const Size &size) override; + void process(uint32_t frame, FrameBuffer *input, FrameBuffer *output, const DebayerParams ¶ms) override; + int start() override; + void stop() override; + SizeRange sizes(PixelFormat inputFormat, const Size &inputSize) override; + const SharedFD &getStatsFD() override { return stats_->getStatsFD(); } private: friend class DebayerCpuThread; diff --git a/src/libcamera/software_isp/debayer_egl.h b/src/libcamera/software_isp/debayer_egl.h index bdde676f..d563bfa5 100644 --- a/src/libcamera/software_isp/debayer_egl.h +++ b/src/libcamera/software_isp/debayer_egl.h @@ -43,20 +43,20 @@ public: int configure(const StreamConfiguration &inputCfg, const std::vector> &outputCfgs, - bool ccmEnabled); + bool ccmEnabled) override; - Size patternSize(PixelFormat inputFormat); + Size patternSize(PixelFormat inputFormat) override; - std::vector formats(PixelFormat input); - std::tuple strideAndFrameSize(const PixelFormat &outputFormat, const Size &size); + std::vector formats(PixelFormat input) override; + std::tuple strideAndFrameSize(const PixelFormat &outputFormat, const Size &size) override; - void process(uint32_t frame, FrameBuffer *input, FrameBuffer *output, const DebayerParams ¶ms); - int start(); - void stop(); + void process(uint32_t frame, FrameBuffer *input, FrameBuffer *output, const DebayerParams ¶ms) override; + int start() override; + void stop() override; - const SharedFD &getStatsFD() { return stats_->getStatsFD(); } + const SharedFD &getStatsFD() override { return stats_->getStatsFD(); } - SizeRange sizes(PixelFormat inputFormat, const Size &inputSize); + SizeRange sizes(PixelFormat inputFormat, const Size &inputSize) override; private: static int getInputConfig(PixelFormat inputFormat, DebayerInputConfig &config);