merge with dev

This commit is contained in:
Desmis
2017-03-12 16:53:50 +01:00
70 changed files with 2305 additions and 488 deletions

View File

@@ -1090,8 +1090,10 @@ inline void LuminanceToneCurve::Apply (float &r, float &g, float &b) const
assert (lutToneCurve);
float currLuminance = r * 0.2126729f + g * 0.7151521f + b * 0.0721750f;
float newLuminance = lutToneCurve[currLuminance];
float coef = newLuminance / currLuminance;
const float newLuminance = lutToneCurve[currLuminance];
currLuminance = currLuminance == 0.f ? 0.00001f : currLuminance;
const float coef = newLuminance / currLuminance;
r = LIM<float> (r * coef, 0.f, 65535.f);
g = LIM<float> (g * coef, 0.f, 65535.f);
b = LIM<float> (b * coef, 0.f, 65535.f);