Corrected default profiles to reflect new tone controls. Rolled back highlight desaturation to prevent color shifts.

This commit is contained in:
Emil Martinec
2010-10-30 08:32:03 -05:00
parent abe8f457d1
commit 23bca5e143
7 changed files with 25 additions and 23 deletions

View File

@@ -728,9 +728,11 @@ void CurveFactory::complexCurve (double ecomp, double black, double hlcompr, dou
std::vector<double> basecurvePoints;
basecurvePoints.push_back((double)((CurveType)NURBS));
float toex = MIN(1,black/(a*def_mul));
float toey = MAX(0,toex*a*def_mul*(shcompr/25.0-1));
float shoulderx = 1/(a*def_mul);//point in x at which line of slope a starting at (0,0) reaches y=1
//float toex = MIN(1,black/(a*def_mul));
//float toey = MAX(0,toex*a*def_mul*(shcompr/25.0-1));
float toex = black;
float toey = MAX(0,toex*(shcompr/25.0-1));
float shoulderx = MIN(black,1/(a*def_mul));//point in x at which line of slope a starting at (0,0) reaches y=1
float shouldery=1;
float toneslope=(shouldery-toey)/(shoulderx-toex);
if (shoulderx<1) {//a>1; positive EC