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

change guidedfilter wavalet in simpleprocess

Browse Source
This commit is contained in:
Desmis
2019-08-30 07:42:47 +02:00
parent 1c6fa0d3d0
commit 6a0e1cf1b6
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
rtengine/simpleprocess.cc
View File

@@ -1187,25 +1187,29 @@ private:
if (WaveParams.softrad > 0.f) { if (WaveParams.softrad > 0.f) {
array2D<float> ble(fw, fh); array2D<float> ble(fw, fh);
array2D<float> guid(fw, fh); array2D<float> guid(fw, fh);
/* Imagefloat *tmpImage = nullptr;
#ifdef _OPENMP tmpImage = new Imagefloat(fw, fh);
const int numThreads = omp_get_max_threads();
#endif
bool multiTh = false;
if (numThreads > 1) {
multiTh = true;
}
*/
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for #pragma omp parallel for
#endif #endif
for (int ir = 0; ir < fh; ir++) for (int ir = 0; ir < fh; ir++)
for (int jr = 0; jr < fw; jr++) { for (int jr = 0; jr < fw; jr++) {
ble[ir][jr] = (labView->L[ir][jr]) / 32768.f; float X, Y, Z;
guid[ir][jr] = provradius->L[ir][jr] / 32768.f; float L = provradius->L[ir][jr];
float a = provradius->a[ir][jr];
float b = provradius->b[ir][jr];
Color::Lab2XYZ(L, a, b, X, Y, Z);
guid[ir][jr] = Y / 32768.f;
float La = labView->L[ir][jr];
float aa = labView->a[ir][jr];
float ba = labView->b[ir][jr];
Color::Lab2XYZ(La, aa, ba, X, Y, Z);
tmpImage->r(ir, jr) = X;
tmpImage->g(ir, jr) = Y;
tmpImage->b(ir, jr) = Z;
ble[ir][jr] = Y / 32768.f;
} }
double epsilmax = 0.0001; double epsilmax = 0.0001;
double epsilmin = 0.00001; double epsilmin = 0.00001;
@@ -1225,8 +1229,14 @@ private:
for (int ir = 0; ir < fh; ir++) for (int ir = 0; ir < fh; ir++)
for (int jr = 0; jr < fw; jr++) { for (int jr = 0; jr < fw; jr++) {
labView->L[ir][jr] = 32768.f * ble[ir][jr]; float X = tmpImage->r(ir, jr);
float Y = 32768.f * ble[ir][jr];
float Z = tmpImage->b(ir, jr);
float L, a, b;
Color::XYZ2Lab(X, Y, Z, L, a, b);
labView->L[ir][jr] = L;
} }
delete tmpImage;
} }
} }