From 6c47a88c550757ac63104052ffb09d60fe5ce5f5 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Fri, 17 May 2024 18:02:52 +0200 Subject: [PATCH] remove is last attribute from handler --- src/kds_s2000w_handler.c | 3 --- src/kds_s2000w_handler.h | 1 - src/kds_s2000w_net.c | 4 +--- tests/kds_s2000w_net_tests.c | 8 +------- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c index 555eb12..8ee33bd 100644 --- a/src/kds_s2000w_handler.c +++ b/src/kds_s2000w_handler.c @@ -61,7 +61,6 @@ void _get_current_metadata(handler* h) h->current_metadata->bytes_per_line = h->current_metadata->channels * h->current_metadata->pixels_per_line * h->current_metadata->depth / 8; h->current_metadata->valid = 1; - h->current_metadata->is_last = 1; metadata = NULL; free(mdata); @@ -161,7 +160,6 @@ handler* init_handler() h->current_scan_status->feeder = 1; h->current_metadata->format = 1; h->current_metadata->channels = 3; - h->current_metadata->is_last = 1; h->current_metadata->bytes_per_line = 0; h->current_metadata->pixels_per_line = 0; h->current_metadata->lines = 0; @@ -218,7 +216,6 @@ void reset_handler(handler* h) h->current_scan_status->complete_scanned = 0; h->current_metadata->format = 1; h->current_metadata->channels = 3; - h->current_metadata->is_last = 1; h->current_metadata->bytes_per_line = 0; h->current_metadata->pixels_per_line = 0; h->current_metadata->lines = 0; diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h index 997a3a8..237cd3d 100644 --- a/src/kds_s2000w_handler.h +++ b/src/kds_s2000w_handler.h @@ -21,7 +21,6 @@ typedef struct { typedef struct { int format; int channels; - int is_last; int bytes_per_line; int pixels_per_line; int lines; diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c index 72392b0..7f68dcc 100644 --- a/src/kds_s2000w_net.c +++ b/src/kds_s2000w_net.c @@ -134,7 +134,7 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle, } params->format = h->current_metadata->format; - params->last_frame = h->current_metadata->is_last; + params->last_frame = 1; params->bytes_per_line = h->current_metadata->bytes_per_line; params->pixels_per_line = h->current_metadata->pixels_per_line; params->lines = h->current_metadata->lines; @@ -167,7 +167,6 @@ SANE_Status _sane_kds_s2000w_net_start(SANE_Handle handle) if (!h->read_info->scan_started) { h->read_info->cancel = 0; h->read_info->scan_started = 1; - h->current_metadata->is_last = 0; kds_s2000w_handler_start_scan(h); } @@ -219,7 +218,6 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data, // last frame if (h->read_info->read_size >= h->pnm_image->size) { *length = 0; - h->current_metadata->is_last = 1; h->scanner_image->size = 0; free(h->scanner_image->data); h->scanner_image->data = NULL; diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c index 9151365..aceb902 100644 --- a/tests/kds_s2000w_net_tests.c +++ b/tests/kds_s2000w_net_tests.c @@ -33,7 +33,6 @@ void kds_s2000w_net_get_parameters_with_image_data() h->read_info->scan_started = 1; h->current_metadata->valid = 1; h->current_metadata->format = 1; - h->current_metadata->is_last = 0; h->current_metadata->bytes_per_line = 42; h->current_metadata->pixels_per_line = 1080; h->current_metadata->lines = 100; @@ -43,7 +42,7 @@ void kds_s2000w_net_get_parameters_with_image_data() SANE_Status status = _sane_kds_s2000w_net_get_parameters(h, ¶ms); assert_int_equal(params.format, 1); - assert_int_equal(params.last_frame, 0); + assert_int_equal(params.last_frame, 1); assert_int_equal(params.bytes_per_line, 42); assert_int_equal(params.pixels_per_line, 1080); assert_int_equal(params.lines, 100); @@ -172,7 +171,6 @@ void sane_kds_s2000w_net_start(void** state) assert_int_equal(h->current_metadata->pixels_per_line, 2); assert_int_equal(h->current_metadata->lines, 1); assert_int_equal(h->current_metadata->valid, 1); - assert_int_equal(h->current_metadata->is_last, 1); json_object_put(h->current_scanner_config); h->current_scanner_config = NULL; @@ -242,7 +240,6 @@ void sane_kds_s2000w_net_start_one_page_per_flatscan(void** state) assert_int_equal(h->current_metadata->pixels_per_line, 2); assert_int_equal(h->current_metadata->lines, 1); assert_int_equal(h->current_metadata->valid, 1); - assert_int_equal(h->current_metadata->is_last, 1); json_object_put(h->current_scanner_config); h->current_scanner_config = NULL; @@ -315,7 +312,6 @@ void sane_kds_s2000w_net_start_one_page_per_feeder(void** state) assert_int_equal(h->current_metadata->pixels_per_line, 2); assert_int_equal(h->current_metadata->lines, 1); assert_int_equal(h->current_metadata->valid, 1); - assert_int_equal(h->current_metadata->is_last, 1); json_object_put(h->current_scanner_config); h->current_scanner_config = NULL; @@ -418,7 +414,6 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder(void** state) assert_int_equal(h->current_metadata->pixels_per_line, 2); assert_int_equal(h->current_metadata->lines, 1); assert_int_equal(h->current_metadata->valid, 1); - assert_int_equal(h->current_metadata->is_last, 1); json_object_put(h->current_scanner_config); h->current_scanner_config = NULL; @@ -520,7 +515,6 @@ void sane_kds_s2000w_net_start_slow_two_pages_per_feeder(void** state) assert_int_equal(h->current_metadata->pixels_per_line, 2); assert_int_equal(h->current_metadata->lines, 1); assert_int_equal(h->current_metadata->valid, 1); - assert_int_equal(h->current_metadata->is_last, 1); json_object_put(h->current_scanner_config); h->current_scanner_config = NULL; -- 2.39.5