From 757d84c378a384b630fd8a9cf720d8655dfb5e4e Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Wed, 27 Dec 2023 20:40:57 +0100 Subject: [PATCH] Ensure key member initialization - RGB Channels --- libsrc/utils/RgbChannelAdjustment.cpp | 12 +++++------- libsrc/utils/RgbTransform.cpp | 6 ++++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libsrc/utils/RgbChannelAdjustment.cpp b/libsrc/utils/RgbChannelAdjustment.cpp index 25f24a91..35935b8f 100644 --- a/libsrc/utils/RgbChannelAdjustment.cpp +++ b/libsrc/utils/RgbChannelAdjustment.cpp @@ -1,16 +1,14 @@ #include RgbChannelAdjustment::RgbChannelAdjustment(QString channelName) + : RgbChannelAdjustment(0, 0, 0, channelName) +{ +} + +RgbChannelAdjustment::RgbChannelAdjustment(uint8_t adjustR, uint8_t adjustG, uint8_t adjustB, QString channelName ) : _channelName(channelName) , _log(Logger::getInstance(channelName)) , _brightness(0) -{ - resetInitialized(); -} - -RgbChannelAdjustment::RgbChannelAdjustment(uint8_t adjustR, uint8_t adjustG, uint8_t adjustB, QString channelName) - : _channelName(channelName) - , _log(Logger::getInstance(channelName)) { setAdjustment(adjustR, adjustG, adjustB); } diff --git a/libsrc/utils/RgbTransform.cpp b/libsrc/utils/RgbTransform.cpp index cc1a74e0..9a988ed5 100644 --- a/libsrc/utils/RgbTransform.cpp +++ b/libsrc/utils/RgbTransform.cpp @@ -2,13 +2,15 @@ #include RgbTransform::RgbTransform() + : RgbTransform::RgbTransform(1.0, 1.0, 1.0, 0.0, false, 100, 100) { - init(1.0, 1.0, 1.0, 0.0, false, 100, 100); } RgbTransform::RgbTransform(double gammaR, double gammaG, double gammaB, double backlightThreshold, bool backlightColored, uint8_t brightness, uint8_t brightnessCompensation) + : _brightness(brightness) + , _brightnessCompensation(brightnessCompensation) { - init(gammaR, gammaG, gammaB, backlightThreshold, backlightColored, brightness, brightnessCompensation); + init(gammaR, gammaG, gammaB, backlightThreshold, backlightColored, _brightness, _brightnessCompensation); } void RgbTransform::init(double gammaR, double gammaG, double gammaB, double backlightThreshold, bool backlightColored, uint8_t brightness, uint8_t brightnessCompensation)