diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-25 10:16:54 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-25 10:16:54 +0100 |
| commit | 1b1126bd023a2bb92699773a1867358067dabcb8 (patch) | |
| tree | 6fd56d034e5a154c7992e7855d61691cecd043c4 /xicc/cam02ref.h | |
| parent | cb5c7cec4aa1946f75dc3d408eb7f1051f3fb3d4 (diff) | |
| parent | f6b8e0eae4374f339487a33e3e4fe5462d5816e1 (diff) | |
Update upstream source from tag 'upstream/2.0.0'
Update to upstream version '2.0.0'
with Debian dir e866e6e75661017faaa5331becda76021407390b
Diffstat (limited to 'xicc/cam02ref.h')
| -rwxr-xr-x[-rw-r--r--] | xicc/cam02ref.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/xicc/cam02ref.h b/xicc/cam02ref.h index 28c3fd3..d890c31 100644..100755 --- a/xicc/cam02ref.h +++ b/xicc/cam02ref.h @@ -45,7 +45,10 @@ struct _cam02ref { double Yf, /* Flare as a fraction of the reference white (range 0.0 .. 1.0) */ double Yg, /* Glare as a fraction of the adapting/surround (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 */ + int hk, /* Flag, NZ to use Helmholtz-Kohlraush effect */ + 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) */ ); /* Conversions */ @@ -125,7 +128,7 @@ double Lv /* Luminence of white in the Viewing/Scene/Image field (cd/m^2) */ static void cam02ref_free(cam02ref *s); static int cam02ref_set_view(cam02ref *s, ViewingCondition Ev, double Wxyz[3], double Yb, double La, double Lv, double Yf, double Yg, double Gxyz[3], - int hk, double hkscale); + int hk, double hkscale, double mtaf, double Wxyz2[3]); static int cam02ref_XYZ_to_cam(cam02ref *s, double *Jab, double *xyz); static int cam02ref_cam_to_XYZ(cam02ref *s, double XYZ[3], double Jab[3]); @@ -164,7 +167,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) */ ) { double tt; |