diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-03 20:38:41 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-03 20:38:41 +0100 |
| commit | ba627dd9ecb578e9852c7b9cce67ec63199d1acf (patch) | |
| tree | 27c4258311ca8c8ed7ff67a8a0bc7280e8fcae79 /spectro/i1pro.c | |
| parent | 69aec3b712232e93600ecd741269fed1f90b412a (diff) | |
| parent | 3abb40d43649adb3807180692d8579c405524675 (diff) | |
Merge branch 'release/2.0.0+repack-1'2.0.0+repack-1
Diffstat (limited to 'spectro/i1pro.c')
| -rwxr-xr-x[-rw-r--r--] | spectro/i1pro.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/spectro/i1pro.c b/spectro/i1pro.c index 44614d2..4399c57 100644..100755 --- a/spectro/i1pro.c +++ b/spectro/i1pro.c @@ -64,6 +64,7 @@ #include "numsup.h" #include "rspl1.h" #endif /* SALONEINSTLIB */ +#include "cgats.h" #include "xspect.h" #include "insttypes.h" #include "conv.h" @@ -140,15 +141,15 @@ i1pro_determine_capabilities(i1pro *p) { ; /* Set the Pro capabilities mask */ - if (p->itype == instI1Pro - || p->itype == instI1Pro2) { + if (p->dtype == instI1Pro + || p->dtype == instI1Pro2) { p->cap |= inst_mode_ref_spot | inst_mode_ref_strip ; } /* Set the Pro2 capabilities mask */ - if (p->itype == instI1Pro2) { + if (p->dtype == instI1Pro2) { p->cap |= inst_mode_ref_uv ; } @@ -911,7 +912,7 @@ i1pro_del(inst *pp) { } /* Constructor */ -extern i1pro *new_i1pro(icoms *icom, instType itype) { +extern i1pro *new_i1pro(icoms *icom, instType dtype) { i1pro *p; int rv; if ((p = (i1pro *)calloc(sizeof(i1pro),1)) == NULL) { @@ -940,7 +941,7 @@ extern i1pro *new_i1pro(icoms *icom, instType itype) { p->del = i1pro_del; p->icom = icom; - p->itype = itype; + p->dtype = dtype; i1pro_determine_capabilities(p); |