liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable ToneMapping when Cam02 enabled and Ciecam disabled (#7190)

Browse Source
This commit is contained in:
Desmis
2024-09-17 08:30:11 +02:00
committed by GitHub
parent 348c8e8894
commit 7cdfa941c2
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rtengine/dcrop.cc
View File

@@ -812,9 +812,11 @@ void Crop::update(int todo)
}
const bool needstransform = parent->ipf.needsTransform(skips(parent->fw, skip), skips(parent->fh, skip), parent->imgsrc->getRotateDegree(), parent->imgsrc->getMetaData());
const bool cam02 = params.colorappearance.modelmethod == "02" && params.colorappearance.enabled;
// transform
// if (needstransform || ((todo & (M_TRANSFORM | M_RGBCURVE)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled)) {
if (needstransform || ((todo & (M_TRANSFORM | M_RGBCURVE)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && params.colorappearance.modelmethod != "02")) {
if (needstransform || ((todo & (M_TRANSFORM | M_RGBCURVE)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !cam02)) {
if (!transCrop) {
transCrop = new Imagefloat(cropw, croph);
}
@@ -836,7 +838,7 @@ void Crop::update(int todo)
}
// if ((todo & (M_TRANSFORM | M_RGBCURVE)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) {
if ((todo & (M_TRANSFORM | M_RGBCURVE)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && params.colorappearance.modelmethod != "02") {
if ((todo & (M_TRANSFORM | M_RGBCURVE)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !cam02) {
const int W = baseCrop->getWidth();
const int H = baseCrop->getHeight();
@@ -1333,7 +1335,7 @@ void Crop::update(int todo)
parent->ipf.labColorCorrectionRegions(labnCrop);
// if ((params.colorappearance.enabled && !params.colorappearance.tonecie) || (!params.colorappearance.enabled)) {
if ((params.colorappearance.enabled && !params.colorappearance.tonecie) || (params.colorappearance.modelmethod != "02")) {
if ((params.colorappearance.enabled && !params.colorappearance.tonecie) || (!cam02)) {
parent->ipf.EPDToneMap(labnCrop, 0, skip);
}
@@ -1341,7 +1343,7 @@ void Crop::update(int todo)
// for all treatments Defringe, Sharpening, Contrast detail , Microcontrast they are activated if "CIECAM" function are disabled
if (skip == 1) {
// if ((params.colorappearance.enabled && !settings->autocielab) || (!params.colorappearance.enabled)) {
if ((params.colorappearance.enabled && !settings->autocielab) || (params.colorappearance.modelmethod != "02")) {
if ((params.colorappearance.enabled && !settings->autocielab) || (!cam02)) {
parent->ipf.impulsedenoise(labnCrop);
parent->ipf.defringe(labnCrop);
}
@@ -1349,7 +1351,7 @@ void Crop::update(int todo)
parent->ipf.MLsharpen(labnCrop);
// if ((params.colorappearance.enabled && !settings->autocielab) || (!params.colorappearance.enabled)) {
if ((params.colorappearance.enabled && !settings->autocielab) || (params.colorappearance.modelmethod != "02")) {
if ((params.colorappearance.enabled && !settings->autocielab) || (!cam02)) {
parent->ipf.MLmicrocontrast(labnCrop);
parent->ipf.sharpening(labnCrop, params.sharpening, parent->sharpMask);
}
@@ -1359,7 +1361,7 @@ void Crop::update(int todo)
if (params.dirpyrequalizer.cbdlMethod == "aft") {
// if (((params.colorappearance.enabled && !settings->autocielab) || (!params.colorappearance.enabled))) {
if (((params.colorappearance.enabled && !settings->autocielab) || (params.colorappearance.modelmethod != "02"))) {
if (((params.colorappearance.enabled && !settings->autocielab) || (!cam02))) {
parent->ipf.dirpyrequalizer(labnCrop, skip);
// parent->ipf.Lanczoslab (labnCrop,labnCrop , 1.f/skip);
}