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

Cbdl before b&w, fix ciecam02 issue and clean the code a bit

Browse Source
This commit is contained in:
heckflosse
2016-02-19 21:52:02 +01:00
parent c2c93faa35
commit a15fe1de3e
4 changed files with 104 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
rtengine/simpleprocess.cc
View File

@@ -741,69 +741,49 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
if (params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled) {
if(((!params.colorappearance.enabled))) {
TMatrix wprof, wiprof;
wprof = iccStore->workingSpaceMatrix( params.icm.working );
wiprof = iccStore->workingSpaceInverseMatrix( params.icm.working );
double wip[3][3] = {
{wiprof[0][0], wiprof[0][1], wiprof[0][2]},
{wiprof[1][0], wiprof[1][1], wiprof[1][2]},
{wiprof[2][0], wiprof[2][1], wiprof[2][2]}
};
TMatrix wprof = iccStore->workingSpaceMatrix( params.icm.working );
const float wp[3][3] = {
{static_cast<float>(wprof[0][0]), static_cast<float>(wprof[0][1]), static_cast<float>(wprof[0][2])},
{static_cast<float>(wprof[1][0]), static_cast<float>(wprof[1][1]), static_cast<float>(wprof[1][2])},
{static_cast<float>(wprof[2][0]), static_cast<float>(wprof[2][1]), static_cast<float>(wprof[2][2])}
};
double wp[3][3] = {
{wprof[0][0], wprof[0][1], wprof[0][2]},
{wprof[1][0], wprof[1][1], wprof[1][2]},
{wprof[2][0], wprof[2][1], wprof[2][2]}
};
const int W = baseImg->getWidth();
const int H = baseImg->getHeight();
LabImage labcbdl(W, H);
int W = baseImg->getWidth();
int H = baseImg->getHeight();
LabImage * labcbdl;
labcbdl = new LabImage(W, H);
#ifndef _DEBUG
#pragma omp parallel for schedule(dynamic, 10)
#ifdef _OPENMP
#pragma omp parallel for schedule(dynamic,16)
#endif
for(int i = 0; i < H; i++) {
for(int j = 0; j < W; j++) {
float r = baseImg->r(i, j);
float g = baseImg->g(i, j);
float b = baseImg->b(i, j);
float X, Y, Z;
float L, aa, bb;
Color::rgbxyz(r, g, b, X, Y, Z, wp);
//convert Lab
Color::XYZ2Lab(X, Y, Z, L, aa, bb);
labcbdl->L[i][j] = L;
labcbdl->a[i][j] = aa;
labcbdl->b[i][j] = bb;
}
for(int i = 0; i < H; i++) {
for(int j = 0; j < W; j++) {
float X, Y, Z;
Color::rgbxyz(baseImg->r(i, j), baseImg->g(i, j), baseImg->b(i, j), X, Y, Z, wp);
//convert Lab
Color::XYZ2Lab(X, Y, Z, labcbdl.L[i][j], labcbdl.a[i][j], labcbdl.b[i][j]);
}
}
ipf.dirpyrequalizer (labcbdl, 1, 0);
ipf.dirpyrequalizer (&labcbdl, 1, 0);
#ifndef _DEBUG
#pragma omp parallel for schedule(dynamic, 10)
TMatrix wiprof = iccStore->workingSpaceInverseMatrix( params.icm.working );
const float wip[3][3] = {
{static_cast<float>(wiprof[0][0]), static_cast<float>(wiprof[0][1]), static_cast<float>(wiprof[0][2])},
{static_cast<float>(wiprof[1][0]), static_cast<float>(wiprof[1][1]), static_cast<float>(wiprof[1][2])},
{static_cast<float>(wiprof[2][0]), static_cast<float>(wiprof[2][1]), static_cast<float>(wiprof[2][2])}
};
#ifdef _OPENMP
#pragma omp parallel for schedule(dynamic,16)
#endif
for(int i = 0; i < H; i++) {
for(int j = 0; j < W; j++) {
float L = labcbdl->L[i][j];
float a = labcbdl->a[i][j];
float b = labcbdl->b[i][j];
float x1, y1, z1;
float R, G, B;
Color::Lab2XYZ(L, a, b, x1, y1, z1);
Color::xyz2rgb(x1, y1, z1, R, G, B, wip);
baseImg->r(i, j) = R;
baseImg->g(i, j) = G;
baseImg->b(i, j) = B;
}
for(int i = 0; i < H; i++) {
for(int j = 0; j < W; j++) {
float X, Y, Z;
Color::Lab2XYZ(labcbdl.L[i][j], labcbdl.a[i][j], labcbdl.b[i][j], X, Y, Z);
Color::xyz2rgb(X, Y, Z, baseImg->r(i, j), baseImg->g(i, j), baseImg->b(i, j), wip);
}
delete labcbdl;
}
}