change color balance red position

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index f35d3c3c72f42afd12ac74310515db76c96b6e30..ffa54a81bcbd8c6f97338375c6a105ff12c000ff 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -227,8 +227,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 26:
-                       value_object = json_object_object_get(config, "ImageBorder");
-                       _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 27:
                        value_object = json_object_object_get(config, "TransportHandling");
@@ -275,8 +275,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 38:
-                       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, "ImageBorder");
+                       _kds_s2000w_handler_opts_write_string_value(value_object, value);
                        break;
                case 39:
                        value_object = json_object_object_get(config, "BinarizationContrast");
@@ -421,8 +421,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 26:
-                       value_object = json_object_object_get(config, "ImageBorder");
-                       _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 27:
                        value_object = json_object_object_get(config, "TransportHandling");
@@ -469,8 +469,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 38:
-                       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, "ImageBorder");
+                       _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
                        break;
                case 39:
                        value_object = json_object_object_get(config, "BinarizationContrast");

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 0c5f99437b739b12c42569c4ce2531b74e0a55ed..3954397a5bfcbc5dc27a97dfdabcbc59afd911c2 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -295,9 +295,9 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_color_balance_red()
        constraint->quant = 1;
 
        SANE_Option_Descriptor descriptor = {
-               "colorbalancered",
-               "colorbalancered",
-               "colorbalancered",
+               "color-balance-red",
+               "Color Balance Red",
+               "Color Balance Red",
                SANE_TYPE_INT,
                SANE_UNIT_NONE,
                sizeof(SANE_Int),
@@ -1104,7 +1104,7 @@ void kds_s2000w_option_descriptors_init()
        descriptor_array[23] = _kds_s2000w_option_descriptor_color_contrast();
        descriptor_array[24] = _kds_s2000w_option_descriptor_color_balance_mode();
        descriptor_array[25] = _kds_s2000w_option_descriptor_color_balancea_agressiveness();
-       descriptor_array[26] = _kds_s2000w_option_descriptor_image_border();
+       descriptor_array[26] = _kds_s2000w_option_descriptor_color_balance_red();
        descriptor_array[27] = _kds_s2000w_option_descriptor_transport_handling();
        descriptor_array[28] = _kds_s2000w_option_descriptor_jpeg_quality();
        descriptor_array[29] = _kds_s2000w_option_descriptor_document_feeder_timeout_response();
@@ -1116,7 +1116,7 @@ void kds_s2000w_option_descriptors_init()
        descriptor_array[35] = _kds_s2000w_option_descriptor_max_document_length();
        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_color_balance_red();
+       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[41] = _kds_s2000w_option_descriptor_post_scan_rotation();

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index 89e278b068b7573201f21dc6aae6eb9d336be534..834d5d733dffa70f9b0c867b3fbc3360a537bc85 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -350,11 +350,11 @@ void sane_kds_s2000w_net_control_get_option_twentysix_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, 26, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_string_equal(value, "None");
+       assert_int_equal(value, 0);
 
        kds_s2000w_handler_free(h);
        h = NULL;
@@ -530,11 +530,11 @@ void sane_kds_s2000w_net_control_get_option_thirdyeight_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, 38, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_int_equal(value, 0);
+       assert_string_equal(value, "None");
 
        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 456f60ad81bdf0a99a40585602761509ab413008..f85e005079f25d21de4dbce4da52cbbaebcf6138 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -468,18 +468,17 @@ void kds_s2000w_option_get_descriptor_twentysix_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(26);
 
-       assert_string_equal("image-border", option->name);
-       assert_string_equal("Image Border", option->title);
-       assert_string_equal("Image Border", option->desc);
-       assert_int_equal(SANE_TYPE_STRING, option->type);
+       assert_string_equal("color-balance-red", option->name);
+       assert_string_equal("Color Balance Red", option->title);
+       assert_string_equal("Color Balance Red", 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("Add", option->constraint.string_list[1]);
-       assert_string_equal("Remove", 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_twentyseven_test()
@@ -675,17 +674,18 @@ void kds_s2000w_option_get_descriptor_thirdyeight_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(38);
 
-       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("image-border", option->name);
+       assert_string_equal("Image Border", option->title);
+       assert_string_equal("Image Border", 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("Add", option->constraint.string_list[1]);
+       assert_string_equal("Remove", option->constraint.string_list[2]);
+       assert_null(option->constraint.string_list[3]);
 }
 
 void kds_s2000w_option_get_descriptor_thirdynine_test()