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

Limits incompatibility between Ciecam and CBDL and others to Cam02 #7017 (#7023)

Browse Source 
* CBDL and others only with ciecam Cam16

* Change windows and appimage yml

* Remove appimage.yml and windows.yml
This commit is contained in:
Desmis
2024-04-20 17:34:53 +02:00
committed by GitHub
parent 30cf3f721f
commit c72e67ae24
4 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rtengine/simpleprocess.cc
View File

@@ -1004,7 +1004,7 @@ private:
}
}
}
//colorappearance.modelmethod == "02"
bool execcam = false;
//execcam => work around for pre-ciecam in LA: about 0.1 second
@@ -1523,7 +1523,8 @@ private:
ipf.chromiLuminanceCurve(nullptr, 1, labView, labView, curve1, curve2, satcurve, lhskcurve, clcurve, lumacurve, utili, autili, butili, ccutili, cclutili, clcutili, dummy, dummy);
if ((params.colorappearance.enabled && !params.colorappearance.tonecie) || (!params.colorappearance.enabled)) {
// if ((params.colorappearance.enabled && !params.colorappearance.tonecie) || (!params.colorappearance.enabled)) {
if ((params.colorappearance.enabled && !params.colorappearance.tonecie) || (params.colorappearance.modelmethod != "02")) {
ipf.EPDToneMap(labView, 0, 1);
}
@@ -1533,7 +1534,8 @@ private:
// for all treatments Defringe, Sharpening, Contrast detail ,Microcontrast they are activated if "CIECAM" function are disabled
if ((params.colorappearance.enabled && !settings->autocielab) || (!params.colorappearance.enabled)) {
// if ((params.colorappearance.enabled && !settings->autocielab) || (!params.colorappearance.enabled)) {
if ((params.colorappearance.enabled && !settings->autocielab) || (params.colorappearance.modelmethod != "02")) {
ipf.impulsedenoise(labView);
ipf.defringe(labView);
}
@@ -1543,12 +1545,14 @@ private:
}
if (params.sharpenMicro.enabled) {
if ((params.colorappearance.enabled && !settings->autocielab) || (!params.colorappearance.enabled)) {
// if ((params.colorappearance.enabled && !settings->autocielab) || (!params.colorappearance.enabled)) {
if ((params.colorappearance.enabled && !settings->autocielab) || (params.colorappearance.modelmethod != "02")) {
ipf.MLmicrocontrast(labView); //!params.colorappearance.sharpcie
}
}
if (((params.colorappearance.enabled && !settings->autocielab) || (!params.colorappearance.enabled)) && params.sharpening.enabled) {
// if (((params.colorappearance.enabled && !settings->autocielab) || (!params.colorappearance.enabled)) && params.sharpening.enabled) {
if (((params.colorappearance.enabled && !settings->autocielab) || (params.colorappearance.modelmethod != "02")) && params.sharpening.enabled) {
ipf.sharpening(labView, params.sharpening);
}
@@ -1557,7 +1561,8 @@ private:
// directional pyramid wavelet
if (params.dirpyrequalizer.cbdlMethod == "aft") {
if ((params.colorappearance.enabled && !settings->autocielab) || !params.colorappearance.enabled) {
// if ((params.colorappearance.enabled && !settings->autocielab) || !params.colorappearance.enabled) {
if ((params.colorappearance.enabled && !settings->autocielab) || params.colorappearance.modelmethod != "02") {
ipf.dirpyrequalizer(labView, 1); //TODO: this is the luminance tonecurve, not the RGB one
}
}
@@ -1935,7 +1940,8 @@ private:
}
}
bool bwonly = params.blackwhite.enabled && !params.colorToning.enabled && !autili && !butili && !params.colorappearance.enabled;
// bool bwonly = params.blackwhite.enabled && !params.colorToning.enabled && !autili && !butili && !params.colorappearance.enabled;
bool bwonly = params.blackwhite.enabled && !params.colorToning.enabled && !autili && !butili && params.colorappearance.modelmethod != "02";
///////////// Custom output gamma has been removed, the user now has to create
///////////// a new output profile with the ICCProfileCreator