From: Bastian Dehn Date: Sat, 3 Feb 2024 18:01:38 +0000 (+0100) Subject: mapping data for image one X-Git-Tag: v1.0.0^2~357 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=bd7c421824d7e89f2685a3cc1eb98f4268f9fe5b;p=sane-kds-s2000w-net.git mapping data for image one --- diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c index 11d5d4e..ded8c3d 100644 --- a/src/kds_s2000w_handler.c +++ b/src/kds_s2000w_handler.c @@ -486,6 +486,10 @@ metadata kds_s2000w_handler_get_parameters(int image_number) mdata.size = json_object_get_int(mdata_value); mdata_value = NULL; + mdata_value = json_object_object_get(metadata, "ImageWidth"); + mdata.pixels_per_line = json_object_get_int(mdata_value); + mdata_value = NULL; + mdata_value = json_object_object_get(metadata, "ImageHeight"); mdata.lines = json_object_get_int(mdata_value); mdata_value = NULL; diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h index bf20fc5..d1a181b 100644 --- a/src/kds_s2000w_handler.h +++ b/src/kds_s2000w_handler.h @@ -20,6 +20,7 @@ typedef struct { int is_last; int size; int bytes_per_line; + int pixels_per_line; int lines; int depth; int valid; diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c index 8d4a633..def8c84 100644 --- a/src/kds_s2000w_net.c +++ b/src/kds_s2000w_net.c @@ -179,12 +179,12 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle, sleep(1); } - params->format = SANE_FRAME_GRAY; - params->last_frame = SANE_FALSE; - params->bytes_per_line = 256; - params->pixels_per_line = 0; - params->lines = 0; - params->depth = 8; + params->format = mdata.format; + params->last_frame = mdata.is_last; + params->bytes_per_line = mdata.bytes_per_line; + params->pixels_per_line = mdata.pixels_per_line; + params->lines = mdata.lines; + params->depth = mdata.depth; return SANE_STATUS_UNSUPPORTED; }