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 --- xicc/ccmx.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 xicc/ccmx.h (limited to 'xicc/ccmx.h') diff --git a/xicc/ccmx.h b/xicc/ccmx.h old mode 100644 new mode 100755 index 48598fc..94263e0 --- a/xicc/ccmx.h +++ b/xicc/ccmx.h @@ -34,11 +34,11 @@ struct _ccmx { /* Set the contents of the ccmx. return nz on error. */ int (*set_ccmx)(struct _ccmx *p, char *desc, char *inst, char *disp, disptech dtech, - int refrmode, int cbid, char *sel, char *refd, double mtx[3][3]); + int refrmode, int cbid, char *sel, char *refd, int oem, double mtx[3][3]); /* Create a ccmx from measurements. return nz on error. */ int (*create_ccmx)(struct _ccmx *p, char *desc, char *inst, char *disp, disptech dtech, - int refrmode, int cbid, char *sel, char *refd, + int refrmode, int cbid, char *sel, char *refd, int oem, int nsamples, double (*refs)[3], double (*cols)[3]); /* write to a CGATS .ccmx file */ @@ -70,6 +70,7 @@ struct _ccmx { int refrmode; /* Refresh mode, -1 if unknown, 0 of no, 1 if yes */ char *sel; /* Optional UI selector characters. May be NULL */ char *ref; /* Name of spectrometer instrument (optional) */ + int oem; /* nz if oem origin */ double matrix[3][3]; /* Transform matrix */ double av_err; /* Average error of fit */ double mx_err; /* Maximum error of fit */ -- cgit v1.2.3