diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-22 15:50:05 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-22 15:50:05 +0200 |
| commit | f68fe5a1cd052386d444bbeab91c4caf8763ce10 (patch) | |
| tree | 986014451967a1fd062833a15bc516cab6805f4b /target | |
| parent | 84a8f501bcac3bc25c35715c0b669db04a39e56d (diff) | |
| parent | 615ab5513e79c4abc5bbe5c993587785b6a1738b (diff) | |
Merge tag 'upstream/1.9.2+repack'
Upstream version 1.9.2+repack
Diffstat (limited to 'target')
| -rw-r--r-- | target/targen.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/target/targen.c b/target/targen.c index 74bbe96..96cda6c 100644 --- a/target/targen.c +++ b/target/targen.c @@ -725,9 +725,19 @@ double xpow /* Extra device power, default = none */ /* Get details of conversion (Arguments may be NULL if info not needed) */ s->luo->spaces(s->luo, &ins, NULL, &outs, NULL, NULL, NULL, NULL, NULL, NULL); +//printf("~1 xmask = 0x%x, ins = %s\n",xmask,icm2str(icmColorSpaceSignature, ins)); if (icx_colorant_comb_match_icc(xmask, ins) == 0) { - s->luo->del(s->luo); - error("ICC profile doesn't match device!"); + + /* Should really see if ICC profile has ColorantTable tag, */ + /* and match them against targen specs. For now, */ + /* simply make sure the channel counts match and issue */ + /* a warning. */ + if (icx_noofinks(xmask) != icmCSSig2nchan(ins)) { + s->luo->del(s->luo); + error("ICC profile doesn't match device!"); + } else { + warning("Profile '%s' no. channels match, but colorant types have not been checked",profName); + } } /* Grab any device calibration curves */ |