From: Bastian Dehn Date: Sun, 16 Feb 2025 20:23:46 +0000 (+0100) Subject: change image offset y position X-Git-Tag: v1.1.0^2~3^2~44 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=5de2812831172a7038a8e096530d4d5d4c1ec227;p=sane-kds-s2000w-net.git change image offset y position --- diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index b4d4c01..5f67822 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -171,8 +171,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 10: - value_object = json_object_object_get(config, "ColorAutoBrightnessMode"); - _kds_s2000w_handler_opts_write_string_value(value_object, value); + value_object = json_object_object_get(config, "ImageOffsetY"); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 11: value_object = json_object_object_get(config, "ColorSharpen"); @@ -287,8 +287,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 39: - value_object = json_object_object_get(config, "ImageOffsetY"); - _kds_s2000w_handler_opts_write_int_value(value_object, value); + value_object = json_object_object_get(config, "ColorAutoBrightnessMode"); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 40: value_object = json_object_object_get(config, "ImageWidth"); @@ -365,8 +365,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 10: - value_object = json_object_object_get(config, "ColorAutoBrightnessMode"); - _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); + value_object = json_object_object_get(config, "ImageOffsetY"); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 11: value_object = json_object_object_get(config, "ColorSharpen"); @@ -481,8 +481,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 39: - value_object = json_object_object_get(config, "ImageOffsetY"); - _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); + value_object = json_object_object_get(config, "ColorAutoBrightnessMode"); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 40: value_object = json_object_object_get(config, "ImageWidth"); diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index b9a4d52..192e9b2 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -1070,7 +1070,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[7] = _kds_s2000w_option_descriptor_cropping_mode(); 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_color_auto_brightness_mode(); + descriptor_array[10] = _kds_s2000w_option_descriptor_image_offset_y(); descriptor_array[11] = _kds_s2000w_option_descriptor_color_sharpen(); descriptor_array[12] = _kds_s2000w_option_descriptor_color_balance_mode(); descriptor_array[13] = _kds_s2000w_option_descriptor_color_balancea_agressiveness(); @@ -1099,7 +1099,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[36] = _kds_s2000w_option_descriptor_document_feeder_timeout(); 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_image_offset_y(); + descriptor_array[39] = _kds_s2000w_option_descriptor_color_auto_brightness_mode(); descriptor_array[40] = _kds_s2000w_option_descriptor_image_width(); descriptor_array[41] = _kds_s2000w_option_descriptor_image_height(); descriptor_array[42] = _kds_s2000w_option_descriptor_advanced_group(); diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index e93f261..db15c95 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -140,11 +140,11 @@ void sane_kds_s2000w_net_control_get_option_ten_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, 10, SANE_ACTION_GET_VALUE, &value, NULL); - assert_string_equal(value, "Automatic"); + assert_int_equal(value, 0); kds_s2000w_handler_free(h); h = NULL; @@ -575,11 +575,11 @@ void sane_kds_s2000w_net_control_get_option_thirdynine_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, 39, 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 4b7ebce..fc3a19e 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -191,18 +191,17 @@ void kds_s2000w_option_get_descriptor_ten_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(10); - assert_string_equal("colorautobrightnessmode", option->name); - assert_string_equal("colorautobrightnessmode", option->title); - assert_string_equal("colorautobrightnessmode", option->desc); - assert_int_equal(SANE_TYPE_STRING, option->type); + assert_string_equal("image-offset-y", option->name); + assert_string_equal("Image offset y", option->title); + assert_string_equal("Image offset y", 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("Manual", option->constraint.string_list[1]); - assert_string_equal("Automatic", option->constraint.string_list[2]); - assert_null(option->constraint.string_list[3]); + assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type); + assert_int_equal(option->constraint.range->min, 0); + assert_int_equal(option->constraint.range->max, 390); + assert_int_equal(option->constraint.range->quant, 1); } void kds_s2000w_option_get_descriptor_eleven_test() @@ -704,17 +703,18 @@ void kds_s2000w_option_get_descriptor_thirdynine_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(39); - assert_string_equal("image-offset-y", option->name); - assert_string_equal("Image offset y", option->title); - assert_string_equal("Image offset y", option->desc); - assert_int_equal(SANE_TYPE_INT, option->type); + assert_string_equal("colorautobrightnessmode", option->name); + assert_string_equal("colorautobrightnessmode", option->title); + assert_string_equal("colorautobrightnessmode", 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(option->constraint.range->min, 0); - assert_int_equal(option->constraint.range->max, 390); - 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_null(option->constraint.string_list[3]); } void kds_s2000w_option_get_descriptor_fourty_test()