From: Bastian Dehn Date: Sun, 16 Feb 2025 20:27:44 +0000 (+0100) Subject: change image width position X-Git-Tag: v1.1.0^2~3^2~43 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=dab4c5e28ba72340b3a50d9d476f30951fe7d850;p=sane-kds-s2000w-net.git change image width position --- diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 5f67822..3956d5e 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -175,8 +175,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 11: - value_object = json_object_object_get(config, "ColorSharpen"); - _kds_s2000w_handler_opts_write_string_value(value_object, value); + value_object = json_object_object_get(config, "ImageWidth"); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 12: value_object = json_object_object_get(config, "ColorBalanceMode"); @@ -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 40: - value_object = json_object_object_get(config, "ImageWidth"); - _kds_s2000w_handler_opts_write_int_value(value_object, value); + value_object = json_object_object_get(config, "ColorSharpen"); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 41: value_object = json_object_object_get(config, "ImageHeight"); @@ -369,8 +369,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 11: - value_object = json_object_object_get(config, "ColorSharpen"); - _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); + value_object = json_object_object_get(config, "ImageWidth"); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 12: value_object = json_object_object_get(config, "ColorBalanceMode"); @@ -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 40: - value_object = json_object_object_get(config, "ImageWidth"); - _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); + value_object = json_object_object_get(config, "ColorSharpen"); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 41: value_object = json_object_object_get(config, "ImageHeight"); diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index 192e9b2..f8acc0c 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -1071,7 +1071,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[8] = _kds_s2000w_option_descriptor_cropping_image(); descriptor_array[9] = _kds_s2000w_option_descriptor_image_offset_x(); descriptor_array[10] = _kds_s2000w_option_descriptor_image_offset_y(); - descriptor_array[11] = _kds_s2000w_option_descriptor_color_sharpen(); + descriptor_array[11] = _kds_s2000w_option_descriptor_image_width(); descriptor_array[12] = _kds_s2000w_option_descriptor_color_balance_mode(); descriptor_array[13] = _kds_s2000w_option_descriptor_color_balancea_agressiveness(); descriptor_array[14] = _kds_s2000w_option_descriptor_color_balance_red(); @@ -1100,7 +1100,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[37] = _kds_s2000w_option_descriptor_color_contrast(); descriptor_array[38] = _kds_s2000w_option_descriptor_color_drop_out_aggressiveness(); descriptor_array[39] = _kds_s2000w_option_descriptor_color_auto_brightness_mode(); - descriptor_array[40] = _kds_s2000w_option_descriptor_image_width(); + descriptor_array[40] = _kds_s2000w_option_descriptor_color_sharpen(); descriptor_array[41] = _kds_s2000w_option_descriptor_image_height(); descriptor_array[42] = _kds_s2000w_option_descriptor_advanced_group(); descriptor_array[43] = _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 db15c95..af0a264 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -155,11 +155,11 @@ void sane_kds_s2000w_net_control_get_option_eleven_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, 11, SANE_ACTION_GET_VALUE, &value, NULL); - assert_string_equal(value, "Normal"); + assert_int_equal(value, 10); kds_s2000w_handler_free(h); h = NULL; @@ -590,11 +590,11 @@ void sane_kds_s2000w_net_control_get_option_fourty_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, 40, SANE_ACTION_GET_VALUE, &value, NULL); - assert_int_equal(value, 10); + assert_string_equal(value, "Normal"); 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 fc3a19e..c5a5fbb 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -208,19 +208,17 @@ void kds_s2000w_option_get_descriptor_eleven_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(11); - assert_string_equal("color-sharpen", option->name); - assert_string_equal("color sharpen", option->title); - assert_string_equal("color sharpen", option->desc); - assert_int_equal(SANE_TYPE_STRING, option->type); + assert_string_equal("image-width", option->name); + assert_string_equal("Image width", option->title); + assert_string_equal("Image width", 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*) * 5, 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("Normal", option->constraint.string_list[1]); - assert_string_equal("High", option->constraint.string_list[2]); - assert_string_equal("Exaggerated", option->constraint.string_list[3]); - assert_null(option->constraint.string_list[4]); + assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type); + assert_int_equal(option->constraint.range->min, 10); + assert_int_equal(option->constraint.range->max, 85); + assert_int_equal(option->constraint.range->quant, 1); } void kds_s2000w_option_get_descriptor_twelve_test() @@ -721,17 +719,19 @@ void kds_s2000w_option_get_descriptor_fourty_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(40); - assert_string_equal("image-width", option->name); - assert_string_equal("Image width", option->title); - assert_string_equal("Image width", option->desc); - assert_int_equal(SANE_TYPE_INT, option->type); + assert_string_equal("color-sharpen", option->name); + assert_string_equal("color sharpen", option->title); + assert_string_equal("color sharpen", 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*) * 5, 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, 10); - assert_int_equal(option->constraint.range->max, 85); - assert_int_equal(option->constraint.range->quant, 1); + assert_int_equal(SANE_CONSTRAINT_STRING_LIST, option->constraint_type); + assert_string_equal("None", option->constraint.string_list[0]); + assert_string_equal("Normal", option->constraint.string_list[1]); + assert_string_equal("High", option->constraint.string_list[2]); + assert_string_equal("Exaggerated", option->constraint.string_list[3]); + assert_null(option->constraint.string_list[4]); } void kds_s2000w_option_get_descriptor_fourtyone_test()