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

Ciecam - added cam16 to cam02 (#6017)

Browse Source 
* First change cat02 cat16

* Enable cat16 and cat02

* Clean comment code - change history msg

* Change some labels and tooltips with ciecam0216

* Change default settings

* Others default label and tooltip changes
This commit is contained in:
Desmis
2020-12-09 07:49:54 +01:00
committed by GitHub
parent 548f2103e2
commit 6f9da68883
12 changed files with 349 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/curves.cc
View File

@@ -3460,11 +3460,12 @@ void PerceptualToneCurve::BatchApply(const size_t start, const size_t end, float
Color::Prophotoxyz(r, g, b, x, y, z);
float J, C, h;
int c16 = 1;
Ciecam02::xyz2jch_ciecam02float(J, C, h,
aw, fl,
x * 0.0015259022f, y * 0.0015259022f, z * 0.0015259022f,
xw, yw, zw,
c, nc, pow1, nbb, ncb, cz, d);
c, nc, pow1, nbb, ncb, cz, d, c16);
if (!isfinite(J) || !isfinite(C) || !isfinite(h)) {
@@ -3579,11 +3580,10 @@ void PerceptualToneCurve::BatchApply(const size_t start, const size_t end, float
}
C *= cmul;
Ciecam02::jch2xyz_ciecam02float(x, y, z,
J, C, h,
xw, yw, zw,
c, nc, pow1, nbb, ncb, fl, cz, d, aw);
c, nc, pow1, nbb, ncb, fl, cz, d, aw, c16);
if (!isfinite(x) || !isfinite(y) || !isfinite(z)) {
// can happen for colours on the rim of being outside gamut, that worked without chroma scaling but not with. Then we return only the curve's result.
@@ -3698,9 +3698,9 @@ void PerceptualToneCurve::init()
f = 1.00f;
c = 0.69f;
nc = 1.00f;
int c16 = 1;//with cat02 for compatibility
Ciecam02::initcam1float(yb, 1.f, f, la, xw, yw, zw, n, d, nbb, ncb,
cz, aw, wh, pfl, fl, c);
cz, aw, wh, pfl, fl, c, c16);
pow1 = pow_F(1.64f - pow_F(0.29f, n), 0.73f);
{