From: Bastian Dehn Date: Mon, 17 Feb 2025 18:58:08 +0000 (+0100) Subject: change color drop out aggressiviness position X-Git-Tag: v1.1.0^2~3^2~27 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=1308cff04500cbfffb8e938d2daef92068047862;p=sane-kds-s2000w-net.git change color drop out aggressiviness position --- diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index fa3fd38..507b5b7 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -203,7 +203,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 20: - value_object = json_object_object_get(config, "ColorBalanceRed"); + value_object = json_object_object_get(config, "ColorDropOutAggressiveness"); _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 21: @@ -275,7 +275,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 38: - value_object = json_object_object_get(config, "ColorDropOutAggressiveness"); + value_object = json_object_object_get(config, "ColorBalanceRed"); _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 39: @@ -397,7 +397,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 20: - value_object = json_object_object_get(config, "ColorBalanceRed"); + value_object = json_object_object_get(config, "ColorDropOutAggressiveness"); _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 21: @@ -469,7 +469,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 38: - value_object = json_object_object_get(config, "ColorDropOutAggressiveness"); + value_object = json_object_object_get(config, "ColorBalanceRed"); _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 39: diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index 06ee4e8..d968cde 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -172,9 +172,9 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_color_drop() constraint[8] = NULL; SANE_Option_Descriptor descriptor = { - "color-drop", - "Color Drop", - "Color Drop", + "color-drop-out", + "Color Drop Out", + "Color Drop Out", SANE_TYPE_STRING, SANE_UNIT_NONE, sizeof(SANE_String_Const*) * 9, @@ -196,9 +196,9 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_color_drop_out_aggressivene constraint->quant = 1; SANE_Option_Descriptor descriptor = { - "colordropoutaggressiveness", - "colordropoutaggressiveness", - "colordropoutaggressiveness", + "color-drop-out-aggressiveness", + "Color Drop Out Aggressiveness", + "Color Drop Out Aggressiveness", SANE_TYPE_INT, SANE_UNIT_NONE, sizeof(SANE_Int), @@ -1098,7 +1098,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[17] = _kds_s2000w_option_descriptor_background_smoothing_aggressiveness(); descriptor_array[18] = _kds_s2000w_option_descriptor_boldness_color_group(); descriptor_array[19] = _kds_s2000w_option_descriptor_color_drop(); - descriptor_array[20] = _kds_s2000w_option_descriptor_color_balance_red(); + descriptor_array[20] = _kds_s2000w_option_descriptor_color_drop_out_aggressiveness(); descriptor_array[21] = _kds_s2000w_option_descriptor_binarization_contrast(); descriptor_array[22] = _kds_s2000w_option_descriptor_multifeed_sensitivity(); descriptor_array[23] = _kds_s2000w_option_descriptor_multifeed_response(); @@ -1116,7 +1116,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[35] = _kds_s2000w_option_descriptor_max_document_length(); 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[38] = _kds_s2000w_option_descriptor_color_balance_red(); 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_color_balance_mode(); diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c index b88164a..d53b257 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -340,9 +340,9 @@ void kds_s2000w_option_get_descriptor_nineteen_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(19); - assert_string_equal("color-drop", option->name); - assert_string_equal("Color Drop", option->title); - assert_string_equal("Color Drop", option->desc); + assert_string_equal("color-drop-out", option->name); + assert_string_equal("Color Drop Out", option->title); + assert_string_equal("Color Drop Out", option->desc); assert_int_equal(SANE_TYPE_STRING, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); assert_int_equal(sizeof(SANE_String_Const*) * 9, option->size); @@ -363,16 +363,16 @@ void kds_s2000w_option_get_descriptor_twenty_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(20); - assert_string_equal("colorbalancered", option->name); - assert_string_equal("colorbalancered", option->title); - assert_string_equal("colorbalancered", option->desc); + assert_string_equal("color-drop-out-aggressiveness", option->name); + assert_string_equal("Color Drop Out Aggressiveness", option->title); + assert_string_equal("Color Drop Out 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(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); } @@ -676,16 +676,16 @@ void kds_s2000w_option_get_descriptor_thirdyeight_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(38); - assert_string_equal("colordropoutaggressiveness", option->name); - assert_string_equal("colordropoutaggressiveness", option->title); - assert_string_equal("colordropoutaggressiveness", option->desc); + assert_string_equal("colorbalancered", option->name); + assert_string_equal("colorbalancered", option->title); + assert_string_equal("colorbalancered", 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(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); }