From c0b89ac5bfb90835ef01573267020e42d4fe070c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 23 Aug 2015 12:17:05 +0200 Subject: Imported Upstream version 1.8.0 --- spectro/hcfr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 spectro/hcfr.c (limited to 'spectro/hcfr.c') diff --git a/spectro/hcfr.c b/spectro/hcfr.c old mode 100644 new mode 100755 index e5e1288..d0a8261 --- a/spectro/hcfr.c +++ b/spectro/hcfr.c @@ -366,7 +366,7 @@ hcfr_init_coms(inst *pp, baud_rate br, flow_control fc, double tout) { inst_code ev = inst_ok; icomuflags usbflags = icomuf_no_open_clear | icomuf_detach; -#if defined(__APPLE__) && defined(__i386__) +#if defined(__APPLE__) && !defined(__ppc__) /* Except on Intel OS X 10.4/5 for some reasone. */ /* It would be good if the HCFR had a better USB implementation... */ usbflags &= ~icomuf_no_open_clear; @@ -946,7 +946,7 @@ extern hcfr *new_hcfr(icoms *icom, instType itype) { p->del = hcfr_del; p->icom = icom; - p->itype = icom->itype; + p->itype = itype; icmSetUnity3x3(p->ccmat); /* Set the colorimeter correction matrix to do nothing */ p->dtech = disptech_unknown; -- cgit v1.2.3