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

Change order of Retinex and Colour Propagation

Browse Source
This commit is contained in:
heckflosse
2015-11-02 00:36:57 +01:00
parent 6dbb1af4c9
commit 684a5dc5e7
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
rtengine/improccoordinator.cc
View File

@@ -242,20 +242,6 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
}
}
if (params.retinex.enabled) {
bool dehacontlutili = false;
bool useHsl = false;
LUTf cdcurve (65536, 0);
imgsrc->retinexPrepareCurves(params.retinex, cdcurve, dehatransmissionCurve, dehacontlutili, useHsl, lhist16RETI, histLRETI);
float minCD, maxCD, mini, maxi, Tmean, Tsigma, Tmin, Tmax;
imgsrc->retinex( params.icm, params.retinex, params.toneCurve, cdcurve, dehatransmissionCurve, conversionBuffer, dehacontlutili, useHsl, minCD, maxCD, mini, maxi, Tmean, Tsigma, Tmin, Tmax, histLRETI);//enabled Retinex
if(dehaListener) {
dehaListener->minmaxChanged(maxCD, minCD, mini, maxi, Tmean, Tsigma, Tmin, Tmax);
}
}
// Updating toneCurve.hrenabled if necessary
// It has to be done there, because the next 'if' statement will use the value computed here
@@ -275,7 +261,24 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
MyMutex::MyLock initLock(minit); // Also used in crop window
imgsrc->HLRecovery_Global( params.toneCurve); // this handles Color HLRecovery
}
if (params.retinex.enabled) {
bool dehacontlutili = false;
bool useHsl = false;
LUTf cdcurve (65536, 0);
imgsrc->retinexPrepareCurves(params.retinex, cdcurve, dehatransmissionCurve, dehacontlutili, useHsl, lhist16RETI, histLRETI);
float minCD, maxCD, mini, maxi, Tmean, Tsigma, Tmin, Tmax;
imgsrc->retinex( params.icm, params.retinex, params.toneCurve, cdcurve, dehatransmissionCurve, conversionBuffer, dehacontlutili, useHsl, minCD, maxCD, mini, maxi, Tmean, Tsigma, Tmin, Tmax, histLRETI);//enabled Retinex
if(dehaListener) {
dehaListener->minmaxChanged(maxCD, minCD, mini, maxi, Tmean, Tsigma, Tmin, Tmax);
}
}
if (todo & (M_INIT | M_LINDENOISE)) {
MyMutex::MyLock initLock(minit); // Also used in crop window
if (settings->verbose) {
printf ("Applying white balance, color correction & sRBG conversion...\n");

5
rtengine/simpleprocess.cc
View File

@@ -116,6 +116,8 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
pl->setProgress (0.30);
}
imgsrc->HLRecovery_Global( params.toneCurve );
if(params.retinex.enabled) { //enabled Retinex
LUTf cdcurve (65536, 0);
LUTu dummy;
@@ -134,9 +136,6 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
pl->setProgress (0.40);
}
imgsrc->HLRecovery_Global( params.toneCurve );
if (pl) {
pl->setProgress (0.45);
}