From 08f130ed56052bda5526702d012f26a79721ccdf Mon Sep 17 00:00:00 2001 From: Desmis Date: Fri, 24 Feb 2017 10:40:27 +0100 Subject: [PATCH] Fixed bug in preview --- rtengine/dcrop.cc | 4 ++-- rtengine/improccoordinator.cc | 16 ++++++++-------- rtengine/iplocallab.cc | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc index ad2723c8b..2586f647f 100644 --- a/rtengine/dcrop.cc +++ b/rtengine/dcrop.cc @@ -1038,7 +1038,7 @@ void Crop::update (int todo) params.locallab.chromaref = parent->chromarefs[sp]; params.locallab.lumaref = parent->lumarefs[sp]; - //printf ("dcr1 sp=%i huer=%f \n", sp, parent->huerefs[sp] / 100.f ); + // printf ("dcr1 sp=%i huer=%f \n", sp, parent->huerefs[sp] / 100.f ); parent->ipf.Lab_Local (1, sp, (float**)shbuffer, labnCrop, labnCrop, trafx / skip, trafy / skip, cropx / skip, cropy / skip, skips (parent->fw, skip), skips (parent->fh, skip), parent->fw, parent->fh, locutili, skip, locRETgainCurve, locallutili, lllocalcurve2, loclhCurve, cclocalcurve2, params.locallab.hueref, params.locallab.chromaref, params.locallab.lumaref); lllocalcurve2.clear(); @@ -1275,7 +1275,7 @@ void Crop::update (int todo) params.locallab.hueref = (parent->huerefs[sp]) / 100.f; params.locallab.chromaref = parent->chromarefs[sp]; params.locallab.lumaref = parent->lumarefs[sp]; - // printf ("dcr2 sp=%i huer=%f \n", sp, parent->huerefs[sp] / 100.f); + // printf ("dcr2 sp=%i huer=%f \n", sp, parent->huerefs[sp] / 100.f); parent->ipf.Lab_Local (1, sp, (float**)shbuffer, labnCrop, labnCrop, trafx / skip, trafy / skip, cropx / skip, cropy / skip, skips (parent->fw, skip), skips (parent->fh, skip), parent->fw, parent->fh, locutili, skip, locRETgainCurve, locallutili, lllocalcurve2, loclhCurve, cclocalcurve2, params.locallab.hueref, params.locallab.chromaref, params.locallab.lumaref); lllocalcurve2.clear(); diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index f63b2967b..6cdc53b7a 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -1230,11 +1230,12 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) lhstr[0] = lh_str + "@"; //end local L = f(H) //spot references + /* dataspot[58][0] = huerefs[0] = 100.f * params.locallab.hueref; dataspot[59][0] = chromarefs[0] = params.locallab.chromaref; dataspot[60][0] = lumarefs[0] = params.locallab.lumaref; - - + printf("dataspot58-0=%i\n", dataspot[58][0]); + */ if (params.locallab.anbspot == 0) { //update GUI and MIP after current spot ==> params, shift with the other alolistener @@ -2015,7 +2016,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) dataspot[58][sp] = huerefs[sp] = 100.f * params.locallab.hueref; dataspot[59][sp] = chromarefs[sp] = params.locallab.chromaref; dataspot[60][sp] = lumarefs[sp] = params.locallab.lumaref; - + //printf("sp=%i huerefsp=%f\n", sp, huerefs[sp]); ipf.Lab_Local (3, sp, (float**)shbuffer, nprevl, nprevl, 0, 0, 0, 0, pW, pH, fw, fh, locutili, scale, locRETgainCurve, locallutili, lllocalcurve, loclhCurve, cclocalcurve, params.locallab.hueref, params.locallab.chromaref, params.locallab.lumaref); lllocalcurve.clear(); cclocalcurve.clear(); @@ -2314,12 +2315,11 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) CurveFactory::curveLocal (locallutili, params.locallab.llcurve, lllocalcurve, sca); //scale == 1 ? 1 : 16); CurveFactory::curveCCLocal (localcutili, params.locallab.cccurve, cclocalcurve, sca); //scale == 1 ? 1 : 16); - params.locallab.hueref = huerefs[0] / 100.; - - dataspot[58][sp] = huerefs[sp] = 100.f * params.locallab.hueref; - dataspot[59][sp] = chromarefs[sp] = params.locallab.chromaref = chromarefs[0]; - dataspot[60][sp] = lumarefs[sp] = params.locallab.lumaref = lumarefs[0]; + params.locallab.hueref = huerefs[sp] / 100.; + params.locallab.chromaref = chromarefs[sp]; + params.locallab.lumaref = lumarefs[sp]; +// printf("sp=%i hueres=%i\n",sp, huerefs[sp]); ipf.Lab_Local (3, sp, (float**)shbuffer, nprevl, nprevl, 0, 0, 0, 0, pW, pH, fw, fh, locutili, scale, locRETgainCurve, locallutili, lllocalcurve, loclhCurve, cclocalcurve, params.locallab.hueref, params.locallab.chromaref, params.locallab.lumaref ); lllocalcurve.clear(); cclocalcurve.clear(); diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index 0ec2e035a..1f186a04b 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -3725,7 +3725,7 @@ void ImProcFunctions::Lab_Local (int call, int sp, float** shbuffer, LabImage * av = ave / 327.68f; } -// printf ("call= %i sp=%i hueref=%f chromaref=%f lumaref=%f\n", call, sp, hueref, chromaref, lumaref); + //printf ("call= %i sp=%i hueref=%f chromaref=%f lumaref=%f\n", call, sp, hueref, chromaref, lumaref); struct local_contra lco; // we must here detect : general case, skin, sky,...foliages ???