add read first header bytes by get parameters

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index b4ba390c126fa7e0422122a910e290d8f3a7522b..5ce6c1a69a2f25dcf46c0ecd382976533a870df6 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -163,6 +163,8 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
        kds_s2000w_handler_get_current_metadata(h, (metadata*) params);
 
        h->read_info->read_size = 0;
+       if (h->image->data != NULL)
+               h->read_info->read_size = _sane_kds_s2000w_net_find_first_data_byte(h->image);
 
        return SANE_STATUS_GOOD;
 }

diff --git a/tests/kds_s2000w_client_mock.c b/tests/kds_s2000w_client_mock.c
index f89f7d5148dbb90343466fadd97ea7c91fe85e59..d9073275c6d11272d29853d8db84fc5c107894d4 100644 (file)
--- a/tests/kds_s2000w_client_mock.c
+++ b/tests/kds_s2000w_client_mock.c
@@ -86,10 +86,22 @@ void __wrap_kds_s2000w_client_close_session(int64_t sessionid)
 
 void __wrap_kds_s2000w_convert_jpg_to_pnm_with_depth(blobdata* in, blobdata* out)
 {
+       if (in->data != NULL) {
+               out->data = malloc(sizeof(char) * in->size);
+               memcpy(out->data, in->data, in->size);
+               out->size = in->size;
+       }
+
        return;
 }
 
 void __wrap_kds_s2000w_convert_tiff_to_pnm(blobdata* in, blobdata* out)
 {
+       if (in->data != NULL) {
+               out->data = malloc(sizeof(char) * in->size);
+               memcpy(out->data, in->data, in->size);
+               out->size = in->size;
+       }
+
        return;
 }
\ No newline at end of file

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 31ec02c7c562419721e59ba11c38de78a431cbc0..4087a5659622d7f9ca8f2db2e77c6ccb29e9eab1 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -353,6 +353,7 @@ void sane_kds_s2000w_net_get_parameter()
        assert_int_equal(params->pixels_per_line, 2);
        assert_int_equal(params->lines, 1);
        assert_int_equal(params->depth, 8);
+       assert_int_equal(h->read_info->read_size, 11);
 
        free_handler(h);
        h = NULL;