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

DeHaze enhancements (Desmis) and some bugfixes (heckflosse)

Browse Source
This commit is contained in:
heckflosse
2015-09-03 17:34:05 +02:00
parent 8511131771
commit 8b911d4789
19 changed files with 1100 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rtengine/simpleprocess.cc
View File

@@ -115,25 +115,30 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
if (pl) {
pl->setProgress (0.30);
}
if(params.dehaz.enabled) { //enabled Dehaze
LUTf cdcurve (65536, 0);
bool dehacontlutili=false;
DehaztransmissionCurve dehatransmissionCurve;
bool dehacontlutili = false;
CurveFactory::curveDehaContL (dehacontlutili, params.dehaz.cdcurve, cdcurve, 1);
imgsrc->dehaz( params.raw, params.icm, params.dehaz, cdcurve, dehacontlutili );
DehazParams DehaParams = params.dehaz;
DehaParams.getCurves(dehatransmissionCurve);
imgsrc->dehaz( params.raw, params.icm, params.dehaz, cdcurve, dehatransmissionCurve, dehacontlutili );
}
if (pl) {
pl->setProgress (0.40);
}
imgsrc->HLRecovery_Global( params.toneCurve );
if (pl) {
pl->setProgress (0.45);
}
// set the color temperature
ColorTemp currWB = ColorTemp (params.wb.temperature, params.wb.green, params.wb.equal, params.wb.method);
@@ -913,7 +918,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
params.labCurve.acurve, params.labCurve.bcurve, params.labCurve.cccurve, params.labCurve.lccurve, curve1, curve2, satcurve, lhskcurve,
hist16C, hist16C, dummy, dummy,
1);
// ipf.MSR(labView, labView->W, labView->H, 1);
// ipf.MSR(labView, labView->W, labView->H, 1);
ipf.chromiLuminanceCurve (NULL, 1, labView, labView, curve1, curve2, satcurve, lhskcurve, clcurve, lumacurve, utili, autili, butili, ccutili, cclutili, clcutili, dummy, dummy, dummy, dummy);