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

Color toning - set opacity to linear does not turns color toning off - issue2014

Browse Source
This commit is contained in:
jdc
2014-09-18 07:25:31 +02:00
parent 75597282fd
commit e894794e1a
11 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/procparams.cc
View File

@@ -383,7 +383,7 @@ void ColorToningParams::slidersToCurve(std::vector<double> &colorCurve, std::vec
opacityCurve.at(8) = 0.35;
}
void ColorToningParams::getCurves(ColorGradientCurve &colorCurveLUT, OpacityCurve &opacityCurveLUT, const double xyz_rgb[3][3], const double rgb_xyz[3][3]) const {
void ColorToningParams::getCurves(ColorGradientCurve &colorCurveLUT, OpacityCurve &opacityCurveLUT, const double xyz_rgb[3][3], const double rgb_xyz[3][3], bool &opautili) const {
float satur=0.8f;
float lumin=0.5f;//middle of luminance for optimization of gamut - no real importance...as we work in XYZ and gamut control
@@ -402,15 +402,15 @@ void ColorToningParams::getCurves(ColorGradientCurve &colorCurveLUT, OpacityCurv
if(twocolor=="Separ") satur=0.9f;
if(twocolor=="All" || twocolor=="Two") satur=0.9f;
colorCurveLUT.SetXYZ(cCurve, xyz_rgb, rgb_xyz, satur, lumin);
opacityCurveLUT.Set(oCurve);
opacityCurveLUT.Set(oCurve, opautili);
}
else if(method=="Splitlr" || method=="Splitco") {
colorCurveLUT.SetXYZ(cCurve, xyz_rgb, rgb_xyz, satur, lumin);
opacityCurveLUT.Set(oCurve);
opacityCurveLUT.Set(oCurve, opautili);
}
else if(method.substr(0,3)=="RGB") {
colorCurveLUT.SetRGB(cCurve, xyz_rgb, rgb_xyz);
opacityCurveLUT.Set(oCurve);
opacityCurveLUT.Set(oCurve, opautili);
}
}