From: Bastian Dehn Date: Mon, 30 Dec 2024 09:24:50 +0000 (+0100) Subject: add read first header bytes by get parameters X-Git-Tag: v1.0.19^2~5 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=34dad6b71f810cb63d7b0e662f2d3dccbfc3900a;p=sane-kds-s2000w-net.git add read first header bytes by get parameters --- diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c index b4ba390..5ce6c1a 100644 --- 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 f89f7d5..d907327 100644 --- 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 31ec02c..4087a56 100644 --- 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;