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 /xicc/ccmx.h | |
parent | 509016be676f7915d635fa57144d2a441e3090ca (diff) | |
parent | c0b89ac5bfb90835ef01573267020e42d4fe070c (diff) |
Merge new upstream release
Diffstat (limited to 'xicc/ccmx.h')
-rwxr-xr-x[-rw-r--r--] | xicc/ccmx.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xicc/ccmx.h b/xicc/ccmx.h index 48598fc..94263e0 100644..100755 --- 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 */ |