diff options
Diffstat (limited to 'xicc/ccmx.c')
| -rw-r--r-- | xicc/ccmx.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/xicc/ccmx.c b/xicc/ccmx.c index 538f181..7206f31 100644 --- a/xicc/ccmx.c +++ b/xicc/ccmx.c @@ -3,6 +3,9 @@ * Argyll Color Correction System * Colorimeter Correction Matrix * + */ + +/* * Author: Graeme W. Gill * Date: 19/8/2010 * @@ -16,6 +19,7 @@ * on other libraries that are licenced under the GNU AFFERO GENERAL PUBLIC LICENSE Version 3. */ + /* * TTBD: */ @@ -34,7 +38,7 @@ #include "icc.h" #else #include "numsup.h" -#include "conv.h" +#include "sa_conv.h" #endif #include "cgats.h" #include "disptechs.h" @@ -146,7 +150,7 @@ char *outname /* Filename to write to */ static int buf_write_ccmx( ccmx *p, unsigned char **buf, /* Return allocated buffer */ -int *len /* Return length */ +size_t *len /* Return length */ ) { int rv; cgats *ocg; /* CGATS structure */ @@ -353,7 +357,7 @@ char *inname /* Filename to read from */ static int buf_read_ccmx( ccmx *p, /* This */ unsigned char *buf, -int len +size_t len ) { int rv; cgatsFile *fp; @@ -685,6 +689,7 @@ int refrmode, /* Display refresh mode, -1 = unknown, 0 = n, 1 = yes */ int cbid, /* Display type calibration base index, 0 = unknown */ char *sel, /* UI selector characters - NULL for none */ char *refd, /* Reference spectrometer description (optional) */ +int oem, /* NZ if OEM source */ int npat, /* Number of samples in following arrays */ double (*refs)[3], /* Array of XYZ values from spectrometer */ double (*cols)[3] /* Array of XYZ values from colorimeter */ |