From: Bastian Dehn <hhaalo@arcor.de>
Date: Sat, 24 Feb 2024 16:51:40 +0000 (+0100)
Subject: load format per load color option
X-Git-Tag: v1.0.0^2~203
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=5d4e90030aee942cd6f489448fbe24be20b468bd;p=sane-kds-s2000w-net.git

load format per load color option
---

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 056817d..ab99046 100644
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -138,6 +138,12 @@ void kds_s2000w_handler_get_option(handler* h, int option, void* value)
 		case 4:
 			value_object = json_object_object_get(config, "ColorMode");
 			_write_string_value(value_object, value);
+
+			if (strcmp(value, "Color") == 0)
+				h->current_metadata->format = 1;
+			else
+				h->current_metadata->format = 0;
+
 			break;
 		case 5:
 			value_object = json_object_object_get(config, "SkipBlankPages");
diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 93c324c..5972e9d 100644
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -123,10 +123,20 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
 {
 	debug_printf(ALL, "sane_kds_s2000w_net_get_parameters");
 	handler* h = (handler*) handle;
+
+	metadata mdata;
+	memcpy(&mdata, h->current_metadata, sizeof(metadata));
+
+	params->format = mdata.format;
+	params->last_frame = mdata.is_last;
+	params->bytes_per_line = mdata.bytes_per_line;
+	params->pixels_per_line = mdata.pixels_per_line;
+	params->lines = mdata.lines;
+	params->depth = mdata.depth;
+
 	if (!h->read_info->scan_started)
 		return SANE_STATUS_GOOD;
 
-	metadata mdata;
 	if (h->current_metadata->is_last) {
 		memcpy(&mdata, h->current_metadata, sizeof(metadata));