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

replace Labimage by array for CBDL clarity

Browse Source
This commit is contained in:
Desmis
2019-04-06 17:59:40 +02:00
parent b02062a3b0
commit 2eabb2f0cb
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtengine/dirpyr_equalizer.cc
View File

@@ -355,11 +355,11 @@ void ImProcFunctions::cbdl_local_temp(float ** src, float ** loctemp, int srcwid
// with the current implementation of idirpyr_eq_channel we can safely use the buffer from last level as buffer, saves some memory // with the current implementation of idirpyr_eq_channel we can safely use the buffer from last level as buffer, saves some memory
float ** buffer = dirpyrlo[lastlevel - 1]; float ** buffer = dirpyrlo[lastlevel - 1];
std::unique_ptr<LabImage> resid5(new LabImage(srcwidth, srcheight)); array2D<float> resid5(srcwidth, srcheight);
#pragma omp parallel for #pragma omp parallel for
for (int i = 0; i < srcheight; i++) { for (int i = 0; i < srcheight; i++) {
for (int j = 0; j < srcwidth; j++) { for (int j = 0; j < srcwidth; j++) {
resid5->L[i][j] = buffer[i][j]; resid5[i][j] = buffer[i][j];
} }
} }
@@ -372,19 +372,18 @@ void ImProcFunctions::cbdl_local_temp(float ** src, float ** loctemp, int srcwid
idirpyr_eq_channel_loc(dirpyrlo[0], src, buffer, srcwidth, srcheight, 0, multi, dirpyrThreshold, nullptr, nullptr, skinprot, gamutlab, b_l, t_l, t_r, b_r, choice); idirpyr_eq_channel_loc(dirpyrlo[0], src, buffer, srcwidth, srcheight, 0, multi, dirpyrThreshold, nullptr, nullptr, skinprot, gamutlab, b_l, t_l, t_r, b_r, choice);
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
std::unique_ptr<LabImage> loct(new LabImage(srcwidth, srcheight)); array2D<float> loct(srcwidth, srcheight);
#pragma omp parallel for #pragma omp parallel for
for (int i = 0; i < srcheight; i++) for (int i = 0; i < srcheight; i++)
for (int j = 0; j < srcwidth; j++) { for (int j = 0; j < srcwidth; j++) {
loct->L[i][j] = CLIP(buffer[i][j]); // TODO: Really a clip necessary? loct[i][j] = CLIP(buffer[i][j]); // TODO: Really a clip necessary?
} }
float clar = 0.01f * mergeL; float clar = 0.01f * mergeL;
#pragma omp parallel for #pragma omp parallel for
for (int i = 0; i < srcheight; i++) for (int i = 0; i < srcheight; i++)
for (int j = 0; j < srcwidth; j++) { for (int j = 0; j < srcwidth; j++) {
loctemp[i][j] = (1.f + clar) * loct->L[i][j] - clar * resid5->L[i][j]; loctemp[i][j] = (1.f + clar) * loct[i][j] - clar * resid5[i][j];
} }
} }