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

fix bug in output CIECAM

Browse Source
This commit is contained in:
jdc
2012-11-17 11:23:18 +01:00
parent 1d8beefb91
commit a6657dd490
3 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtengine/dcrop.cc
View File

@@ -189,7 +189,6 @@ void Crop::update (int todo) {
parent->ipf.chromiLuminanceCurve (labnCrop, labnCrop, parent->chroma_acurve, parent->chroma_bcurve, parent->satcurve, parent->lhskcurve, parent->lumacurve, utili, autili, butili, ccutili,cclutili);
//parent->ipf.colorCurve (labnCrop, labnCrop);
parent->ipf.vibrance (labnCrop);
// ColorTemp::ciecam_02 (labnCrop, &params);
if (skip==1) {
parent->ipf.impulsedenoise (labnCrop);
@@ -200,22 +199,9 @@ void Crop::update (int todo) {
parent->ipf.sharpening (labnCrop, (float**)cbuffer);
parent->ipf.dirpyrequalizer (labnCrop);
}
}
ColorAppearance customColCurve1;
ColorAppearance customColCurve2;
ColorAppearance customColCurve3;
CurveFactory::curveLightBrightColor (
params.colorappearance.curveMode, params.colorappearance.curve,
params.colorappearance.curveMode2, params.colorappearance.curve2,
params.colorappearance.curveMode3, params.colorappearance.curve3,
customColCurve1,
customColCurve2,
customColCurve3,
1);
parent->ipf.ciecam_02 (labnCrop, &params,customColCurve1,customColCurve2,customColCurve3);
parent->ipf.ciecam_02 (labnCrop, &params,parent->customColCurve1,parent->customColCurve2,parent->customColCurve3);
}
// switch back to rgb
parent->ipf.lab2monitorRgb (labnCrop, cropImg);

9
rtengine/improcfun.cc
View File

@@ -256,10 +256,10 @@ if(params->colorappearance.enabled) {
LUTf bright_curve (65536,0);//init curve
LUTf bright_curveQ (65536,0);//init curve
LUTu hist16 (65536);
LUTu hist16J (65536);
LUTu hist16Q (65536);
float koef=1.0f;//rough correspondence between L and J
hist16.clear();hist16Q.clear();
hist16J.clear();hist16Q.clear();
for (int i=0; i<height; i++)
for (int j=0; j<width; j++) {//rough correspondence between L and J
if(((lab->L[i][j])/327.68f)>95.) koef=1.f;
@@ -274,7 +274,7 @@ if(params->colorappearance.enabled) {
else if(((lab->L[i][j])/327.68f)>10.) koef=0.9f;
else if(((lab->L[i][j])/327.68f)>0.) koef=1.0f;
hist16[CLIP((int)((koef*lab->L[i][j])))]++;//evaluate histogram luminance L # J
hist16J[CLIP((int)((koef*lab->L[i][j])))]++;//evaluate histogram luminance L # J
sum+=koef*lab->L[i][j];//evaluate mean J to calcualte Yb
hist16Q[CLIP((int) (32768.f*sqrt((koef*(lab->L[i][j]))/32768.f)))]++; //for brightness Q : approximation for Q=wh*sqrt(J/100) J not equal L
}
@@ -357,7 +357,7 @@ if(params->colorappearance.enabled) {
//evaluate lightness, contrast
ColorTemp::curveJ (jli, contra, 1, bright_curve, hist16);//lightness and contrast J
ColorTemp::curveJ (jli, contra, 1, bright_curve, hist16J);//lightness and contrast J
ColorTemp::curveJ (qbri, qcontra, 1, bright_curveQ, hist16Q);//brightness and contrast Q
int gamu=0;
bool highlight = params->hlrecovery.enabled; //Get the value if "highlight reconstruction" is activated
@@ -551,6 +551,7 @@ if(params->colorappearance.enabled) {
float sk=1;
float ko=1.f/coef;
Color::skinred(Jpro, hpro, Cc, Ccold, dred, protect_red,sk,rstprotection,ko, Cpro);
Cpro=Cc/coef;
c1C=1;
}
else if (curveMode3==ColorAppearanceParams::TC_MODE_SATUR){ //

2
rtengine/simpleprocess.cc
View File

@@ -253,7 +253,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
customColCurve3,
1);
ipf.ciecam_02 (labView, &params,customColCurve1,customColCurve2,customColCurve2);
ipf.ciecam_02 (labView, &params,customColCurve1,customColCurve2,customColCurve3);
// end tile processing...???
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%