From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 25 Feb 2024 10:50:32 +0000 (+0100)
Subject: remove get parameters is not started
X-Git-Tag: v1.0.0^2~189
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=351e411e1d8126bac233c13de1c57527ac0d0493;p=sane-kds-s2000w-net.git

remove get parameters is not started
---

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index f7fe53f..0f9cfde 100644
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -124,24 +124,10 @@ 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));
-
-	if (h->current_metadata->depth == 1)
-		h->current_metadata->bytes_per_line = h->current_metadata->channels * floor((h->current_metadata->pixels_per_line + 7) / 8);
-	else
-		h->current_metadata->bytes_per_line = h->current_metadata->channels * h->current_metadata->pixels_per_line * h->current_metadata->depth / 8;
-
-	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));
 
diff --git a/tests/kds_s2000w_net_get_params_tests.c b/tests/kds_s2000w_net_get_params_tests.c
index 34f5028..5901a5b 100644
--- a/tests/kds_s2000w_net_get_params_tests.c
+++ b/tests/kds_s2000w_net_get_params_tests.c
@@ -34,7 +34,7 @@ START_TEST(kds_s2000w_net_get_parameters_with_image_data)
 
 	ck_assert_int_eq(params.format, 1);
 	ck_assert_int_eq(params.last_frame, 0);
-	ck_assert_int_eq(params.bytes_per_line, 3240);
+	ck_assert_int_eq(params.bytes_per_line, 42);
 	ck_assert_int_eq(params.pixels_per_line, 1080);
 	ck_assert_int_eq(params.lines, 100);
 	ck_assert_int_eq(params.depth, 8);