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 /spectro/hcfr.c | |
| parent | 509016be676f7915d635fa57144d2a441e3090ca (diff) | |
| parent | c0b89ac5bfb90835ef01573267020e42d4fe070c (diff) | |
Merge new upstream release
Diffstat (limited to 'spectro/hcfr.c')
| -rwxr-xr-x[-rw-r--r--] | spectro/hcfr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spectro/hcfr.c b/spectro/hcfr.c index e5e1288..d0a8261 100644..100755 --- 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; |