From b38b702a1ab8329eb6ad906c32762573e45fb951 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Mon, 17 Feb 2025 19:50:40 +0100 Subject: [PATCH] change color drop position --- src/kds_s2000w_handler_opts.c | 17 ++++---- src/kds_s2000w_option_descriptors.c | 10 ++--- tests/kds_s2000w_net_get_opt_tests.c | 9 ++-- tests/kds_s2000w_option_descriptor_tests.c | 48 +++++++++++----------- 4 files changed, 41 insertions(+), 43 deletions(-) diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index f0bfc1b..fa3fd38 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -199,8 +199,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 19: - value_object = json_object_object_get(config, "ColorBalanceBlue"); - _kds_s2000w_handler_opts_write_int_value(value_object, value); + value_object = json_object_object_get(config, "ColorDropOut"); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 20: value_object = json_object_object_get(config, "ColorBalanceRed"); @@ -251,8 +251,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 32: - value_object = json_object_object_get(config, "ColorDropOut"); - _kds_s2000w_handler_opts_write_string_value(value_object, value); + value_object = json_object_object_get(config, "ColorBalanceBlue"); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 33: value_object = json_object_object_get(config, "SkipBlankPagesContent"); @@ -392,10 +392,9 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value value_object = json_object_object_get(config, "BackgroundSmoothingAggressiveness"); _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; - case 19: - value_object = json_object_object_get(config, "ColorBalanceBlue"); - _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); + value_object = json_object_object_get(config, "ColorDropOut"); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 20: value_object = json_object_object_get(config, "ColorBalanceRed"); @@ -446,8 +445,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 32: - value_object = json_object_object_get(config, "ColorDropOut"); - _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); + value_object = json_object_object_get(config, "ColorBalanceBlue"); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 33: value_object = json_object_object_get(config, "SkipBlankPagesContent"); diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index b6155b5..06ee4e8 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -172,9 +172,9 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_color_drop() constraint[8] = NULL; SANE_Option_Descriptor descriptor = { - "colordrop", - "colordrop", - "colordrop", + "color-drop", + "Color Drop", + "Color Drop", SANE_TYPE_STRING, SANE_UNIT_NONE, sizeof(SANE_String_Const*) * 9, @@ -1097,7 +1097,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[16] = _kds_s2000w_option_descriptor_background_smoothing_mode(); descriptor_array[17] = _kds_s2000w_option_descriptor_background_smoothing_aggressiveness(); descriptor_array[18] = _kds_s2000w_option_descriptor_boldness_color_group(); - descriptor_array[19] = _kds_s2000w_option_descriptor_color_balance_blue(); + descriptor_array[19] = _kds_s2000w_option_descriptor_color_drop(); descriptor_array[20] = _kds_s2000w_option_descriptor_color_balance_red(); descriptor_array[21] = _kds_s2000w_option_descriptor_binarization_contrast(); descriptor_array[22] = _kds_s2000w_option_descriptor_multifeed_sensitivity(); @@ -1110,7 +1110,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[29] = _kds_s2000w_option_descriptor_document_feeder_timeout_response(); descriptor_array[30] = _kds_s2000w_option_descriptor_hole_fill(); descriptor_array[31] = _kds_s2000w_option_descriptor_skip_blank_pages(); - descriptor_array[32] = _kds_s2000w_option_descriptor_color_drop(); + descriptor_array[32] = _kds_s2000w_option_descriptor_color_balance_blue(); descriptor_array[33] = _kds_s2000w_option_descriptor_skip_blank_page_content(); descriptor_array[34] = _kds_s2000w_option_descriptor_color_brightness(); descriptor_array[35] = _kds_s2000w_option_descriptor_max_document_length(); diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index 739ad74..997172d 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -242,15 +242,14 @@ void sane_kds_s2000w_net_control_get_option_seventeen_test(void** state) void sane_kds_s2000w_net_control_get_option_nineteen_test(void** state) { - handler* h = kds_s2000w_handler_init(); response* resp = (response*) *state; h->current_scanner_config = json_tokener_parse(resp->data); - int32_t value = -1; + char value[50] = {0}; sane_kds_s2000w_net_control_option(h, 19, SANE_ACTION_GET_VALUE, &value, NULL); - assert_int_equal(value, 0); + assert_string_equal(value, "None"); kds_s2000w_handler_free(h); h = NULL; @@ -441,11 +440,11 @@ void sane_kds_s2000w_net_control_get_option_thirdytwo_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}; + int32_t value = -1; sane_kds_s2000w_net_control_option(h, 32, SANE_ACTION_GET_VALUE, &value, NULL); - assert_string_equal(value, "None"); + assert_int_equal(value, 0); 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 e4f7138..b88164a 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -340,17 +340,23 @@ void kds_s2000w_option_get_descriptor_nineteen_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(19); - assert_string_equal("colorbalanceblue", option->name); - assert_string_equal("colorbalanceblue", option->title); - assert_string_equal("colorbalanceblue", option->desc); - assert_int_equal(SANE_TYPE_INT, option->type); + assert_string_equal("color-drop", option->name); + assert_string_equal("Color Drop", option->title); + assert_string_equal("Color Drop", 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*) * 9, 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(-50, option->constraint.range->min); - assert_int_equal(50, option->constraint.range->max); - assert_int_equal(1, option->constraint.range->quant); + assert_int_equal(SANE_CONSTRAINT_STRING_LIST, option->constraint_type); + assert_string_equal("None", option->constraint.string_list[0]); + assert_string_equal("Red", option->constraint.string_list[1]); + assert_string_equal("Green", option->constraint.string_list[2]); + assert_string_equal("Blue", option->constraint.string_list[3]); + assert_string_equal("Orange", option->constraint.string_list[4]); + assert_string_equal("OrangeAndRed", option->constraint.string_list[5]); + assert_string_equal("Predominant", option->constraint.string_list[6]); + assert_string_equal("Multiple", option->constraint.string_list[7]); + assert_null(option->constraint.string_list[8]); } void kds_s2000w_option_get_descriptor_twenty_test() @@ -568,23 +574,17 @@ void kds_s2000w_option_get_descriptor_thirdytwo_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(32); - assert_string_equal("colordrop", option->name); - assert_string_equal("colordrop", option->title); - assert_string_equal("colordrop", option->desc); - assert_int_equal(SANE_TYPE_STRING, option->type); + assert_string_equal("colorbalanceblue", option->name); + assert_string_equal("colorbalanceblue", option->title); + assert_string_equal("colorbalanceblue", 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*) * 9, 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("None", option->constraint.string_list[0]); - assert_string_equal("Red", option->constraint.string_list[1]); - assert_string_equal("Green", option->constraint.string_list[2]); - assert_string_equal("Blue", option->constraint.string_list[3]); - assert_string_equal("Orange", option->constraint.string_list[4]); - assert_string_equal("OrangeAndRed", option->constraint.string_list[5]); - assert_string_equal("Predominant", option->constraint.string_list[6]); - assert_string_equal("Multiple", option->constraint.string_list[7]); - assert_null(option->constraint.string_list[8]); + assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type); + assert_int_equal(-50, option->constraint.range->min); + assert_int_equal(50, option->constraint.range->max); + assert_int_equal(1, option->constraint.range->quant); } void kds_s2000w_option_get_descriptor_thirdythree_test() -- 2.39.5