From 6e3a2df5afee939021db38eee53c2289f0012d7b Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sat, 21 Dec 2024 16:55:42 +0100 Subject: [PATCH] remove valid property for current metdata --- src/kds_s2000w_handler.c | 4 ---- src/kds_s2000w_handler.h | 1 - src/kds_s2000w_net.c | 10 +++++----- tests/kds_s2000w_net_tests.c | 6 ------ 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c index 52fb2c7..55d8d79 100644 --- a/src/kds_s2000w_handler.c +++ b/src/kds_s2000w_handler.c @@ -37,7 +37,6 @@ handler* init_handler() h->current_metadata->pixels_per_line = 0; h->current_metadata->lines = 0; h->current_metadata->depth = 8; - h->current_metadata->valid = 0; h->read_info->scan_started = 0; h->read_info->cancel = 0; h->read_info->read_size = 0; @@ -91,7 +90,6 @@ void reset_handler(handler* h) h->current_metadata->pixels_per_line = 0; h->current_metadata->lines = 0; h->current_metadata->depth = 8; - h->current_metadata->valid = 0; h->read_info->scan_started = 0; h->read_info->cancel = 0; h->read_info->read_size = 0; @@ -120,7 +118,6 @@ void kds_s2000w_handler_get_current_metadata(handler* h) image->data = NULL; image->data = 0; - h->current_metadata->valid = 0; if (strcmp(color_value, "Color") == 0) h->current_metadata->format = 1; @@ -155,7 +152,6 @@ void kds_s2000w_handler_get_current_metadata(handler* h) else h->current_metadata->bytes_per_line = channels * h->current_metadata->pixels_per_line * h->current_metadata->depth / 8; - h->current_metadata->valid = 1; metadata = NULL; free(mdata); diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h index 5212bae..63cc2c0 100644 --- a/src/kds_s2000w_handler.h +++ b/src/kds_s2000w_handler.h @@ -24,7 +24,6 @@ typedef struct { int pixels_per_line; int lines; int depth; - int valid; } metadata; typedef struct { diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c index c4e44b5..d593a3e 100644 --- a/src/kds_s2000w_net.c +++ b/src/kds_s2000w_net.c @@ -215,16 +215,16 @@ SANE_Status _sane_kds_s2000w_net_start(SANE_Handle handle) break; } + if (h->current_scan_status->available_images < 1 && h->image->size == 0) { + kds_s2000w_handler_recreate_session(h); + return SANE_STATUS_NO_DOCS; + } + kds_s2000w_handler_download_current_image(h); kds_s2000w_handler_get_current_metadata(h); kds_s2000w_handler_delete_current_image(h); h->current_scan_status->current_image_number++; - if (h->current_metadata->valid == 0 || h->image->size == 0) { - kds_s2000w_handler_recreate_session(h); - return SANE_STATUS_NO_DOCS; - } - if (h->current_scan_status->feeder > 0 && h->current_scan_status->complete_scanned && h->current_scan_status->available_images <= 0) { diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c index f0c56c9..cd40fd8 100644 --- a/tests/kds_s2000w_net_tests.c +++ b/tests/kds_s2000w_net_tests.c @@ -31,7 +31,6 @@ void kds_s2000w_net_get_parameters_with_image_data() { handler* h = init_handler(); h->read_info->scan_started = 1; - h->current_metadata->valid = 1; h->current_metadata->format = 1; h->current_metadata->bytes_per_line = 42; h->current_metadata->pixels_per_line = 1080; @@ -169,7 +168,6 @@ void sane_kds_s2000w_net_start(void** state) assert_int_equal(h->current_metadata->format, 1); 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); json_object_put(h->current_scanner_config); h->current_scanner_config = NULL; @@ -237,7 +235,6 @@ void sane_kds_s2000w_net_start_one_page_per_flatscan(void** state) assert_int_equal(h->current_metadata->format, 1); 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); json_object_put(h->current_scanner_config); h->current_scanner_config = NULL; @@ -308,7 +305,6 @@ void sane_kds_s2000w_net_start_one_page_per_feeder(void** state) assert_int_equal(h->current_metadata->format, 1); 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); json_object_put(h->current_scanner_config); h->current_scanner_config = NULL; @@ -409,7 +405,6 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder(void** state) assert_int_equal(h->current_metadata->format, 1); 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); json_object_put(h->current_scanner_config); h->current_scanner_config = NULL; @@ -509,7 +504,6 @@ void sane_kds_s2000w_net_start_slow_two_pages_per_feeder(void** state) assert_int_equal(h->current_metadata->format, 1); 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); json_object_put(h->current_scanner_config); h->current_scanner_config = NULL; -- 2.39.5