change color auto brithness mode position

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 507b5b7c0e8380355f1f1d6ada0adb546c74fa8f..817e03a2e6d975f0713897ab8542b72ae398abf1 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -207,8 +207,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 21:
-                       value_object = json_object_object_get(config, "BinarizationContrast");
-                       _kds_s2000w_handler_opts_write_int_value(value_object, value);
+                       value_object = json_object_object_get(config, "ColorAutoBrightnessMode");
+                       _kds_s2000w_handler_opts_write_string_value(value_object, value);
                        break;
                case 22:
                        value_object = json_object_object_get(config, "MultifeedSensitivity");
@@ -279,8 +279,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 39:
-                       value_object = json_object_object_get(config, "ColorAutoBrightnessMode");
-                       _kds_s2000w_handler_opts_write_string_value(value_object, value);
+                       value_object = json_object_object_get(config, "BinarizationContrast");
+                       _kds_s2000w_handler_opts_write_int_value(value_object, value);
                        break;
                case 40:
                        value_object = json_object_object_get(config, "ColorSharpen");
@@ -401,8 +401,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 21:
-                       value_object = json_object_object_get(config, "BinarizationContrast");
-                       _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
+                       value_object = json_object_object_get(config, "ColorAutoBrightnessMode");
+                       _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
                        break;
                case 22:
                        value_object = json_object_object_get(config, "MultifeedSensitivity");
@@ -473,8 +473,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 39:
-                       value_object = json_object_object_get(config, "ColorAutoBrightnessMode");
-                       _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
+                       value_object = json_object_object_get(config, "BinarizationContrast");
+                       _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
                        break;
                case 40:
                        value_object = json_object_object_get(config, "ColorSharpen");

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index d968cde8fc7f40d0522b4a049bc77cfdfcd520c3..784b06aeca90a723c2aba069b2edce4e12b3ae8b 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -221,9 +221,9 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_color_auto_brightness_mode(
        constraint[3] = NULL;
 
        SANE_Option_Descriptor descriptor = {
-               "colorautobrightnessmode",
-               "colorautobrightnessmode",
-               "colorautobrightnessmode",
+               "color-auto-brightness-mode",
+               "Color Auto Brightness Mode",
+               "Color Auto Brightness Mode",
                SANE_TYPE_STRING,
                SANE_UNIT_NONE,
                sizeof(SANE_String_Const*) * 4,
@@ -1099,7 +1099,7 @@ void kds_s2000w_option_descriptors_init()
        descriptor_array[18] = _kds_s2000w_option_descriptor_boldness_color_group();
        descriptor_array[19] = _kds_s2000w_option_descriptor_color_drop();
        descriptor_array[20] = _kds_s2000w_option_descriptor_color_drop_out_aggressiveness();
-       descriptor_array[21] = _kds_s2000w_option_descriptor_binarization_contrast();
+       descriptor_array[21] = _kds_s2000w_option_descriptor_color_auto_brightness_mode();
        descriptor_array[22] = _kds_s2000w_option_descriptor_multifeed_sensitivity();
        descriptor_array[23] = _kds_s2000w_option_descriptor_multifeed_response();
        descriptor_array[24] = _kds_s2000w_option_descriptor_post_scan_rotation();
@@ -1117,7 +1117,7 @@ void kds_s2000w_option_descriptors_init()
        descriptor_array[36] = _kds_s2000w_option_descriptor_document_feeder_timeout();
        descriptor_array[37] = _kds_s2000w_option_descriptor_color_contrast();
        descriptor_array[38] = _kds_s2000w_option_descriptor_color_balance_red();
-       descriptor_array[39] = _kds_s2000w_option_descriptor_color_auto_brightness_mode();
+       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[42] = _kds_s2000w_option_descriptor_color_balancea_agressiveness();

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index 997172d5a9a3262adf399b5f8bb828709d947741..59d4527525355945781e7cd7e7b889d5d61ad275 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -275,11 +275,11 @@ void sane_kds_s2000w_net_control_get_option_twentyone_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, 21, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_int_equal(value, 0);
+       assert_string_equal(value, "Automatic");
 
        kds_s2000w_handler_free(h);
        h = NULL;
@@ -545,11 +545,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);
-       char value[50] = {0};
+       int32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 39, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_string_equal(value, "Automatic");
+       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 d53b257e01cb88bfa84379bfdcb82cd4ecb8f510..26e05321a363b5fd9cc708779f77dd934add8f90 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -380,17 +380,18 @@ void kds_s2000w_option_get_descriptor_twentyone_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(21);
 
-       assert_string_equal(SANE_NAME_CONTRAST, option->name);
-       assert_string_equal(SANE_TITLE_CONTRAST, option->title);
-       assert_string_equal(SANE_DESC_CONTRAST, option->desc);
-       assert_int_equal(SANE_TYPE_INT, option->type);
+       assert_string_equal("color-auto-brightness-mode", option->name);
+       assert_string_equal("Color Auto Brightness Mode", option->title);
+       assert_string_equal("Color Auto Brightness 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("Manual", 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_twentytwo_test()
@@ -693,18 +694,17 @@ void kds_s2000w_option_get_descriptor_thirdynine_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(39);
 
-       assert_string_equal("colorautobrightnessmode", option->name);
-       assert_string_equal("colorautobrightnessmode", option->title);
-       assert_string_equal("colorautobrightnessmode", option->desc);
-       assert_int_equal(SANE_TYPE_STRING, option->type);
+       assert_string_equal(SANE_NAME_CONTRAST, option->name);
+       assert_string_equal(SANE_TITLE_CONTRAST, option->title);
+       assert_string_equal(SANE_DESC_CONTRAST, 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("Manual", 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_fourty_test()