Revert "add verify metadata run two times"

This reverts commit efe7ec138cf804b8d6b64eb6b42631e44d6c7334.

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index b4f0ca70a54ac176783ac462e752189b7b76f999..39f35a108c1b659d2d5d4e741c71fcea7a708eae 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -181,7 +181,6 @@ void kds_s2000w_handler_open(const char* devicename, void** handle)
        h->current_metadata->depth = 0;
        h->current_metadata->valid = 0;
        h->current_metadata->scanned_all_complete = 0;
-       h->current_metadata->verify = 0;
        h->current_metadata->image = NULL;
        h->read_info = malloc(sizeof(readinfo));
        h->read_info->scan_started = 0;

diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index e7db712532d453ddc6b0db9aec5c1a02a87210fb..6f1798f70917d090036a68adda1bef4adf94c8b9 100644 (file)
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -21,7 +21,6 @@ typedef struct {
        int depth;
        int valid;
        int scanned_all_complete;
-       int verify;
        void* image;
 } metadata;
 

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index f49f52262a69e9f4a5962a05ef87f1dd0fe718dd..6b52d94504eac005d323fce4103932cc0d59ec30 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -122,17 +122,11 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
        if (!h->read_info->scan_started)
                return SANE_STATUS_INVAL;
 
-       if (h->current_metadata->verify)
-               h->current_metadata->verify++;
-
-       if (!h->current_metadata->verify) {
-               for (int i = 0; i < 10; i++) {
-                       sleep(1);
-                       kds_s2000w_handler_get_parameters(handle);
-                       h->current_metadata->verify = 1;
-                       if (h->current_metadata->valid)
-                               break;
-               }
+       for (int i = 0; i < 10; i++) {
+               sleep(1);
+               kds_s2000w_handler_get_parameters(handle);
+               if (h->current_metadata->valid)
+                       break;
        }
 
        if (!h->current_metadata->valid)
@@ -151,9 +145,6 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
        h->read_info->readed_bytes_per_line = 0;
        h->read_info->readed_lines = 0;
 
-       if (h->current_metadata->verify >= 2)
-               h->current_metadata->verify = 0;
-
        debug_printf_int(DEBUG, "format", params->format);
        debug_printf_int(DEBUG, "last frame", params->last_frame);
        debug_printf_int(DEBUG, "bytes per line", params->bytes_per_line);