summaryrefslogtreecommitdiff
path: root/spectro/munki_imp.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-25 10:16:54 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-25 10:16:54 +0100
commit1b1126bd023a2bb92699773a1867358067dabcb8 (patch)
tree6fd56d034e5a154c7992e7855d61691cecd043c4 /spectro/munki_imp.c
parentcb5c7cec4aa1946f75dc3d408eb7f1051f3fb3d4 (diff)
parentf6b8e0eae4374f339487a33e3e4fe5462d5816e1 (diff)
Update upstream source from tag 'upstream/2.0.0'
Update to upstream version '2.0.0' with Debian dir e866e6e75661017faaa5331becda76021407390b
Diffstat (limited to 'spectro/munki_imp.c')
-rwxr-xr-x[-rw-r--r--]spectro/munki_imp.c12
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]);