summaryrefslogtreecommitdiff
path: root/spectro/hcfr.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-01 10:32:14 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-01 10:32:14 +0100
commit4097e27114d227692d53c5d28487e12a3833cd24 (patch)
treed5c2a62c4db97de94f92150340612c64d3997669 /spectro/hcfr.c
parentf8a0a4e1c775a90c313cb83201eec4cea4e9a7da (diff)
parent5514d94483c98e3320b202b1bb882023a7d12027 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'spectro/hcfr.c')
-rwxr-xr-x[-rw-r--r--]spectro/hcfr.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/spectro/hcfr.c b/spectro/hcfr.c
index 22b5170..568c69f 100644..100755
--- a/spectro/hcfr.c
+++ b/spectro/hcfr.c
@@ -53,6 +53,7 @@
#include "sa_config.h"
#include "numsup.h"
#endif /* SALONEINSTLIB */
+#include "cgats.h"
#include "xspect.h"
#include "insttypes.h"
#include "conv.h"
@@ -125,7 +126,7 @@ hcfr_flush(
int rv;
for (rv = ICOM_OK;;) {
- rv = c->read(c, buf, MAX_MES_SIZE, NULL, '\000', 100000, 0.05);
+ rv = c->read(c, buf, MAX_MES_SIZE, NULL, NULL, 100000, 0.05);
if (rv != ICOM_OK)
break; /* Expect timeout with nothing to read */
}
@@ -933,7 +934,7 @@ hcfr_get_set_opt(inst *pp, inst_opt_type m, ...) {
}
/* Constructor */
-extern hcfr *new_hcfr(icoms *icom, instType itype) {
+extern hcfr *new_hcfr(icoms *icom, instType dtype) {
hcfr *p;
if ((p = (hcfr *)calloc(sizeof(hcfr),1)) == NULL) {
a1loge(icom->log, 1, "new_hcfr: malloc failed!\n");
@@ -957,7 +958,7 @@ extern hcfr *new_hcfr(icoms *icom, instType itype) {
p->del = hcfr_del;
p->icom = icom;
- p->itype = itype;
+ p->dtype = dtype;
icmSetUnity3x3(p->ccmat); /* Set the colorimeter correction matrix to do nothing */
p->dtech = disptech_unknown;