From: Bastian Dehn Date: Mon, 17 Feb 2025 15:35:11 +0000 (+0100) Subject: change foreground boldness aggressiveness position X-Git-Tag: v1.1.0^2~3^2~36 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=3322383779ae6b61462fa6cd638ac6bc3f8d1a2d;p=sane-kds-s2000w-net.git change foreground boldness aggressiveness position --- diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index a9cca04..351b011 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -187,7 +187,7 @@ 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 15: - value_object = json_object_object_get(config, "ColorBalanceGreen"); + value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness"); _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 16: @@ -199,7 +199,7 @@ 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 18: - value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness"); + value_object = json_object_object_get(config, "ColorBalanceGreen"); _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 19: @@ -381,7 +381,7 @@ 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 15: - value_object = json_object_object_get(config, "ColorBalanceGreen"); + value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness"); _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 16: @@ -393,7 +393,7 @@ 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 18: - value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness"); + value_object = json_object_object_get(config, "ColorBalanceGreen"); _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 19: diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index bfa3f90..cac54fd 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -1075,10 +1075,10 @@ void kds_s2000w_option_descriptors_init() descriptor_array[12] = _kds_s2000w_option_descriptor_image_height(); descriptor_array[13] = _kds_s2000w_option_descriptor_boldness_smoothing_group(); descriptor_array[14] = _kds_s2000w_option_descriptor_foreground_boldness_mode(); - descriptor_array[15] = _kds_s2000w_option_descriptor_color_balance_green(); + descriptor_array[15] = _kds_s2000w_option_descriptor_foreground_boldness_aggressiveness(); descriptor_array[16] = _kds_s2000w_option_descriptor_color_balance_blue(); descriptor_array[17] = _kds_s2000w_option_descriptor_color_balance_red(); - descriptor_array[18] = _kds_s2000w_option_descriptor_foreground_boldness_aggressiveness(); + descriptor_array[18] = _kds_s2000w_option_descriptor_color_balance_green(); descriptor_array[19] = _kds_s2000w_option_descriptor_background_smoothing_mode(); descriptor_array[20] = _kds_s2000w_option_descriptor_background_smoothing_aggressiveness(); descriptor_array[21] = _kds_s2000w_option_descriptor_binarization_contrast(); diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c index de7a1ad..af511fb 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -274,16 +274,16 @@ void kds_s2000w_option_get_descriptor_fifteen_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(15); - assert_string_equal("colorbalancegreen", option->name); - assert_string_equal("colorbalancegreen", option->title); - assert_string_equal("colorbalancegreen", option->desc); + assert_string_equal("foreground-boldness-aggressiveness", option->name); + assert_string_equal("Foreground Boldness Aggressiveness", option->title); + assert_string_equal("Foreground Boldness Aggressiveness", option->desc); assert_int_equal(SANE_TYPE_INT, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(sizeof(SANE_Int), 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_RANGE, option->constraint_type); - assert_int_equal(-50, option->constraint.range->min); - assert_int_equal(50, option->constraint.range->max); + assert_int_equal(-10, option->constraint.range->min); + assert_int_equal(10, option->constraint.range->max); assert_int_equal(1, option->constraint.range->quant); } @@ -325,16 +325,16 @@ void kds_s2000w_option_get_descriptor_eightteen_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(18); - assert_string_equal("foreground-boldness-aggressiveness", option->name); - assert_string_equal("Foreground Boldness Aggressiveness", option->title); - assert_string_equal("Foreground Boldness Aggressiveness", option->desc); + assert_string_equal("colorbalancegreen", option->name); + assert_string_equal("colorbalancegreen", option->title); + assert_string_equal("colorbalancegreen", option->desc); assert_int_equal(SANE_TYPE_INT, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(sizeof(SANE_Int), 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_RANGE, option->constraint_type); - assert_int_equal(-10, option->constraint.range->min); - assert_int_equal(10, option->constraint.range->max); + assert_int_equal(-50, option->constraint.range->min); + assert_int_equal(50, option->constraint.range->max); assert_int_equal(1, option->constraint.range->quant); }