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

Selective Editing - Retinex in global mode issue 7367 (#7370)

Browse Source 
* Change in transit_shapedetect_retinex to take into account Global mode

* Change appimage.yml and windows.yml

* Set appimage.yml and windows.yml to neutral
This commit is contained in:
Desmis 2025-04-27 08:31:58 +02:00 committed by GitHub
parent b8d094dd78
commit 0c9997f897
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
rtengine/iplocallab.cc
View File

@ -8247,10 +8247,19 @@ void ImProcFunctions::transit_shapedetect_retinex(int call, int senstype, LabIma
const bool retishow = ((lp.showmaskretimet == 1 || lp.showmaskretimet == 2)); const bool retishow = ((lp.showmaskretimet == 1 || lp.showmaskretimet == 2));
const bool previewreti = ((lp.showmaskretimet == 4)); const bool previewreti = ((lp.showmaskretimet == 4));
//balance deltaE
const float kL = lp.balance / SQR(327.68f); //balance deltaE - keep for Global
const float kab = balancedeltaE(lp.balance) / SQR(327.68f); float balanceglobal = lp.balance;
const float kH = lp.balanceh; float balanceHglobal = lp.balanceh;
if(lp.fullim == 3 ) {//disable scope, but keep calculation of reducdE
balanceglobal = 1.f;
balanceHglobal = 1.f;
}
const float kL = balanceglobal / SQR(327.68f);
const float kab = balancedeltaE(balanceglobal) / SQR(327.68f);
const float kH = balanceHglobal;
const float kch = balancedeltaE(kH); const float kch = balancedeltaE(kH);
if (lp.colorde == 0) { if (lp.colorde == 0) {
@ -8266,6 +8275,16 @@ void ImProcFunctions::transit_shapedetect_retinex(int call, int senstype, LabIma
float bbdark = darklim; float bbdark = darklim;
*/ */
const bool showmas = lp.showmaskretimet == 3 ; const bool showmas = lp.showmaskretimet == 3 ;
// keep for Global
float varsensglobal = varsens;
float thrglobal = lp.thr;
float iteratglobal = lp.iterat;
if(lp.fullim == 3 ) {//Global - disable scope, but keep calculation of reducdE
varsensglobal = 100.f;
thrglobal = 2.f;
iteratglobal = 2.f;
}
const std::unique_ptr<LabImage> origblur(new LabImage(GW, GH)); const std::unique_ptr<LabImage> origblur(new LabImage(GW, GH));
const float radius = 3.f / sk; const float radius = 3.f / sk;
@ -8285,15 +8304,14 @@ void ImProcFunctions::transit_shapedetect_retinex(int call, int senstype, LabIma
gaussianBlur(original->b, origblur->b, GW, GH, radius); gaussianBlur(original->b, origblur->b, GW, GH, radius);
} }
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel if (multiThread) #pragma omp parallel if (multiThread)
#endif #endif
{ {
const float mindE = 2.f + MINSCOPE * varsens * lp.thr; const float mindE = 2.f + MINSCOPE * varsensglobal * thrglobal;
const float maxdE = 5.f + MAXSCOPE * varsens * (1 + 0.1f * lp.thr); const float maxdE = 5.f + MAXSCOPE * varsensglobal * (1 + 0.1f * thrglobal);
const float mindElim = 2.f + MINSCOPE * limscope * lp.thr; const float mindElim = 2.f + MINSCOPE * limscope * thrglobal;
const float maxdElim = 5.f + MAXSCOPE * limscope * (1 + 0.1f * lp.thr); const float maxdElim = 5.f + MAXSCOPE * limscope * (1 + 0.1f * thrglobal);
float previewint = 0.f; //reducdE * 10000.f * lp.colorde; //settings->previewselection; float previewint = 0.f; //reducdE * 10000.f * lp.colorde; //settings->previewselection;
#ifdef _OPENMP #ifdef _OPENMP
@ -8346,11 +8364,9 @@ void ImProcFunctions::transit_shapedetect_retinex(int call, int senstype, LabIma
} }
float cli, clc; float cli, clc;
float reducdE = calcreducdE(dE, maxdE, mindE, maxdElim, mindElim, lp.iterat, limscope, varsens) / 100.f; //take into account for Global
float reducdE = calcreducdE(dE, maxdE, mindE, maxdElim, mindElim, iteratglobal, limscope, varsensglobal) / 100.f;
if(lp.fullim == 3 ) {//disable scope
reducdE = 1.f;
}
previewint = reducdE * 10000.f * lp.colorde; //settings->previewselection; previewint = reducdE * 10000.f * lp.colorde; //settings->previewselection;