change color balance mode position

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 47b2601a3ceb2d33132d706ced5f0d56d1646577..9ce252265eced1f6af8d57d2afd94f4a0b19f06d 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -219,7 +219,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 24:
-                       value_object = json_object_object_get(config, "PostScanRotation");
+                       value_object = json_object_object_get(config, "ColorBalanceMode");
                        _kds_s2000w_handler_opts_write_string_value(value_object, value);
                        break;
                case 25:
@@ -287,7 +287,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 41:
-                       value_object = json_object_object_get(config, "ColorBalanceMode");
+                       value_object = json_object_object_get(config, "PostScanRotation");
                        _kds_s2000w_handler_opts_write_string_value(value_object, value);
                        break;
                case 42:
@@ -413,7 +413,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 24:
-                       value_object = json_object_object_get(config, "PostScanRotation");
+                       value_object = json_object_object_get(config, "ColorBalanceMode");
                        _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
                        break;
                case 25:
@@ -481,7 +481,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 41:
-                       value_object = json_object_object_get(config, "ColorBalanceMode");
+                       value_object = json_object_object_get(config, "PostScanRotation");
                        _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
                        break;
                case 42:

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index abfc425208355b3e61e4ae13480ee3889c558892..2b7ca3b5a5d0c9ad3a9a84934d0e26daec2bdce2 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -247,9 +247,9 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_color_balance_mode()
        constraint[4] = NULL;
 
        SANE_Option_Descriptor descriptor = {
-               "colorbalancemode",
-               "colorbalancemode",
-               "colorbalancemode",
+               "color-balance-mode",
+               "Color Balance Mode",
+               "Color Balance Mode",
                SANE_TYPE_STRING,
                SANE_UNIT_NONE,
                sizeof(SANE_String_Const*) * 5,
@@ -1102,7 +1102,7 @@ void kds_s2000w_option_descriptors_init()
        descriptor_array[21] = _kds_s2000w_option_descriptor_color_auto_brightness_mode();
        descriptor_array[22] = _kds_s2000w_option_descriptor_color_brightness();
        descriptor_array[23] = _kds_s2000w_option_descriptor_color_contrast();
-       descriptor_array[24] = _kds_s2000w_option_descriptor_post_scan_rotation();
+       descriptor_array[24] = _kds_s2000w_option_descriptor_color_balance_mode();
        descriptor_array[25] = _kds_s2000w_option_descriptor_edge_fill();
        descriptor_array[26] = _kds_s2000w_option_descriptor_image_border();
        descriptor_array[27] = _kds_s2000w_option_descriptor_transport_handling();
@@ -1119,7 +1119,7 @@ void kds_s2000w_option_descriptors_init()
        descriptor_array[38] = _kds_s2000w_option_descriptor_color_balance_red();
        descriptor_array[39] = _kds_s2000w_option_descriptor_binarization_contrast();
        descriptor_array[40] = _kds_s2000w_option_descriptor_color_sharpen();
-       descriptor_array[41] = _kds_s2000w_option_descriptor_color_balance_mode();
+       descriptor_array[41] = _kds_s2000w_option_descriptor_post_scan_rotation();
        descriptor_array[42] = _kds_s2000w_option_descriptor_color_balancea_agressiveness();
        descriptor_array[43] = _kds_s2000w_option_descriptor_color_balance_green();
        descriptor_array[44] = _kds_s2000w_option_descriptor_config_reset();

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index 3d735e36c9657ee918034e47c12300be8d0ff020..57c80406c1ebf5dd6d3a251712570c22282ebde9 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -320,7 +320,7 @@ void sane_kds_s2000w_net_control_get_option_twentyfour_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, 24, SANE_ACTION_GET_VALUE, &value, NULL);
 
@@ -575,7 +575,7 @@ void sane_kds_s2000w_net_control_get_option_fourtyone_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, 41, 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 f786e27c44d9e911fd76e87d8fc9045eae1c0758..6ed2876044928465043f44f2c5ee30211a64a5b4 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -432,20 +432,19 @@ void kds_s2000w_option_get_descriptor_twentyfour_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(24);
 
-       assert_string_equal("post-scan-rotation", option->name);
-       assert_string_equal("Post Scan Rotation", option->title);
-       assert_string_equal("Post Scan Rotation", option->desc);
+       assert_string_equal("color-balance-mode", option->name);
+       assert_string_equal("Color Balance Mode", option->title);
+       assert_string_equal("Color Balance Mode", 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*) * 6, 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("None", option->constraint.string_list[0]);
-       assert_string_equal("Automatic", option->constraint.string_list[1]);
-       assert_string_equal("Automatic90", option->constraint.string_list[2]);
-       assert_string_equal("Automatic180", option->constraint.string_list[3]);
-       assert_string_equal("Automatic270", option->constraint.string_list[4]);
-       assert_null(option->constraint.string_list[5]);
+       assert_string_equal("Manual", option->constraint.string_list[1]);
+       assert_string_equal("Automatic", option->constraint.string_list[2]);
+       assert_string_equal("AutomaticAdvanced", option->constraint.string_list[3]);
+       assert_null(option->constraint.string_list[4]);
 }
 
 void kds_s2000w_option_get_descriptor_twentyfive_test()
@@ -730,19 +729,20 @@ void kds_s2000w_option_get_descriptor_fourtyone_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(41);
 
-       assert_string_equal("colorbalancemode", option->name);
-       assert_string_equal("colorbalancemode", option->title);
-       assert_string_equal("colorbalancemode", option->desc);
+       assert_string_equal("post-scan-rotation", option->name);
+       assert_string_equal("Post Scan Rotation", option->title);
+       assert_string_equal("Post Scan Rotation", 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*) * 6, 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("Manual", option->constraint.string_list[1]);
-       assert_string_equal("Automatic", option->constraint.string_list[2]);
-       assert_string_equal("AutomaticAdvanced", option->constraint.string_list[3]);
-       assert_null(option->constraint.string_list[4]);
+       assert_string_equal("Automatic", option->constraint.string_list[1]);
+       assert_string_equal("Automatic90", option->constraint.string_list[2]);
+       assert_string_equal("Automatic180", option->constraint.string_list[3]);
+       assert_string_equal("Automatic270", option->constraint.string_list[4]);
+       assert_null(option->constraint.string_list[5]);
 }
 
 void kds_s2000w_option_get_descriptor_fourtytwo_test()