From b9e106334637eb3cae0e97813df0269014a05406 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Mon, 17 Feb 2025 20:17:38 +0100 Subject: [PATCH] change color contrast position --- src/kds_s2000w_handler_opts.c | 16 +++++----- src/kds_s2000w_option_descriptors.c | 8 ++--- tests/kds_s2000w_net_get_opt_tests.c | 8 ++--- tests/kds_s2000w_option_descriptor_tests.c | 36 +++++++++++----------- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index b3e8243..47b2601 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -215,8 +215,8 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 23: - value_object = json_object_object_get(config, "MultifeedResponse"); - _kds_s2000w_handler_opts_write_string_value(value_object, value); + value_object = json_object_object_get(config, "ColorContrast"); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 24: value_object = json_object_object_get(config, "PostScanRotation"); @@ -271,8 +271,8 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 37: - value_object = json_object_object_get(config, "ColorContrast"); - _kds_s2000w_handler_opts_write_int_value(value_object, value); + value_object = json_object_object_get(config, "MultifeedResponse"); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 38: value_object = json_object_object_get(config, "ColorBalanceRed"); @@ -409,8 +409,8 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 23: - value_object = json_object_object_get(config, "MultifeedResponse"); - _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); + value_object = json_object_object_get(config, "ColorContrast"); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 24: value_object = json_object_object_get(config, "PostScanRotation"); @@ -465,8 +465,8 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 37: - value_object = json_object_object_get(config, "ColorContrast"); - _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); + value_object = json_object_object_get(config, "MultifeedResponse"); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 38: value_object = json_object_object_get(config, "ColorBalanceRed"); diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index 34cad49..abfc425 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -928,8 +928,8 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_color_contrast() SANE_Option_Descriptor descriptor = { "color-contrast", - "Color contrast", - "Color contrast", + "Color Contrast", + "Color Contrast", SANE_TYPE_INT, SANE_UNIT_NONE, sizeof(SANE_Int), @@ -1101,7 +1101,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[20] = _kds_s2000w_option_descriptor_color_drop_out_aggressiveness(); descriptor_array[21] = _kds_s2000w_option_descriptor_color_auto_brightness_mode(); descriptor_array[22] = _kds_s2000w_option_descriptor_color_brightness(); - descriptor_array[23] = _kds_s2000w_option_descriptor_multifeed_response(); + descriptor_array[23] = _kds_s2000w_option_descriptor_color_contrast(); descriptor_array[24] = _kds_s2000w_option_descriptor_post_scan_rotation(); descriptor_array[25] = _kds_s2000w_option_descriptor_edge_fill(); descriptor_array[26] = _kds_s2000w_option_descriptor_image_border(); @@ -1115,7 +1115,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[34] = _kds_s2000w_option_descriptor_multifeed_sensitivity(); descriptor_array[35] = _kds_s2000w_option_descriptor_max_document_length(); descriptor_array[36] = _kds_s2000w_option_descriptor_document_feeder_timeout(); - descriptor_array[37] = _kds_s2000w_option_descriptor_color_contrast(); + descriptor_array[37] = _kds_s2000w_option_descriptor_multifeed_response(); descriptor_array[38] = _kds_s2000w_option_descriptor_color_balance_red(); descriptor_array[39] = _kds_s2000w_option_descriptor_binarization_contrast(); descriptor_array[40] = _kds_s2000w_option_descriptor_color_sharpen(); diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index 6c60ebb..3d735e3 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -305,11 +305,11 @@ void sane_kds_s2000w_net_control_get_option_twentythree_test(void** state) handler* h = kds_s2000w_handler_init(); response* resp = (response*) *state; h->current_scanner_config = json_tokener_parse(resp->data); - char* value[50] = {0}; + uint32_t value = -1; sane_kds_s2000w_net_control_option(h, 23, SANE_ACTION_GET_VALUE, &value, NULL); - assert_string_equal(value, "Stop"); + assert_int_equal(value, 0); kds_s2000w_handler_free(h); h = NULL; @@ -515,11 +515,11 @@ void sane_kds_s2000w_net_control_get_option_thirdyseven_test(void** state) handler* h = kds_s2000w_handler_init(); response* resp = (response*) *state; h->current_scanner_config = json_tokener_parse(resp->data); - uint32_t value = -1; + char* value[50] = {0}; sane_kds_s2000w_net_control_option(h, 37, SANE_ACTION_GET_VALUE, &value, NULL); - assert_int_equal(value, 0); + assert_string_equal(value, "Stop"); kds_s2000w_handler_free(h); h = NULL; diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c index 2c0cd1d..f786e27 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -415,17 +415,17 @@ void kds_s2000w_option_get_descriptor_twentythree_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(23); - assert_string_equal("multifeed-response", option->name); - assert_string_equal("multifeed response", option->title); - assert_string_equal("multifeed response", option->desc); - assert_int_equal(SANE_TYPE_STRING, option->type); + assert_string_equal("color-contrast", option->name); + assert_string_equal("Color Contrast", option->title); + assert_string_equal("Color Contrast", option->desc); + assert_int_equal(SANE_TYPE_INT, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(sizeof(SANE_String_Const*) * 3, option->size); + assert_int_equal(sizeof(SANE_Int), option->size); assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap); - assert_int_equal(SANE_CONSTRAINT_STRING_LIST, option->constraint_type); - assert_string_equal("Stop", option->constraint.string_list[0]); - assert_string_equal("StopAndGenerateImage", option->constraint.string_list[1]); - assert_null(option->constraint.string_list[2]); + assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type); + assert_int_equal(option->constraint.range->min, -50); + assert_int_equal(option->constraint.range->max, 50); + assert_int_equal(option->constraint.range->quant, 1); } void kds_s2000w_option_get_descriptor_twentyfour_test() @@ -660,17 +660,17 @@ void kds_s2000w_option_get_descriptor_thirdyseven_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(37); - assert_string_equal("color-contrast", option->name); - assert_string_equal("Color contrast", option->title); - assert_string_equal("Color contrast", option->desc); - assert_int_equal(SANE_TYPE_INT, option->type); + assert_string_equal("multifeed-response", option->name); + assert_string_equal("multifeed response", option->title); + assert_string_equal("multifeed response", option->desc); + assert_int_equal(SANE_TYPE_STRING, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(sizeof(SANE_Int), option->size); + assert_int_equal(sizeof(SANE_String_Const*) * 3, option->size); assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap); - assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type); - assert_int_equal(option->constraint.range->min, -50); - assert_int_equal(option->constraint.range->max, 50); - assert_int_equal(option->constraint.range->quant, 1); + assert_int_equal(SANE_CONSTRAINT_STRING_LIST, option->constraint_type); + assert_string_equal("Stop", option->constraint.string_list[0]); + assert_string_equal("StopAndGenerateImage", option->constraint.string_list[1]); + assert_null(option->constraint.string_list[2]); } void kds_s2000w_option_get_descriptor_thirdyeight_test() -- 2.39.5