From 094535c010320967639e8e86f974d878e80baa72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 1 May 2015 16:13:57 +0200 Subject: Imported Upstream version 1.7.0 --- spectro/oeminst.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'spectro/oeminst.c') diff --git a/spectro/oeminst.c b/spectro/oeminst.c index 2aa96e5..bce7a67 100644 --- a/spectro/oeminst.c +++ b/spectro/oeminst.c @@ -30,8 +30,10 @@ #include "aglob.h" #include "oemarch.h" #include "xspect.h" +#include "disptechs.h" #include "ccmx.h" #include "ccss.h" +#include "ui.h" void usage(void) { fprintf(stderr,"Install OEM data files, Version %s\n",ARGYLL_VERSION_STR); @@ -127,7 +129,7 @@ main(int argc, char *argv[]) { for (; fa < argc; fa++) { xfile *xf; xf = new_add_xf(&files, argv[fa], NULL, 0, file_arch | file_dllcab | file_data, - targ_spyd_pld | targ_spyd_cal + targ_spyd1_pld | targ_spyd2_pld | targ_spyd_cal | targ_i1d3_edr | targ_ccmx); if (load_xfile(xf, verb)) error("Unable to load file '%s'",xf->name); @@ -201,7 +203,9 @@ main(int argc, char *argv[]) { if (cx->buf_read_ccmx(cx, xf->buf, xf->len)) { error("Reading '%s' failed with '%s'\n",xf->name,cx->err); } - if (cx->cbid <= 0) + if (cx->dtech == disptech_unknown) + warning("'%s' has an unknown display technology set",xf->name); + if (cx->cc_cbid <= 0) error("'%s' doesn't contain DISPLAY_TYPE_BASE_ID field :- it can't be installed without this!",xf->name); if (cx->refrmode < 0) warning("'%s' doesn't contain DISPLAY_TYPE_REFRESH field :- non-refresh will be assumed!",xf->name); -- cgit v1.2.3