From: Bastian Dehn Date: Sun, 16 Feb 2025 20:31:49 +0000 (+0100) Subject: change image height position X-Git-Tag: v1.1.0^2~3^2~42 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=c38d3360166204cc67cdffeb017677e7538dd638;p=sane-kds-s2000w-net.git change image height position --- diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 3956d5e..d607e4b 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -179,8 +179,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 12: - value_object = json_object_object_get(config, "ColorBalanceMode"); - _kds_s2000w_handler_opts_write_string_value(value_object, value); + value_object = json_object_object_get(config, "ImageHeight"); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 13: value_object = json_object_object_get(config, "ColorBalanceAggressiveness"); @@ -295,8 +295,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 41: - value_object = json_object_object_get(config, "ImageHeight"); - _kds_s2000w_handler_opts_write_int_value(value_object, value); + value_object = json_object_object_get(config, "ColorBalanceMode"); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; default: break; @@ -373,8 +373,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 12: - value_object = json_object_object_get(config, "ColorBalanceMode"); - _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); + value_object = json_object_object_get(config, "ImageHeight"); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 13: value_object = json_object_object_get(config, "ColorBalanceAggressiveness"); @@ -489,8 +489,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 41: - value_object = json_object_object_get(config, "ImageHeight"); - _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); + value_object = json_object_object_get(config, "ColorBalanceMode"); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 43: _kds_s2000w_handler_opts_set_option_to_default(h); diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index f8acc0c..cbea3f3 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -1072,7 +1072,7 @@ void kds_s2000w_option_descriptors_init() 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_image_width(); - descriptor_array[12] = _kds_s2000w_option_descriptor_color_balance_mode(); + descriptor_array[12] = _kds_s2000w_option_descriptor_image_height(); descriptor_array[13] = _kds_s2000w_option_descriptor_color_balancea_agressiveness(); descriptor_array[14] = _kds_s2000w_option_descriptor_color_balance_red(); descriptor_array[15] = _kds_s2000w_option_descriptor_color_balance_green(); @@ -1101,7 +1101,7 @@ void kds_s2000w_option_descriptors_init() 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_color_sharpen(); - descriptor_array[41] = _kds_s2000w_option_descriptor_image_height(); + descriptor_array[41] = _kds_s2000w_option_descriptor_color_balance_mode(); 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 af0a264..59d844e 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -170,11 +170,11 @@ void sane_kds_s2000w_net_control_get_option_twelve_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, 12, SANE_ACTION_GET_VALUE, &value, NULL); - assert_string_equal(value, "Automatic"); + assert_int_equal(value, 10); kds_s2000w_handler_free(h); h = NULL; @@ -605,11 +605,11 @@ void sane_kds_s2000w_net_control_get_option_fourtyone_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, 41, SANE_ACTION_GET_VALUE, &value, NULL); - assert_int_equal(value, 10); + 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 c5a5fbb..86167d2 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -225,19 +225,17 @@ void kds_s2000w_option_get_descriptor_twelve_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(12); - assert_string_equal("colorbalancemode", option->name); - assert_string_equal("colorbalancemode", option->title); - assert_string_equal("colorbalancemode", option->desc); - assert_int_equal(SANE_TYPE_STRING, option->type); + assert_string_equal("image-height", option->name); + assert_string_equal("Image height", option->title); + assert_string_equal("Image height", 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("Manual", option->constraint.string_list[1]); - assert_string_equal("Automatic", option->constraint.string_list[2]); - assert_string_equal("AutomaticAdvanced", 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, 400); + assert_int_equal(option->constraint.range->quant, 1); } void kds_s2000w_option_get_descriptor_thirdteen_test() @@ -738,17 +736,19 @@ void kds_s2000w_option_get_descriptor_fourtyone_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(41); - assert_string_equal("image-height", option->name); - assert_string_equal("Image height", option->title); - assert_string_equal("Image height", option->desc); - assert_int_equal(SANE_TYPE_INT, option->type); + assert_string_equal("colorbalancemode", option->name); + assert_string_equal("colorbalancemode", option->title); + assert_string_equal("colorbalancemode", 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, 400); - 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("Manual", option->constraint.string_list[1]); + assert_string_equal("Automatic", option->constraint.string_list[2]); + assert_string_equal("AutomaticAdvanced", option->constraint.string_list[3]); + assert_null(option->constraint.string_list[4]); } void kds_s2000w_option_get_descriptor_fourtytwo_test()