is last bit first zero

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index e61876707ef52aec4309771ac66c3bfcb15e3b90..f147b51657a5b2d0a951ae854eddaaaebb9fab2e 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -169,7 +169,7 @@ handler* init_handler()
        h->current_scan_status->downloaded_images = 0;
        h->current_scan_status->complete_scanned = 0;
        h->current_metadata->format = 1;
-       h->current_metadata->is_last = 1;
+       h->current_metadata->is_last = 0;
        h->current_metadata->size = 0;
        h->current_metadata->bytes_per_line = 0;
        h->current_metadata->pixels_per_line = 0;
@@ -304,7 +304,6 @@ void kds_s2000w_handler_get_parameters(void* handle)
                && h->current_scan_status->available_images <= 0) {
                h->current_metadata->valid = 1;
                h->current_metadata->scanned_all_complete = 1;
-               h->current_metadata->is_last = 1;
                return;
        }
 

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index ad80a3629a8e5d439744fe11e1b16c348e1e3494..febce6cca66d0f19b83411168d83c3ef19761818 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -192,6 +192,7 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
 
        if (h->read_info->readed_lines >= h->current_metadata->lines) {
                *length = 0;
+               h->current_metadata->is_last = 1;
                h->read_info->readed_lines = 0;
                return SANE_STATUS_EOF;
        }

diff --git a/tests/kds_s2000w_net_get_params_tests.c b/tests/kds_s2000w_net_get_params_tests.c
index 19151aa19bb419e08462ff07b4d4877971cf5c22..5901a5ba0933ea58a94ebfe2341c91dd5713c4dc 100644 (file)
--- a/tests/kds_s2000w_net_get_params_tests.c
+++ b/tests/kds_s2000w_net_get_params_tests.c
@@ -23,7 +23,7 @@ START_TEST(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 = 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;
@@ -33,7 +33,7 @@ START_TEST(kds_s2000w_net_get_parameters_with_image_data)
        SANE_Status status = _sane_kds_s2000w_net_get_parameters(h, &params);
 
        ck_assert_int_eq(params.format, 1);
-       ck_assert_int_eq(params.last_frame, 1);
+       ck_assert_int_eq(params.last_frame, 0);
        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);