From: Bastian Dehn Date: Mon, 17 Feb 2025 20:02:23 +0000 (+0100) Subject: change binarization contrast position X-Git-Tag: v1.1.0^2~3^2~17 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=a1c8d7a4838f1e5521dcc974b09b899b590d961f;p=sane-kds-s2000w-net.git change binarization contrast position --- diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 4cf18bd..c27193c 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -243,7 +243,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 30: - value_object = json_object_object_get(config, "HoleFill"); + value_object = json_object_object_get(config, "BinarizationContrast"); _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 31: @@ -279,7 +279,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 39: - value_object = json_object_object_get(config, "BinarizationContrast"); + value_object = json_object_object_get(config, "HoleFill"); _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 40: @@ -437,7 +437,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 30: - value_object = json_object_object_get(config, "HoleFill"); + value_object = json_object_object_get(config, "BinarizationContrast"); _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 31: @@ -473,7 +473,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 39: - value_object = json_object_object_get(config, "BinarizationContrast"); + value_object = json_object_object_get(config, "HoleFill"); _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 40: diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index d4bb27e..c8df9c7 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -465,9 +465,9 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_binarization_contrast() constraint->quant = 1; SANE_Option_Descriptor descriptor = { - SANE_NAME_CONTRAST, - SANE_TITLE_CONTRAST, - SANE_DESC_CONTRAST, + "binarization-contrast", + "Binarization Contrast", + "Binarization Contrast", SANE_TYPE_INT, SANE_UNIT_NONE, sizeof(SANE_Int), @@ -1108,7 +1108,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[27] = _kds_s2000w_option_descriptor_color_balance_green(); descriptor_array[28] = _kds_s2000w_option_descriptor_color_balance_blue(); descriptor_array[29] = _kds_s2000w_option_descriptor_color_sharpen(); - descriptor_array[30] = _kds_s2000w_option_descriptor_hole_fill(); + descriptor_array[30] = _kds_s2000w_option_descriptor_binarization_contrast(); descriptor_array[31] = _kds_s2000w_option_descriptor_skip_blank_pages(); descriptor_array[32] = _kds_s2000w_option_descriptor_jpeg_quality(); descriptor_array[33] = _kds_s2000w_option_descriptor_skip_blank_page_content(); @@ -1117,7 +1117,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[36] = _kds_s2000w_option_descriptor_document_feeder_timeout(); descriptor_array[37] = _kds_s2000w_option_descriptor_multifeed_response(); descriptor_array[38] = _kds_s2000w_option_descriptor_image_border(); - descriptor_array[39] = _kds_s2000w_option_descriptor_binarization_contrast(); + descriptor_array[39] = _kds_s2000w_option_descriptor_hole_fill(); descriptor_array[40] = _kds_s2000w_option_descriptor_document_feeder_timeout_response(); descriptor_array[41] = _kds_s2000w_option_descriptor_post_scan_rotation(); descriptor_array[42] = _kds_s2000w_option_descriptor_edge_fill(); diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index 5c107b7..da03d06 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -410,7 +410,7 @@ void sane_kds_s2000w_net_control_get_option_thirdy_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; + int32_t value = -1; sane_kds_s2000w_net_control_option(h, 30, SANE_ACTION_GET_VALUE, &value, NULL); @@ -545,7 +545,7 @@ 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); - int32_t value = -1; + uint32_t value = -1; sane_kds_s2000w_net_control_option(h, 39, SANE_ACTION_GET_VALUE, &value, NULL); diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c index 6d69130..0266652 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -538,14 +538,17 @@ void kds_s2000w_option_get_descriptor_thirdy_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(30); - assert_string_equal("hole-fill", option->name); - assert_string_equal("Hole Fill", option->title); - assert_string_equal("Hole Fill", option->desc); - assert_int_equal(SANE_TYPE_BOOL, option->type); + assert_string_equal("binarization-contrast", option->name); + assert_string_equal("Binarization Contrast", option->title); + assert_string_equal("Binarization Contrast", option->desc); + assert_int_equal(SANE_TYPE_INT, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(sizeof(SANE_Bool), 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_NONE, option->constraint_type); + 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(1, option->constraint.range->quant); } void kds_s2000w_option_get_descriptor_thirdyone_test() @@ -691,19 +694,17 @@ void kds_s2000w_option_get_descriptor_thirdynine_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(39); - assert_string_equal(SANE_NAME_CONTRAST, option->name); - assert_string_equal(SANE_TITLE_CONTRAST, option->title); - assert_string_equal(SANE_DESC_CONTRAST, option->desc); - assert_int_equal(SANE_TYPE_INT, option->type); + assert_string_equal("hole-fill", option->name); + assert_string_equal("Hole Fill", option->title); + assert_string_equal("Hole Fill", option->desc); + assert_int_equal(SANE_TYPE_BOOL, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(sizeof(SANE_Int), option->size); + assert_int_equal(sizeof(SANE_Bool), 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(1, option->constraint.range->quant); + assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type); } + void kds_s2000w_option_get_descriptor_fourty_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(40);