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

merge with dev

Browse Source
This commit is contained in:
Desmis 2019-06-06 08:48:12 +02:00
commit 68b05e3a80
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/ipvibrance.cc
View File

@ -610,6 +610,7 @@ void ImProcFunctions::vibrance (LabImage* lab, const procparams::VibranceParams
const float fyy = Color::c1By116 * Lprov + Color::c16By116; const float fyy = Color::c1By116 * Lprov + Color::c16By116;
const float yy_ = (Lprov > Color::epskap) ? fyy * fyy*fyy : Lprov / Color::kappaf; const float yy_ = (Lprov > Color::epskap) ? fyy * fyy*fyy : Lprov / Color::kappaf;
float ChprovOld = std::numeric_limits<float>::min();
do { do {
inGamut = true; inGamut = true;
@ -623,10 +624,15 @@ void ImProcFunctions::vibrance (LabImage* lab, const procparams::VibranceParams
hhModified = false; hhModified = false;
} }
} }
aprovn = Chprov * sincosval.y; aprovn = Chprov * sincosval.y;
bprovn = Chprov * sincosval.x; bprovn = Chprov * sincosval.x;
if (Chprov == ChprovOld) { // avoid endless loop
break;
} else {
ChprovOld = Chprov;
}
float fxx = 0.002f * aprovn + fyy; float fxx = 0.002f * aprovn + fyy;
float fzz = fyy - 0.005f * bprovn; float fzz = fyy - 0.005f * bprovn;
float xx_ = Color::f2xyz(fxx) * Color::D50x; float xx_ = Color::f2xyz(fxx) * Color::D50x;