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

Retinex: Fixed crash in queue and race conditions in histogram

Browse Source
This commit is contained in:
heckflosse
2015-09-14 14:49:43 +02:00
parent 270367c592
commit c59fca2d6a
5 changed files with 147 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/simpleprocess.cc
View File

@@ -118,15 +118,15 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
if(params.retinex.enabled) { //enabled Retinex
LUTf cdcurve (65536, 0);
LUTu dum;
LUTu dummy;
RetinextransmissionCurve dehatransmissionCurve;
bool dehacontlutili = false;
bool useHsl = false;
multi_array2D<float, 3> conversionBuffer(1, 1);
imgsrc->retinexPrepareBuffers(params.icm, params.retinex, conversionBuffer, dum);
imgsrc->retinexPrepareCurves(params.retinex, cdcurve, dehatransmissionCurve, dehacontlutili, useHsl, dum, dum);
imgsrc->retinexPrepareBuffers(params.icm, params.retinex, conversionBuffer, dummy);
imgsrc->retinexPrepareCurves(params.retinex, cdcurve, dehatransmissionCurve, dehacontlutili, useHsl, dummy, dummy );
float minCD, maxCD, mini, maxi, Tmean, Tsigma, Tmin, Tmax;
imgsrc->retinex( params.icm, params.retinex, cdcurve, dehatransmissionCurve, conversionBuffer, dehacontlutili, useHsl, minCD, maxCD, mini, maxi, Tmean, Tsigma, Tmin, Tmax, dum, dum);
imgsrc->retinex( params.icm, params.retinex, cdcurve, dehatransmissionCurve, conversionBuffer, dehacontlutili, useHsl, minCD, maxCD, mini, maxi, Tmean, Tsigma, Tmin, Tmax, dummy);
}
if (pl) {