Solving issue 1937: "Auto-WB goes green when image is re-opened"

This commit is contained in:
natureh 510
2013-07-30 00:53:41 +02:00
parent 50be5a17d9
commit 7b0d84fd15
9 changed files with 17 additions and 17 deletions

View File

@@ -109,9 +109,9 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
if (params.wb.method=="Camera")
currWB = imgsrc->getWB ();
else if (params.wb.method=="Auto") {
double rm, bm, gm;
imgsrc->getAutoWBMultipliers(rm, bm, gm);
currWB.update(rm, bm, gm, params.wb.equal);
double rm, gm, bm;
imgsrc->getAutoWBMultipliers(rm, gm, bm);
currWB.update(rm, gm, bm, params.wb.equal);
}
Imagefloat* baseImg = new Imagefloat (fw, fh);
imgsrc->getImage (currWB, tr, baseImg, pp, params.hlrecovery, params.icm, params.raw);
@@ -218,7 +218,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
if(params.labCurve.contrast !=0) {//only use hist16 for contrast
#ifdef _OPENMP
#pragma<EFBFBD>omp<EFBFBD>parallel<EFBFBD>shared(hist16,labView, fh, fw)
#pragma<EFBFBD>omp<EFBFBD>parallel<EFBFBD>shared(hist16,labView, fh, fw)
#endif
{
#ifdef _OPENMP