sinfonia: Fix tone curve manipulation

backend_kodak6800.c

@@ -376,7 +376,7 @@ static int kodak6800_get_tonecurve(struct kodak6800_ctx *ctx, uint8_t curve, cha
 	int ret, num = 0;
 	int i;
 
-	uint16_t *data = malloc(TONE_CURVE_SIZE);
+	uint16_t *data = malloc(TONE_CURVE_SIZE * sizeof(uint16_t));
 	if (!data) {
 		ERROR("Memory Allocation Failure\n");
 		return -1;
@@ -442,7 +442,7 @@ static int kodak6800_get_tonecurve(struct kodak6800_ctx *ctx, uint8_t curve, cha
 			goto done;
 		}
 
-		for (i = 0 ; i < 768; i++) {
+		for (i = 0 ; i < TONE_CURVE_SIZE; i++) {
 			/* Byteswap appropriately */
 			data[i] = cpu_to_be16(le16_to_cpu(data[i]));
 			ret = write(tc_fd, &data[i], sizeof(uint16_t));
@@ -464,7 +464,7 @@ static int kodak6800_set_tonecurve(struct kodak6800_ctx *ctx, uint8_t curve, cha
 	int ret, num = 0;
 	int remain;
 
-	uint16_t *data = malloc(TONE_CURVE_SIZE);
+	uint16_t *data = malloc(TONE_CURVE_SIZE * sizeof(uint16_t));
 	uint8_t *ptr;
 
 	if (!data) {
@@ -475,13 +475,13 @@ static int kodak6800_set_tonecurve(struct kodak6800_ctx *ctx, uint8_t curve, cha
 	INFO("Set Tone Curve from '%s'\n", fname);
 
 	/* Read in file */
-	if ((ret = dyesub_read_file(fname, data, TONE_CURVE_SIZE, NULL))) {
+	if ((ret = dyesub_read_file(fname, data, TONE_CURVE_SIZE * sizeof(uint16_t), NULL))) {
 		ERROR("Failed to read Tone Curve file\n");
 		goto done;
 	}
 
 	/* Byteswap data to printer's format */
-	for (ret = 0; ret < (TONE_CURVE_SIZE)/2 ; ret++) {
+	for (ret = 0; ret < TONE_CURVE_SIZE ; ret++) {
 		data[ret] = cpu_to_le16(be16_to_cpu(data[ret]));
 	}
 
@@ -517,7 +517,7 @@ static int kodak6800_set_tonecurve(struct kodak6800_ctx *ctx, uint8_t curve, cha
 	}
 
 	ptr = (uint8_t*) data;
-	remain = TONE_CURVE_SIZE;
+	remain = TONE_CURVE_SIZE * sizeof(uint16_t);
 	while (remain > 0) {
 		int count = remain > 63 ? 63 : remain;
 
@@ -1048,7 +1048,7 @@ static const char *kodak6800_prefixes[] = {
 /* Exported */
 struct dyesub_backend kodak6800_backend = {
 	.name = "Kodak 6800/6850",
-	.version = "0.76" " (lib " LIBSINFONIA_VER ")",
+	.version = "0.77" " (lib " LIBSINFONIA_VER ")",
 	.uri_prefixes = kodak6800_prefixes,
 	.cmdline_usage = kodak6800_cmdline,
 	.cmdline_arg = kodak6800_cmdline_arg,

backend_sinfonia.c

@@ -612,7 +612,7 @@ int sinfonia_gettonecurve(struct sinfonia_usbdev *usbh, int type, char *fname)
 	cmd.curveid = TONE_CURVE_ID;
 
 	cmd.hdr.cmd = cpu_to_le16(SINFONIA_CMD_READTONE);
-	cmd.hdr.len = cpu_to_le16(1);
+	cmd.hdr.len = cpu_to_le16(2);
 
 	resp.hdr.payload_len = 0;
 

backend_sinfonia.h

@@ -27,7 +27,7 @@
  *
  */
 
-#define LIBSINFONIA_VER "0.12"
+#define LIBSINFONIA_VER "0.13"
 
 #define SINFONIA_HDR1_LEN 0x10
 #define SINFONIA_HDR2_LEN 0x64
@@ -124,7 +124,7 @@ const char *sinfonia_bank_statuses(uint8_t v);
    each is 256 entries of 11-bit data padded to 16-bits.
    Printer expects LE data.  We use BE data on disk.
 */
-#define TONE_CURVE_SIZE 0x600
+#define TONE_CURVE_SIZE (256*3)
 const char *sinfonia_update_targets (uint8_t v);
 
 #define TONECURVE_INIT    0x00