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/munki_imp.c | |
| parent | 69aec3b712232e93600ecd741269fed1f90b412a (diff) | |
| parent | 3abb40d43649adb3807180692d8579c405524675 (diff) | |
Merge branch 'release/2.0.0+repack-1'2.0.0+repack-1
Diffstat (limited to 'spectro/munki_imp.c')
| -rwxr-xr-x[-rw-r--r--] | spectro/munki_imp.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/spectro/munki_imp.c b/spectro/munki_imp.c index eae2837..d8690e8 100644..100755 --- a/spectro/munki_imp.c +++ b/spectro/munki_imp.c @@ -60,6 +60,7 @@ #include "numsup.h" #include "rspl1.h" #endif /* SALONEINSTLIB */ +#include "cgats.h" #include "xspect.h" #include "insttypes.h" #include "conv.h" @@ -483,7 +484,7 @@ munki_code munki_imp_init(munki *p) { a1logd(p->log,2,"munki_init:\n"); - if (p->itype != instColorMunki) + if (p->dtype != instColorMunki) return MUNKI_UNKNOWN_MODEL; @@ -3183,7 +3184,8 @@ munki_code munki_save_calibration(munki *p) { #endif sprintf(cal_name, "ArgyllCMS/.mk_%s.cal", m->serno); - if ((no_paths = xdg_bds(NULL, &cal_paths, xdg_cache, xdg_write, xdg_user, cal_name)) < 1) { + if ((no_paths = xdg_bds(NULL, &cal_paths, xdg_cache, xdg_write, xdg_user, xdg_none, + cal_name)) < 1) { a1logd(p->log,1,"munki_save_calibration xdg_bds returned no paths\n"); return MUNKI_INT_CAL_SAVE; } @@ -3299,7 +3301,8 @@ munki_code munki_restore_calibration(munki *p) { #endif sprintf(cal_name, "ArgyllCMS/.mk_%s.cal" SSEPS "color/.mk_%s.cal", m->serno, m->serno); - if ((no_paths = xdg_bds(NULL, &cal_paths, xdg_cache, xdg_read, xdg_user, cal_name)) < 1) { + if ((no_paths = xdg_bds(NULL, &cal_paths, xdg_cache, xdg_read, xdg_user, xdg_none, + cal_name)) < 1) { a1logd(p->log,1,"munki_restore_calibration xdg_bds returned no paths\n"); return MUNKI_INT_CAL_RESTORE; } @@ -3616,7 +3619,8 @@ munki_code munki_touch_calibration(munki *p) { int rv; sprintf(cal_name, "ArgyllCMS/.mk_%s.cal" SSEPS "color/.mk_%s.cal", m->serno, m->serno); - if ((no_paths = xdg_bds(NULL, &cal_paths, xdg_cache, xdg_read, xdg_user, cal_name)) < 1) + if ((no_paths = xdg_bds(NULL, &cal_paths, xdg_cache, xdg_read, xdg_user, xdg_none, + cal_name)) < 1) return MUNKI_INT_CAL_TOUCH; a1logd(p->log,2,"munki_touch_calibration touching file '%s'\n",cal_paths[0]); |