diff options
Diffstat (limited to 'xicc/ccss.c')
| -rw-r--r-- | xicc/ccss.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/xicc/ccss.c b/xicc/ccss.c index 75075c1..aae278e 100644 --- a/xicc/ccss.c +++ b/xicc/ccss.c @@ -2,7 +2,9 @@ /* * Argyll Color Correction System * Colorimeter Correction Matrix - * + */ + +/* * Author: Graeme W. Gill * Date: 9/8/2010 * @@ -13,6 +15,7 @@ * see the License2.txt file for licencing details. */ + /* * TTBD: */ @@ -31,7 +34,7 @@ #include "icc.h" #else #include "numsup.h" -#include "conv.h" +#include "sa_conv.h" #endif #include "cgats.h" #include "xspect.h" @@ -201,7 +204,7 @@ char *outname /* Filename to write to */ static int buf_write_ccss( ccss *p, unsigned char **buf, /* Return allocated buffer */ -int *len /* Return length */ +size_t *len /* Return length */ ) { int rv; cgats *ocg; /* CGATS structure */ @@ -231,7 +234,7 @@ int *len /* Return length */ } /* Get the buffer the ccss has been written to */ - if (fp->get_buf(fp, buf, (size_t *)len)) { + if (fp->get_buf(fp, buf, len)) { strcpy(p->err, "cgatsFileMem get_buf failed"); return 2; } @@ -434,7 +437,7 @@ char *inname /* Filename to read from */ static int buf_read_ccss( ccss *p, /* This */ unsigned char *buf, -int len +size_t len ) { int rv; cgatsFile *fp; |