remove valid property for current metdata

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index 52fb2c76fe5ba7bb03540983d4ac906aacac2fef..55d8d799d598e1b4840c69fd84339c0cb628d39e 100644 (file)
--- 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 5212bae394c92f2e8206554b87644b9481799888..63cc2c0758cbf43f12dc58662e6de5d7b7939af8 100644 (file)
--- 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 c4e44b50a2088102e66938029230df07e3af5f6d..d593a3ed18c59ddfa33fe2f562e0c3c72bb1e1b7 100644 (file)
--- 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 f0c56c95ffe8b2b865eeba139a456f53007bc760..cd40fd8f68c2b4bf06f2b287fcfcdf2128aa6406 100644 (file)
--- 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;