From c78a94dfd4e7ade233ee341e2eb74cca44dd2e07 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Fri, 2 Feb 2024 19:42:17 +0100 Subject: [PATCH] add meta format --- src/kds_s2000w_handler.c | 16 ++++++++++++++-- src/kds_s2000w_net.c | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c index c57e0be..6951ad9 100644 --- a/src/kds_s2000w_handler.c +++ b/src/kds_s2000w_handler.c @@ -471,10 +471,22 @@ metadata kds_s2000w_handler_get_parameters(int image_number) mdata_value = json_object_object_get(metadata, "ImageSize"); mdata.size = json_object_get_int(mdata_value); mdata_value = NULL; - mdata.format = 1; - mdata.is_last = 0; + json_object_put(metadata); + metadata = NULL; + metadata = json_object_object_get(config, "ColorMode"); + const char* color_value = json_object_get_string(metadata); + if (strcmp(color_value, "Color") == 0) + mdata.format = 1; + + if (strcmp(color_value, "Gray") == 0) + mdata.format = 0; + if (strcmp(color_value, "BW") == 0) + mdata.format = 0; + + mdata_value = NULL; json_object_put(metadata); + metadata = NULL; kds_s2000w_client_response_free(resp); resp = NULL; } \ No newline at end of file diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c index 29a39f2..1353b1e 100644 --- a/src/kds_s2000w_net.c +++ b/src/kds_s2000w_net.c @@ -176,7 +176,7 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle, parameter->last_frame = SANE_TRUE; parameter->bytes_per_line = 0; parameter->pixels_per_line = 0; - parameter->lines = 1; + parameter->lines = 0; parameter->depth = 0; params = parameter; @@ -210,7 +210,7 @@ SANE_Status _sane_kds_s2000w_net_set_io_mode(SANE_Handle handle, SANE_Status _sane_kds_s2000w_net_get_select_fd(SANE_Handle handle, SANE_Int* fd) { - return SANE_STATUS_GOOD; + return SANE_STATUS_UNSUPPORTED; } SANE_String_Const _sane_kds_s2000w_net_strstatus(SANE_Status status) -- 2.39.5