diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-02 19:25:17 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-02 19:25:17 +0200 |
| commit | c2ca7be5a751879159f3cb591a64bb9568b79762 (patch) | |
| tree | 04e38d4f4a2aad4d789bda0a65b7abb80a3439a2 /xicc/xfit.c | |
| parent | 45c152c326d87478fbf41714b4b8e2f7b57a282b (diff) | |
| parent | 3db384424bd7398ffbb7a355cab8f15f3add009f (diff) | |
Updated version 1.9.1+repack from 'upstream/1.9.1+repack'
with Debian dir 98a996367aa69ae41accf9c6d369f600bc94de80
Diffstat (limited to 'xicc/xfit.c')
| -rw-r--r-- | xicc/xfit.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/xicc/xfit.c b/xicc/xfit.c index d12919f..91afa64 100644 --- a/xicc/xfit.c +++ b/xicc/xfit.c @@ -1816,18 +1816,15 @@ static int xfit_fit( icmAry2XYZ(_wp, p->wp); - /* Absolute->Aprox. Relative Adaptation matrix */ - if (p->picc != NULL) - p->picc->chromAdaptMatrix(p->picc, ICM_CAM_NONE, icmD50, _wp, p->fromAbs); - else - icmChromAdaptMatrix(ICM_CAM_BRADFORD, icmD50, _wp, p->fromAbs); - + /* Absolute->Aprox. Relative Adaptation matrix and */ /* Aproximate relative to absolute conversion matrix */ - if (p->picc != NULL) - p->picc->chromAdaptMatrix(p->picc, ICM_CAM_NONE, _wp, icmD50, p->toAbs); - else + if (p->picc != NULL) { + p->picc->chromAdaptMatrix(p->picc, ICM_CAM_NONE, p->toAbs, p->fromAbs, icmD50, _wp); + } else { + icmChromAdaptMatrix(ICM_CAM_BRADFORD, icmD50, _wp, p->fromAbs); icmChromAdaptMatrix(ICM_CAM_BRADFORD, _wp, icmD50, p->toAbs); - + } + if (p->verb) { double lab[3]; icmXYZ2Lab(&icmD50, lab, p->wp); @@ -2664,7 +2661,7 @@ printf("~1 ipos[%d][%d] = %f\n",e,i,cv); /* Matrix needed to correct approx rel wp to target D50 */ icmAry2XYZ(_wp, wcc.v); /* Aprox relative target white point */ if (p->picc != NULL) /* Correction */ - p->picc->chromAdaptMatrix(p->picc, ICM_CAM_NONE, icmD50, _wp, p->cmat); + p->picc->chromAdaptMatrix(p->picc, ICM_CAM_NONE, NULL, p->cmat, icmD50, _wp); else icmChromAdaptMatrix(ICM_CAM_BRADFORD, icmD50, _wp, p->cmat); @@ -2687,8 +2684,7 @@ printf("~1 ipos[%d][%d] = %f\n",e,i,cv); /* Fix absolute conversions to leave absolute response unchanged. */ icmAry2XYZ(_wp, wp); /* Actual white point */ if (p->picc != NULL) { - p->picc->chromAdaptMatrix(p->picc, ICM_CAM_NONE, icmD50, _wp, p->fromAbs); - p->picc->chromAdaptMatrix(p->picc, ICM_CAM_NONE, _wp, icmD50, p->toAbs); + p->picc->chromAdaptMatrix(p->picc, ICM_CAM_NONE, p->toAbs, p->fromAbs, icmD50, _wp); } else { icmChromAdaptMatrix(ICM_CAM_BRADFORD, icmD50, _wp, p->fromAbs); icmChromAdaptMatrix(ICM_CAM_BRADFORD, _wp, icmD50, p->toAbs); |