change forground boldness mode position

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index ce909b90db48a32b93b3ab217ec9076690714cd0..a9cca04ec265c325c0d66c2d6f47307f4f619093 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -183,8 +183,8 @@ 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 14:
-                       value_object = json_object_object_get(config, "ColorBalanceRed");
-                       _kds_s2000w_handler_opts_write_int_value(value_object, value);
+                       value_object = json_object_object_get(config, "ForegroundBoldnessMode");
+                       _kds_s2000w_handler_opts_write_string_value(value_object, value);
                        break;
                case 15:
                        value_object = json_object_object_get(config, "ColorBalanceGreen");
@@ -195,8 +195,8 @@ 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 17:
-                       value_object = json_object_object_get(config, "ForegroundBoldnessMode");
-                       _kds_s2000w_handler_opts_write_string_value(value_object, value);
+                       value_object = json_object_object_get(config, "ColorBalanceRed");
+                       _kds_s2000w_handler_opts_write_int_value(value_object, value);
                        break;
                case 18:
                        value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness");
@@ -377,8 +377,8 @@ 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 14:
-                       value_object = json_object_object_get(config, "ColorBalanceRed");
-                       _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
+                       value_object = json_object_object_get(config, "ForegroundBoldnessMode");
+                       _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
                        break;
                case 15:
                        value_object = json_object_object_get(config, "ColorBalanceGreen");
@@ -389,8 +389,8 @@ 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 17:
-                       value_object = json_object_object_get(config, "ForegroundBoldnessMode");
-                       _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
+                       value_object = json_object_object_get(config, "ColorBalanceRed");
+                       _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
                        break;
                case 18:
                        value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness");

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 5ef4cc8f195e3b83c8c9381e6fbda13165056408..bfa3f9012990a88eca156678e4b7ca3e878ee4e6 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -1074,10 +1074,10 @@ void kds_s2000w_option_descriptors_init()
        descriptor_array[11] = _kds_s2000w_option_descriptor_image_width();
        descriptor_array[12] = _kds_s2000w_option_descriptor_image_height();
        descriptor_array[13] = _kds_s2000w_option_descriptor_boldness_smoothing_group();
-       descriptor_array[14] = _kds_s2000w_option_descriptor_color_balance_red();
+       descriptor_array[14] = _kds_s2000w_option_descriptor_foreground_boldness_mode();
        descriptor_array[15] = _kds_s2000w_option_descriptor_color_balance_green();
        descriptor_array[16] = _kds_s2000w_option_descriptor_color_balance_blue();
-       descriptor_array[17] = _kds_s2000w_option_descriptor_foreground_boldness_mode();
+       descriptor_array[17] = _kds_s2000w_option_descriptor_color_balance_red();
        descriptor_array[18] = _kds_s2000w_option_descriptor_foreground_boldness_aggressiveness();
        descriptor_array[19] = _kds_s2000w_option_descriptor_background_smoothing_mode();
        descriptor_array[20] = _kds_s2000w_option_descriptor_background_smoothing_aggressiveness();

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index 90801e5dc90646e681773ab6f92f73b7532d91f6..a4583016ae36a6a9ee772e9f6396ceb199292bfc 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -185,11 +185,11 @@ void sane_kds_s2000w_net_control_get_option_fourteen_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;
+       char* value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 14, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_int_equal(value, 0);
+       assert_string_equal(value, "None");
 
        kds_s2000w_handler_free(h);
        h = NULL;
@@ -230,11 +230,11 @@ void sane_kds_s2000w_net_control_get_option_seventeen_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};
+       int32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 17, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_string_equal(value, "None");
+       assert_int_equal(value, 0);
 
        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 e818145b05219e776a27fb58d5870f43ac03f609..de7a1ad0af6b6eeef3a1beeb6d75184dcf591764 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -256,17 +256,18 @@ void kds_s2000w_option_get_descriptor_fourteen_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(14);
 
-       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_string_equal("foreground-boldness-mode", option->name);
+       assert_string_equal("Foreground Boldness Mode", option->title);
+       assert_string_equal("Foreground Boldness Mode", 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*) * 4, 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_STRING_LIST, option->constraint_type);
+       assert_string_equal("None", option->constraint.string_list[0]);
+       assert_string_equal("AutomaticAdvanced", option->constraint.string_list[1]);
+       assert_string_equal("Automatic", option->constraint.string_list[2]);
+       assert_null(option->constraint.string_list[3]);
 }
 
 void kds_s2000w_option_get_descriptor_fifteen_test()
@@ -307,18 +308,17 @@ void kds_s2000w_option_get_descriptor_seventeen_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(17);
 
-       assert_string_equal("foreground-boldness-mode", option->name);
-       assert_string_equal("Foreground Boldness Mode", option->title);
-       assert_string_equal("Foreground Boldness Mode", option->desc);
-       assert_int_equal(SANE_TYPE_STRING, option->type);
+       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_String_Const*) * 4, 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_STRING_LIST, option->constraint_type);
-       assert_string_equal("None", option->constraint.string_list[0]);
-       assert_string_equal("AutomaticAdvanced", option->constraint.string_list[1]);
-       assert_string_equal("Automatic", option->constraint.string_list[2]);
-       assert_null(option->constraint.string_list[3]);
+       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_eightteen_test()