diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-25 10:16:00 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-25 10:16:00 +0100 |
| commit | f6b8e0eae4374f339487a33e3e4fe5462d5816e1 (patch) | |
| tree | 5f5f764fd6cda404b2ad6e85762c03fce3a335db /xicc/xcam.c | |
| parent | 615ab5513e79c4abc5bbe5c993587785b6a1738b (diff) | |
New upstream version 2.0.0upstream/2.0.0
Diffstat (limited to 'xicc/xcam.c')
| -rwxr-xr-x[-rw-r--r--] | xicc/xcam.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/xicc/xcam.c b/xicc/xcam.c index 0b46a24..39543f6 100644..100755 --- a/xicc/xcam.c +++ b/xicc/xcam.c @@ -24,7 +24,7 @@ static void icx_cam_free(icxcam *s); static int icx_set_view(icxcam *s, ViewingCondition Ev, double Wxyz[3], double La, double Yb, double Lv, double Yf, double Yg, double Gxyz[3], - int hk, double hkscale); + int hk, double hkscale, double mtaf, double Wxyz2[3]); static int icx_XYZ_to_cam(struct _icxcam *s, double Jab[3], double XYZ[3]); static int icx_cam_to_XYZ(struct _icxcam *s, double XYZ[3], double Jab[3]); static void settrace(struct _icxcam *s, int tracev); @@ -129,7 +129,9 @@ double Yf, /* Flare as a fraction of the reference white (Y range 0.0 .. 1.0) * double Yg, /* Glare as a fraction of the adapting/surround (Y range 0.0 .. 1.0) */ double Gxyz[3], /* The Glare white coordinates (typically the Ambient color) */ int hk, /* Flag, NZ to use Helmholtz-Kohlraush effect */ -double hkscale /* HK effect scaling factor */ +double hkscale, /* HK effect scaling factor */ +double mtaf, /* Mid tone partial adapation factor from Wxyz to Wxyz2, <= 0.0 if none */ +double Wxyz2[3] /* Mid tone Adapted White XYZ (Y range 0.0 .. 1.0) */ ) { s->Wxyz[0] = Wxyz[0]; s->Wxyz[1] = Wxyz[1]; @@ -142,7 +144,7 @@ double hkscale /* HK effect scaling factor */ } case cam_CIECAM02: { cam02 *pp = (cam02 *)s->p; - return pp->set_view(pp, Ev, Wxyz, La, Yb, Lv, Yf, Yg, Gxyz, hk, hkscale); + return pp->set_view(pp, Ev, Wxyz, La, Yb, Lv, Yf, Yg, Gxyz, hk, hkscale, mtaf, Wxyz2); } default: break; |