From e5c6b665efbbe3b632bcdba55d07b523291e8fa1 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sat, 10 Feb 2024 14:08:52 +0100 Subject: [PATCH] remove gamma r option --- src/kds_s2000w_handler_opts.c | 8 +++----- src/kds_s2000w_net.c | 3 --- src/kds_s2000w_option_descriptors.c | 12 ------------ src/kds_s2000w_option_descriptors.h | 3 +-- 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 66e6805..f308ee2 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -109,9 +109,10 @@ void kds_s2000w_handler_get_option(int option, void* value) json_object* value_object = NULL; switch(option) { case 0: + const int COUNT_CUSTOM_OPTIONS = 3; _load_options(); int* int_value_ptr = (int*) value; - *int_value_ptr = json_object_object_length(config) + 4; + *int_value_ptr = json_object_object_length(config) + COUNT_CUSTOM_OPTIONS; break; case 2: value_object = json_object_object_get(config, "DPI"); @@ -201,9 +202,6 @@ void kds_s2000w_handler_get_option(int option, void* value) value_object = json_object_object_get(config, "ScanSource"); _write_string_value(value_object, value); break; - case 24: - int* gamma_vector_r = (int*) value; - *gamma_vector_r = 1; default: break; } @@ -321,7 +319,7 @@ void kds_s2000w_handler_set_option(int option, void* value, int* info) value_object = json_object_object_get(config, "ScanSource"); _write_string_value_to_json(value_object, value); break; - case 25: + case 24: resp = kds_s2000w_client_response_init(); kds_s2000w_client_get_capabilities(resp); json_object* capabilities = json_tokener_parse(resp->data); diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c index c372a2a..ff62855 100644 --- a/src/kds_s2000w_net.c +++ b/src/kds_s2000w_net.c @@ -164,9 +164,6 @@ const SANE_Option_Descriptor* _sane_kds_s2000w_net_get_option_descriptor( kds_s2000w_option_descriptor_scan_source(&option_descriptors[option]); break; case 24: - kds_s2000w_option_descriptor_gamma_vector_r(&option_descriptors[option]); - break; - case 25: kds_s2000w_option_descriptor_config_reset(&option_descriptors[option]); break; default: diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index 36f8f40..88884c0 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -465,18 +465,6 @@ void kds_s2000w_option_descriptor_scan_source(SANE_Option_Descriptor* descriptor descriptor->size = sizeof(SANE_String) * 50; } -void kds_s2000w_option_descriptor_gamma_vector_r(SANE_Option_Descriptor* descriptor) -{ - descriptor->name = SANE_NAME_GAMMA_VECTOR_R; - descriptor->title = SANE_TITLE_GAMMA_VECTOR_R; - descriptor->desc = SANE_DESC_GAMMA_VECTOR_R; - descriptor->cap = SANE_CAP_SOFT_DETECT; - descriptor->constraint_type = SANE_CONSTRAINT_NONE; - descriptor->type = SANE_TYPE_BOOL; - descriptor->unit = SANE_UNIT_NONE; - descriptor->size = sizeof(SANE_Bool); -} - void kds_s2000w_option_descriptor_config_reset(SANE_Option_Descriptor* descriptor) { descriptor->name = "config-reset"; diff --git a/src/kds_s2000w_option_descriptors.h b/src/kds_s2000w_option_descriptors.h index da9a483..8f3b872 100644 --- a/src/kds_s2000w_option_descriptors.h +++ b/src/kds_s2000w_option_descriptors.h @@ -1,7 +1,7 @@ #ifndef KDS_S2000W_OPTION_DESCRIPTORS_H #include -#define MAX_OPTION_COUNT 26 +#define MAX_OPTION_COUNT 25 SANE_Option_Descriptor* kds_s2000w_option_descriptor_init_option_descriptors(); void kds_s2000w_option_descriptor_free_option_descriptors(SANE_Option_Descriptor* descriptor_array); @@ -30,6 +30,5 @@ void kds_s2000w_option_descriptor_binarization_mode(SANE_Option_Descriptor* desc void kds_s2000w_option_descriptor_binarization_contrast(SANE_Option_Descriptor* descriptor); void kds_s2000w_option_descriptor_max_document_length(SANE_Option_Descriptor* descriptor); void kds_s2000w_option_descriptor_scan_source(SANE_Option_Descriptor* descriptor); -void kds_s2000w_option_descriptor_gamma_vector_r(SANE_Option_Descriptor* descriptor); void kds_s2000w_option_descriptor_config_reset(SANE_Option_Descriptor* descriptor); #endif \ No newline at end of file -- 2.39.5