change color sharpen position

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index b868f7d60471ad2025c34974b1c1a96a94423d07..4cf18bd64561b3d12b85cfe2dbfe252173bba598 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -239,7 +239,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 29:
-                       value_object = json_object_object_get(config, "DocumentFeederTimeoutResponse");
+                       value_object = json_object_object_get(config, "ColorSharpen");
                        _kds_s2000w_handler_opts_write_string_value(value_object, value);
                        break;
                case 30:
@@ -283,7 +283,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 40:
-                       value_object = json_object_object_get(config, "ColorSharpen");
+                       value_object = json_object_object_get(config, "DocumentFeederTimeoutResponse");
                        _kds_s2000w_handler_opts_write_string_value(value_object, value);
                        break;
                case 41:
@@ -433,7 +433,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 29:
-                       value_object = json_object_object_get(config, "DocumentFeederTimeoutResponse");
+                       value_object = json_object_object_get(config, "ColorSharpen");
                        _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
                        break;
                case 30:
@@ -477,7 +477,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 40:
-                       value_object = json_object_object_get(config, "ColorSharpen");
+                       value_object = json_object_object_get(config, "DocumentFeederTimeoutResponse");
                        _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
                        break;
                case 41:

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 518ba218c84427a9b4d957b2f9345e3cfc5baf28..d4bb27e93a0fb4eb188ada53d48ad50cf2795f5b 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -535,8 +535,8 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_color_sharpen()
 
        SANE_Option_Descriptor descriptor = {
                "color-sharpen",
-               "color sharpen",
-               "color sharpen",
+               "Color Sharpen",
+               "Color Sharpen",
                SANE_TYPE_STRING,
                SANE_UNIT_NONE,
                sizeof(SANE_String_Const*) * 5,
@@ -1107,7 +1107,7 @@ void kds_s2000w_option_descriptors_init()
        descriptor_array[26] = _kds_s2000w_option_descriptor_color_balance_red();
        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_document_feeder_timeout_response();
+       descriptor_array[29] = _kds_s2000w_option_descriptor_color_sharpen();
        descriptor_array[30] = _kds_s2000w_option_descriptor_hole_fill();
        descriptor_array[31] = _kds_s2000w_option_descriptor_skip_blank_pages();
        descriptor_array[32] = _kds_s2000w_option_descriptor_jpeg_quality();
@@ -1118,7 +1118,7 @@ void kds_s2000w_option_descriptors_init()
        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[40] = _kds_s2000w_option_descriptor_color_sharpen();
+       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();
        descriptor_array[43] = _kds_s2000w_option_descriptor_transport_handling();

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index 8de01e275f8ecbe37115934fd0a257fc2c7f5612..5c107b794c3858823eeb1126d204cfcea12dba00 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -395,11 +395,11 @@ void sane_kds_s2000w_net_control_get_option_twentynine_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};
+       char value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 29, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_string_equal(value, "Stop");
+       assert_string_equal(value, "Normal");
 
        kds_s2000w_handler_free(h);
        h = NULL;
@@ -560,11 +560,11 @@ void sane_kds_s2000w_net_control_get_option_fourty_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};
+       char* value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 40, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_string_equal(value, "Normal");
+       assert_string_equal(value, "Stop");
 
        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 67b5876addd8331d4796f640a7b6994623da4959..6d691303e7c8ef622e8a49b5f5c48a7f95dc4f0f 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -519,18 +519,19 @@ void kds_s2000w_option_get_descriptor_twentynine_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(29);
 
-       assert_string_equal("document-feeder-timeout-response", option->name);
-       assert_string_equal("Document feeder timeout respone", option->title);
-       assert_string_equal("Document feeder timeout respone", option->desc);
+       assert_string_equal("color-sharpen", option->name);
+       assert_string_equal("Color Sharpen", option->title);
+       assert_string_equal("Color Sharpen", 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*) * 4, option->size);
+       assert_int_equal(sizeof(SANE_String_Const*) * 5,  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("Stop", option->constraint.string_list[0]);
-       assert_string_equal("Pause", option->constraint.string_list[1]);
-       assert_string_equal("PauseAndWait", option->constraint.string_list[2]);
-       assert_null(option->constraint.string_list[3]);
+       assert_string_equal("None", option->constraint.string_list[0]);
+       assert_string_equal("Normal", option->constraint.string_list[1]);
+       assert_string_equal("High", option->constraint.string_list[2]);
+       assert_string_equal("Exaggerated", option->constraint.string_list[3]);
+       assert_null(option->constraint.string_list[4]);
 }
 
 void kds_s2000w_option_get_descriptor_thirdy_test()
@@ -707,19 +708,18 @@ void kds_s2000w_option_get_descriptor_fourty_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(40);
 
-       assert_string_equal("color-sharpen", option->name);
-       assert_string_equal("color sharpen", option->title);
-       assert_string_equal("color sharpen", option->desc);
+       assert_string_equal("document-feeder-timeout-response", option->name);
+       assert_string_equal("Document feeder timeout respone", option->title);
+       assert_string_equal("Document feeder timeout respone", 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*) * 5,  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_STRING_LIST, option->constraint_type);
-       assert_string_equal("None", option->constraint.string_list[0]);
-       assert_string_equal("Normal", option->constraint.string_list[1]);
-       assert_string_equal("High", option->constraint.string_list[2]);
-       assert_string_equal("Exaggerated", option->constraint.string_list[3]);
-       assert_null(option->constraint.string_list[4]);
+       assert_string_equal("Stop", option->constraint.string_list[0]);
+       assert_string_equal("Pause", option->constraint.string_list[1]);
+       assert_string_equal("PauseAndWait", option->constraint.string_list[2]);
+       assert_null(option->constraint.string_list[3]);
 }
 
 void kds_s2000w_option_get_descriptor_fourtyone_test()