From: Bastian Dehn Date: Tue, 18 Feb 2025 16:42:22 +0000 (+0100) Subject: change position jpeg quality X-Git-Tag: v1.1.0^2~3^2~5 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=1f8075e89fcb209eb448922683d7a5f44ba2cf8a;p=sane-kds-s2000w-net.git change position jpeg quality --- diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index d3175ed..3628426 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -271,8 +271,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 39: - value_object = json_object_object_get(config, "MaxDocumentLength"); - _kds_s2000w_handler_opts_write_int_value(value_object, value); + value_object = json_object_object_get(config, "JpegQuality"); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 40: value_object = json_object_object_get(config, "DocumentFeederTimeoutResponse"); @@ -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 45: - value_object = json_object_object_get(config, "JpegQuality"); - _kds_s2000w_handler_opts_write_string_value(value_object, value); + value_object = json_object_object_get(config, "MaxDocumentLength"); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; default: break; @@ -476,8 +476,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 39: - value_object = json_object_object_get(config, "MaxDocumentLength"); - _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); + value_object = json_object_object_get(config, "JpegQuality"); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 40: value_object = json_object_object_get(config, "DocumentFeederTimeoutResponse"); @@ -500,8 +500,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 45: - value_object = json_object_object_get(config, "JpegQuality"); - _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); + value_object = json_object_object_get(config, "MaxDocumentLength"); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; default: break; diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index f188198..2b59625 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -715,8 +715,8 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_jpeg_quality() SANE_Option_Descriptor descriptor = { "jpeg-quality", - "jpeg quality", - "jpeg quality", + "Jpeg Quality", + "Jpeg Quality", SANE_TYPE_STRING, SANE_UNIT_NONE, sizeof(SANE_String_Const*) * 6, @@ -1135,13 +1135,13 @@ void kds_s2000w_option_descriptors_init() descriptor_array[36] = _kds_s2000w_option_descriptor_post_scan_rotation(); descriptor_array[37] = _kds_s2000w_option_descriptor_edge_fill(); descriptor_array[38] = _kds_s2000w_option_descriptor_image_border(); - descriptor_array[39] = _kds_s2000w_option_descriptor_max_document_length(); + descriptor_array[39] = _kds_s2000w_option_descriptor_jpeg_quality(); descriptor_array[40] = _kds_s2000w_option_descriptor_document_feeder_timeout_response(); descriptor_array[41] = _kds_s2000w_option_descriptor_document_feeder_timeout(); descriptor_array[42] = _kds_s2000w_option_descriptor_multifeed_response(); descriptor_array[43] = _kds_s2000w_option_descriptor_transport_handling(); descriptor_array[44] = _kds_s2000w_option_descriptor_multifeed_sensitivity(); - descriptor_array[45] = _kds_s2000w_option_descriptor_jpeg_quality(); + descriptor_array[45] = _kds_s2000w_option_descriptor_max_document_length(); } void kds_s2000w_option_descriptors_free() diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index 4737a08..0b837fc 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -515,11 +515,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, 140); + assert_string_equal(value, "Good"); kds_s2000w_handler_free(h); h = NULL; @@ -605,11 +605,11 @@ void sane_kds_s2000w_net_control_get_option_fourtyfive_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, 45, SANE_ACTION_GET_VALUE, &value, NULL); - assert_string_equal(value, "Good"); + assert_int_equal(value, 140); 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 292b405..470e923 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -684,17 +684,20 @@ void kds_s2000w_option_get_descriptor_thirdynine_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(39); - assert_string_equal("max-document-length", option->name); - assert_string_equal("Max document length", option->title); - assert_string_equal("Max document length", option->desc); - assert_int_equal(SANE_TYPE_INT, option->type); + assert_string_equal("jpeg-quality", option->name); + assert_string_equal("Jpeg Quality", option->title); + assert_string_equal("Jpeg Quality", 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*) * 6, option->size); assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED, option->cap); - assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type); - assert_int_equal(option->constraint.range->min, 25); - 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("Draft", option->constraint.string_list[0]); + assert_string_equal("Good", option->constraint.string_list[1]); + assert_string_equal("Better", option->constraint.string_list[2]); + assert_string_equal("Best", option->constraint.string_list[3]); + assert_string_equal("Superior", option->constraint.string_list[4]); + assert_null(option->constraint.string_list[5]); } void kds_s2000w_option_get_descriptor_fourty_test() @@ -791,20 +794,17 @@ void kds_s2000w_option_get_descriptor_fourtyfive_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(45); - assert_string_equal("jpeg-quality", option->name); - assert_string_equal("jpeg quality", option->title); - assert_string_equal("jpeg quality", option->desc); - assert_int_equal(SANE_TYPE_STRING, option->type); + assert_string_equal("max-document-length", option->name); + assert_string_equal("Max document length", option->title); + assert_string_equal("Max document length", 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*) * 6, option->size); + assert_int_equal(sizeof(SANE_Int), option->size); assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED, option->cap); - assert_int_equal(SANE_CONSTRAINT_STRING_LIST, option->constraint_type); - assert_string_equal("Draft", option->constraint.string_list[0]); - assert_string_equal("Good", option->constraint.string_list[1]); - assert_string_equal("Better", option->constraint.string_list[2]); - assert_string_equal("Best", option->constraint.string_list[3]); - assert_string_equal("Superior", option->constraint.string_list[4]); - assert_null(option->constraint.string_list[5]); + assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type); + assert_int_equal(option->constraint.range->min, 25); + assert_int_equal(option->constraint.range->max, 400); + assert_int_equal(option->constraint.range->quant, 1); } void kds_s2000w_option_get_descriptor_get_by_name_test()