diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-23 12:22:51 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-23 12:22:51 +0200 |
commit | bc3604d9b226ac475a104cd8ae2ca2d1d4a27984 (patch) | |
tree | e796661f371a94a50edfdc693388bb911b253dfd /xicc/ccss.c | |
parent | 509016be676f7915d635fa57144d2a441e3090ca (diff) | |
parent | c0b89ac5bfb90835ef01573267020e42d4fe070c (diff) |
Merge new upstream release
Diffstat (limited to 'xicc/ccss.c')
-rwxr-xr-x[-rw-r--r--] | xicc/ccss.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/xicc/ccss.c b/xicc/ccss.c index 663a789..75075c1 100644..100755 --- a/xicc/ccss.c +++ b/xicc/ccss.c @@ -103,6 +103,8 @@ cgats **pocg /* return CGATS structure */ ocg->add_kword(ocg, 0, "UI_SELECTORS", p->sel, NULL); if (p->ref != NULL) ocg->add_kword(ocg, 0, "REFERENCE",p->ref, NULL); + if (p->oem != 0) + ocg->add_kword(ocg, 0, "OEM","YES", NULL); sprintf(buf,"%d", p->samples[0].spec_n); ocg->add_kword(ocg, 0, "SPECTRAL_BANDS",buf, NULL); @@ -320,6 +322,15 @@ cgats *icg /* input cgats structure */ } } + if ((ti = icg->find_kword(icg, 0, "OEM")) >= 0) { + if (stricmp(icg->t[0].kdata[ti], "YES") == 0) + p->oem = 1; + else if (stricmp(icg->t[0].kdata[ti], "NO") == 0) + p->oem = 0; + } else { + p->oem = 0; + } + if ((ii = icg->find_kword(icg, 0, "SPECTRAL_BANDS")) < 0) { sprintf(p->err,"Input file doesn't contain keyword SPECTRAL_BANDS"); return 1; @@ -471,6 +482,7 @@ disptech dtech, /* Display technology enum */ int refrmode, /* Display refresh mode, -1 = unknown, 0 = n, 1 = yes */ char *sel, /* UI selector characters - NULL for none */ char *refd, /* Reference spectrometer description (optional) */ +int oem, /* NZ if OEM source */ xspect *samples, /* Arry of spectral samples. All assumed to be same dim as first */ int no_samp /* Number of spectral samples */ ) { @@ -516,6 +528,8 @@ int no_samp /* Number of spectral samples */ } } + p->oem = oem; + if (p->samples != NULL) { free(p->samples); p->samples = NULL; |