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

Patch from issue 227 (Work In Progress)

Browse Source
This commit is contained in:
natureh 510
2014-01-22 21:18:50 +01:00
parent 8b2eac9a3d
commit a8e3f2cdfa
69 changed files with 4202 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rtengine/curves.cc
View File

@@ -701,11 +701,7 @@ void CurveFactory::curveCL ( bool & clcutili,const std::vector<double>& clcurveP
histNeeded = true;
}
if (tcurve) {
if (tcurve->isIdentity()) {
delete tcurve;
tcurve = NULL;
}
else
if (!tcurve->isIdentity())
customToneCurve2.Set(tcurve);
delete tcurve;
tcurve = NULL;
@@ -724,15 +720,10 @@ void CurveFactory::curveCL ( bool & clcutili,const std::vector<double>& clcurveP
histNeeded = true;
}
if (tcurve) {
if (tcurve->isIdentity()) {
delete tcurve;
tcurve = NULL;
}
else if (curveMode != procparams::ToneCurveParams::TC_MODE_STD) {
if (!tcurve->isIdentity())
customToneCurve1.Set(tcurve);
delete tcurve;
tcurve = NULL;
}
delete tcurve;
tcurve = NULL;
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -779,7 +770,7 @@ void CurveFactory::curveCL ( bool & clcutili,const std::vector<double>& clcurveP
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
for (int i=0; i<=0xffff; i++) {
float val;
float val = dcurve[i];;
if (histNeeded) {
float fi=i;
@@ -791,13 +782,6 @@ void CurveFactory::curveCL ( bool & clcutili,const std::vector<double>& clcurveP
outBeforeCCurveHistogram[hi] += histogram/*Cropped*/[i] ;
}
// apply custom/parametric/NURBS curve, if any
if (tcurve) {
val = tcurve->getVal (dcurve[i]); // TODO: getVal(double) is very slow! Optimize with a LUTf
} else {
val = dcurve[i];
}
// if inverse gamma is needed, do it (standard sRGB inverse gamma is applied)
if (needigamma)
val = igamma (val, gamma_, start, slope, mul, add);