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

New Locallab procparams structure

Browse Source 
Locallab procparams structure updated to improve robustness
NB: Some default params have been modified
This commit is contained in:
Pandagrapher
2018-10-18 19:23:26 +02:00
parent 88c5214a47
commit bf2b7905d3
10 changed files with 1174 additions and 1383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
rtengine/dcrop.cc
View File

@@ -933,25 +933,25 @@ void Crop::update(int todo)
int maxspot = 1;
if (needslocal) {
for (int sp = 0; sp < params.locallab.nbspot; sp++) {
locRETgainCurve.Set(params.locallab.localTgaincurve.at(sp));
loclhCurve.Set(params.locallab.LHcurve.at(sp), LHutili);
lochhCurve.Set(params.locallab.HHcurve.at(sp), HHutili);
for (int sp = 0; sp < params.locallab.nbspot && sp < (int)params.locallab.spots.size(); sp++) {
locRETgainCurve.Set(params.locallab.spots.at(sp).localTgaincurve);
loclhCurve.Set(params.locallab.spots.at(sp).LHcurve, LHutili);
lochhCurve.Set(params.locallab.spots.at(sp).HHcurve, HHutili);
locallutili = false;
CurveFactory::curveLocal(locallutili, params.locallab.llcurve.at(sp), lllocalcurve2, sca);
CurveFactory::curveLocal(locallutili, params.locallab.spots.at(sp).llcurve, lllocalcurve2, sca);
localcutili = false;
CurveFactory::curveCCLocal(localcutili, params.locallab.cccurve.at(sp), cclocalcurve2, sca);
CurveFactory::curveCCLocal(localcutili, params.locallab.spots.at(sp).cccurve, cclocalcurve2, sca);
//localskutili = false;
CurveFactory::curveskLocal(localskutili, params.locallab.skintonescurve.at(sp), sklocalcurve2, sca);
CurveFactory::curveexLocal(localexutili, params.locallab.excurve.at(sp), exlocalcurve2, sca);
CurveFactory::curveskLocal(localskutili, params.locallab.spots.at(sp).skintonescurve, sklocalcurve2, sca);
CurveFactory::curveexLocal(localexutili, params.locallab.spots.at(sp).excurve, exlocalcurve2, sca);
double ecomp = params.locallab.expcomp.at(sp);
double black = params.locallab.black.at(sp);
double hlcompr = params.locallab.hlcompr.at(sp);
double hlcomprthresh = params.locallab.hlcomprthresh.at(sp);
double shcompr = params.locallab.shcompr.at(sp);
double br = params.locallab.lightness.at(sp);
double ecomp = params.locallab.spots.at(sp).expcomp;
double black = params.locallab.spots.at(sp).black;
double hlcompr = params.locallab.spots.at(sp).hlcompr;
double hlcomprthresh = params.locallab.spots.at(sp).hlcomprthresh;
double shcompr = params.locallab.spots.at(sp).shcompr;
double br = params.locallab.spots.at(sp).lightness;
CurveFactory::complexCurvelocal(ecomp, black / 65535., hlcompr, hlcomprthresh, shcompr, br,
hltonecurveloc2, shtonecurveloc2, tonecurveloc2, lightCurveloc2,