From: Bastian Dehn Date: Mon, 17 Feb 2025 19:47:07 +0000 (+0100) Subject: change color balance blue position X-Git-Tag: v1.1.0^2~3^2~19 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=b9981706295fe07cacc71590e37b98fada17eaa4;p=sane-kds-s2000w-net.git change color balance blue position --- diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 13e6058..b868f7d 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -235,8 +235,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 28: - value_object = json_object_object_get(config, "JpegQuality"); - _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 29: value_object = json_object_object_get(config, "DocumentFeederTimeoutResponse"); @@ -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, "ColorBalanceBlue"); - _kds_s2000w_handler_opts_write_int_value(value_object, value); + value_object = json_object_object_get(config, "JpegQuality"); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 33: value_object = json_object_object_get(config, "SkipBlankPagesContent"); @@ -429,8 +429,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 28: - value_object = json_object_object_get(config, "JpegQuality"); - _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 29: value_object = json_object_object_get(config, "DocumentFeederTimeoutResponse"); @@ -445,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, "ColorBalanceBlue"); - _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); + value_object = json_object_object_get(config, "JpegQuality"); + _kds_s2000w_handler_opts_write_string_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 31f2f7c..518ba21 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -343,9 +343,9 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_color_balance_blue() constraint->quant = 1; SANE_Option_Descriptor descriptor = { - "colorbalanceblue", - "colorbalanceblue", - "colorbalanceblue", + "color-balance-blue", + "Color Balance Blue", + "Color Balance Blue", SANE_TYPE_INT, SANE_UNIT_NONE, sizeof(SANE_Int), @@ -1106,11 +1106,11 @@ void kds_s2000w_option_descriptors_init() descriptor_array[25] = _kds_s2000w_option_descriptor_color_balancea_agressiveness(); descriptor_array[26] = _kds_s2000w_option_descriptor_color_balance_red(); descriptor_array[27] = _kds_s2000w_option_descriptor_color_balance_green(); - descriptor_array[28] = _kds_s2000w_option_descriptor_jpeg_quality(); + descriptor_array[28] = _kds_s2000w_option_descriptor_color_balance_blue(); 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_balance_blue(); + descriptor_array[32] = _kds_s2000w_option_descriptor_jpeg_quality(); descriptor_array[33] = _kds_s2000w_option_descriptor_skip_blank_page_content(); descriptor_array[34] = _kds_s2000w_option_descriptor_multifeed_sensitivity(); 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 129a7e8..8de01e2 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -380,11 +380,11 @@ void sane_kds_s2000w_net_control_get_option_twentyeight_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, 28, SANE_ACTION_GET_VALUE, &value, NULL); - assert_string_equal(value, "Good"); + assert_int_equal(value, 0); kds_s2000w_handler_free(h); h = NULL; @@ -440,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); - int32_t value = -1; + char* value[50] = {0}; sane_kds_s2000w_net_control_option(h, 32, SANE_ACTION_GET_VALUE, &value, NULL); - assert_int_equal(value, 0); + assert_string_equal(value, "Good"); 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 5542cc7..67b5876 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -502,20 +502,17 @@ void kds_s2000w_option_get_descriptor_twentyeight_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(28); - assert_string_equal("jpeg-quality", option->name); - assert_string_equal("jpeg quality", option->title); - assert_string_equal("jpeg quality", option->desc); - assert_int_equal(SANE_TYPE_STRING, option->type); + assert_string_equal("color-balance-blue", option->name); + assert_string_equal("Color Balance Blue", option->title); + assert_string_equal("Color Balance Blue", 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*) * 6, 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("Draft", option->constraint.string_list[0]); - assert_string_equal("Good", option->constraint.string_list[1]); - assert_string_equal("Better", option->constraint.string_list[2]); - assert_string_equal("Best", option->constraint.string_list[3]); - assert_string_equal("Superior", option->constraint.string_list[4]); - assert_null(option->constraint.string_list[5]); + 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_twentynine_test() @@ -568,17 +565,20 @@ void kds_s2000w_option_get_descriptor_thirdytwo_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(32); - 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("jpeg-quality", option->name); + assert_string_equal("jpeg quality", option->title); + assert_string_equal("jpeg quality", 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*) * 6, 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("Draft", option->constraint.string_list[0]); + assert_string_equal("Good", option->constraint.string_list[1]); + assert_string_equal("Better", option->constraint.string_list[2]); + assert_string_equal("Best", option->constraint.string_list[3]); + assert_string_equal("Superior", option->constraint.string_list[4]); + assert_null(option->constraint.string_list[5]); } void kds_s2000w_option_get_descriptor_thirdythree_test()