diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-01 10:32:14 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-01 10:32:14 +0100 |
| commit | 4097e27114d227692d53c5d28487e12a3833cd24 (patch) | |
| tree | d5c2a62c4db97de94f92150340612c64d3997669 /spectro/colorhug.c | |
| parent | f8a0a4e1c775a90c313cb83201eec4cea4e9a7da (diff) | |
| parent | 5514d94483c98e3320b202b1bb882023a7d12027 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'spectro/colorhug.c')
| -rwxr-xr-x[-rw-r--r--] | spectro/colorhug.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/spectro/colorhug.c b/spectro/colorhug.c index fefe766..aa8ba21 100644..100755 --- a/spectro/colorhug.c +++ b/spectro/colorhug.c @@ -33,6 +33,7 @@ #include "sa_config.h" #include "numsup.h" #endif /* SALONEINSTLIB */ +#include "cgats.h" #include "xspect.h" #include "insttypes.h" #include "conv.h" @@ -1197,7 +1198,7 @@ colorhug_get_set_opt(inst *pp, inst_opt_type m, ...) { } /* Constructor */ -extern colorhug *new_colorhug(icoms *icom, instType itype) { +extern colorhug *new_colorhug(icoms *icom, instType dtype) { colorhug *p; int i; @@ -1223,9 +1224,9 @@ extern colorhug *new_colorhug(icoms *icom, instType itype) { p->del = colorhug_del; p->icom = icom; - p->itype = itype; + p->dtype = dtype; - if (itype == instColorHug2) + if (dtype == instColorHug2) p->stype = ch_two; icmSetUnity3x3(p->ccmat); |