From: Bastian Dehn Date: Mon, 17 Feb 2025 19:30:36 +0000 (+0100) Subject: change color balance aggressiness position X-Git-Tag: v1.1.0^2~3^2~22 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=65d60d9fec79b5112b24710e11e67993a7dc387d;p=sane-kds-s2000w-net.git change color balance aggressiness position --- diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 9ce2522..f35d3c3 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -223,8 +223,8 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 25: - value_object = json_object_object_get(config, "EdgeFill"); - _kds_s2000w_handler_opts_write_string_value(value_object, value); + value_object = json_object_object_get(config, "ColorBalanceAggressiveness"); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 26: value_object = json_object_object_get(config, "ImageBorder"); @@ -291,8 +291,8 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 42: - value_object = json_object_object_get(config, "ColorBalanceAggressiveness"); - _kds_s2000w_handler_opts_write_int_value(value_object, value); + value_object = json_object_object_get(config, "EdgeFill"); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 43: value_object = json_object_object_get(config, "ColorBalanceGreen"); @@ -417,8 +417,8 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 25: - value_object = json_object_object_get(config, "EdgeFill"); - _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); + value_object = json_object_object_get(config, "ColorBalanceAggressiveness"); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 26: value_object = json_object_object_get(config, "ImageBorder"); @@ -485,8 +485,8 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 42: - value_object = json_object_object_get(config, "ColorBalanceAggressiveness"); - _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); + value_object = json_object_object_get(config, "EdgeFill"); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 43: value_object = json_object_object_get(config, "ColorBalanceGreen"); diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index 2b7ca3b..0c5f994 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -271,9 +271,9 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_color_balancea_agressivenes constraint->quant = 1; SANE_Option_Descriptor descriptor = { - "colorbalanceaggressiveness", - "colorbalanceaggressiveness", - "colorbalanceaggressiveness", + "color-balance-aggressiveness", + "Color Balance Aggressiveness", + "Color Balance Aggressiveness", SANE_TYPE_INT, SANE_UNIT_NONE, sizeof(SANE_Int), @@ -1103,7 +1103,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[22] = _kds_s2000w_option_descriptor_color_brightness(); descriptor_array[23] = _kds_s2000w_option_descriptor_color_contrast(); descriptor_array[24] = _kds_s2000w_option_descriptor_color_balance_mode(); - descriptor_array[25] = _kds_s2000w_option_descriptor_edge_fill(); + descriptor_array[25] = _kds_s2000w_option_descriptor_color_balancea_agressiveness(); descriptor_array[26] = _kds_s2000w_option_descriptor_image_border(); descriptor_array[27] = _kds_s2000w_option_descriptor_transport_handling(); descriptor_array[28] = _kds_s2000w_option_descriptor_jpeg_quality(); @@ -1120,7 +1120,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[39] = _kds_s2000w_option_descriptor_binarization_contrast(); descriptor_array[40] = _kds_s2000w_option_descriptor_color_sharpen(); descriptor_array[41] = _kds_s2000w_option_descriptor_post_scan_rotation(); - descriptor_array[42] = _kds_s2000w_option_descriptor_color_balancea_agressiveness(); + descriptor_array[42] = _kds_s2000w_option_descriptor_edge_fill(); descriptor_array[43] = _kds_s2000w_option_descriptor_color_balance_green(); descriptor_array[44] = _kds_s2000w_option_descriptor_config_reset(); } diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index 57c8040..89e278b 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -335,11 +335,11 @@ void sane_kds_s2000w_net_control_get_option_twentyfive_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, 25, SANE_ACTION_GET_VALUE, &value, NULL); - assert_string_equal(value, "Automatic"); + assert_int_equal(value, 0); kds_s2000w_handler_free(h); h = NULL; @@ -590,11 +590,11 @@ void sane_kds_s2000w_net_control_get_option_fourtytwo_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, 42, SANE_ACTION_GET_VALUE, &value, NULL); - assert_int_equal(value, 0); + assert_string_equal(value, "Automatic"); 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 6ed2876..456f60a 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -451,18 +451,17 @@ void kds_s2000w_option_get_descriptor_twentyfive_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(25); - assert_string_equal("edge-fill", option->name); - assert_string_equal("Edge Fill", option->title); - assert_string_equal("Edge Fill", option->desc); - assert_int_equal(SANE_TYPE_STRING, option->type); + assert_string_equal("color-balance-aggressiveness", option->name); + assert_string_equal("Color Balance Aggressiveness", option->title); + assert_string_equal("Color Balance Aggressiveness", 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*) * 4, 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("Automatic", option->constraint.string_list[1]); - assert_string_equal("AutomaticIncludeTears", option->constraint.string_list[2]); - assert_null(option->constraint.string_list[3]); + assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type); + assert_int_equal(-2, option->constraint.range->min); + assert_int_equal(2, option->constraint.range->max); + assert_int_equal(1, option->constraint.range->quant); } void kds_s2000w_option_get_descriptor_twentysix_test() @@ -749,17 +748,18 @@ void kds_s2000w_option_get_descriptor_fourtytwo_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(42); - assert_string_equal("colorbalanceaggressiveness", option->name); - assert_string_equal("colorbalanceaggressiveness", option->title); - assert_string_equal("colorbalanceaggressiveness", option->desc); - assert_int_equal(SANE_TYPE_INT, option->type); + assert_string_equal("edge-fill", option->name); + assert_string_equal("Edge Fill", option->title); + assert_string_equal("Edge Fill", 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*) * 4, 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(-2, option->constraint.range->min); - assert_int_equal(2, 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("Automatic", option->constraint.string_list[1]); + assert_string_equal("AutomaticIncludeTears", option->constraint.string_list[2]); + assert_null(option->constraint.string_list[3]); } void kds_s2000w_option_get_descriptor_fourtythree_test()