Updated version 1.9.1+repack from 'upstream/1.9.1+repack'

with Debian dir 98a996367aa69ae41accf9c6d369f600bc94de80

1 files changed, 13 insertions, 2 deletions

diff --git a/xicc/ccmx.h b/xicc/ccmx.h
index 94263e0..03d29d1 100644
--- a/xicc/ccmx.h
+++ b/xicc/ccmx.h
@@ -5,6 +5,9 @@
  * Argyll Color Correction System
  * Colorimeter Correction Matrix support.
  *
+ */
+
+/*
  * Author: Graeme W. Gill
  * Date:   19/8/2010
  *
@@ -19,6 +22,10 @@
  *
  */
 
+#ifdef __cplusplus
+	extern "C" {
+#endif
+
 /*
  * This object provides storage and application of a 3x3 XYZ
  * corretion matrix suitable for corrected a particular
@@ -46,13 +53,13 @@ struct _ccmx {
 
 	/* write a CGATS .ccmx file to a memory buffer. */
 	/* return nz on error, with message in err[] */
-	int (*buf_write_ccmx)(struct _ccmx *p, unsigned char **buf, int *len);
+	int (*buf_write_ccmx)(struct _ccmx *p, unsigned char **buf, size_t *len);
 
 	/* read from a CGATS .ccmx file */
 	int (*read_ccmx)(struct _ccmx *p, char *filename);
 
 	/* read from a CGATS .ccmx file from a memory buffer. */
-	int (*buf_read_ccmx)(struct _ccmx *p, unsigned char *buf, int len);
+	int (*buf_read_ccmx)(struct _ccmx *p, unsigned char *buf, size_t len);
 
 	/* Correct an XYZ value */
 	void (*xform) (struct _ccmx *p,
@@ -83,6 +90,10 @@ struct _ccmx {
 /* Create a new, uninitialised ccmx */
 ccmx *new_ccmx(void);
 
+#ifdef __cplusplus
+	}
+#endif
+
 #endif /* CCMX_H */