Merge pull request #7239 from Beep6581/channel-mixer-deactivated-fix

Fix for channel mixer deactivation
This commit is contained in:
Lawrence37 2024-11-24 16:11:52 -08:00 committed by GitHub
commit 74adad2c8c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -2039,9 +2039,9 @@ void ImProcFunctions::rgbProc(Imagefloat* working, LabImage* lab, PipetteBuffer
}; };
bool mixchannels = params->chmixer.enabled && bool mixchannels = params->chmixer.enabled &&
(params->chmixer.red[0] != 100 || params->chmixer.red[1] != 0 || params->chmixer.red[2] != 0 || (params->chmixer.red[0] != 1000 || params->chmixer.red[1] != 0 || params->chmixer.red[2] != 0 ||
params->chmixer.green[0] != 0 || params->chmixer.green[1] != 100 || params->chmixer.green[2] != 0 || params->chmixer.green[0] != 0 || params->chmixer.green[1] != 1000 || params->chmixer.green[2] != 0 ||
params->chmixer.blue[0] != 0 || params->chmixer.blue[1] != 0 || params->chmixer.blue[2] != 100); params->chmixer.blue[0] != 0 || params->chmixer.blue[1] != 0 || params->chmixer.blue[2] != 1000);
FlatCurve* hCurve = nullptr; FlatCurve* hCurve = nullptr;
FlatCurve* sCurve = nullptr; FlatCurve* sCurve = nullptr;