change foreground boldness aggressiveness position

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index a9cca04ec265c325c0d66c2d6f47307f4f619093..351b011fe93fb478635afa7fbb5097a663ec9b95 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -187,7 +187,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 15:
-                       value_object = json_object_object_get(config, "ColorBalanceGreen");
+                       value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness");
                        _kds_s2000w_handler_opts_write_int_value(value_object, value);
                        break;
                case 16:
@@ -199,7 +199,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 18:
-                       value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness");
+                       value_object = json_object_object_get(config, "ColorBalanceGreen");
                        _kds_s2000w_handler_opts_write_int_value(value_object, value);
                        break;
                case 19:
@@ -381,7 +381,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 15:
-                       value_object = json_object_object_get(config, "ColorBalanceGreen");
+                       value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness");
                        _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
                        break;
                case 16:
@@ -393,7 +393,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 18:
-                       value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness");
+                       value_object = json_object_object_get(config, "ColorBalanceGreen");
                        _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
                        break;
                case 19:

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index bfa3f9012990a88eca156678e4b7ca3e878ee4e6..cac54fd226fb7e2b7ac55cbb8188996739996f93 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -1075,10 +1075,10 @@ void kds_s2000w_option_descriptors_init()
        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_foreground_boldness_mode();
-       descriptor_array[15] = _kds_s2000w_option_descriptor_color_balance_green();
+       descriptor_array[15] = _kds_s2000w_option_descriptor_foreground_boldness_aggressiveness();
        descriptor_array[16] = _kds_s2000w_option_descriptor_color_balance_blue();
        descriptor_array[17] = _kds_s2000w_option_descriptor_color_balance_red();
-       descriptor_array[18] = _kds_s2000w_option_descriptor_foreground_boldness_aggressiveness();
+       descriptor_array[18] = _kds_s2000w_option_descriptor_color_balance_green();
        descriptor_array[19] = _kds_s2000w_option_descriptor_background_smoothing_mode();
        descriptor_array[20] = _kds_s2000w_option_descriptor_background_smoothing_aggressiveness();
        descriptor_array[21] = _kds_s2000w_option_descriptor_binarization_contrast();

diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index de7a1ad0af6b6eeef3a1beeb6d75184dcf591764..af511fbc998234395239ed2979f37c01e4cd1d02 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -274,16 +274,16 @@ void kds_s2000w_option_get_descriptor_fifteen_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(15);
 
-       assert_string_equal("colorbalancegreen", option->name);
-       assert_string_equal("colorbalancegreen", option->title);
-       assert_string_equal("colorbalancegreen", option->desc);
+       assert_string_equal("foreground-boldness-aggressiveness", option->name);
+       assert_string_equal("Foreground Boldness Aggressiveness", option->title);
+       assert_string_equal("Foreground Boldness Aggressiveness", option->desc);
        assert_int_equal(SANE_TYPE_INT, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
-       assert_int_equal(sizeof(SANE_Int),  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_RANGE, option->constraint_type);
-       assert_int_equal(-50, option->constraint.range->min);
-       assert_int_equal(50, option->constraint.range->max);
+       assert_int_equal(-10, option->constraint.range->min);
+       assert_int_equal(10, option->constraint.range->max);
        assert_int_equal(1, option->constraint.range->quant);
 }
 
@@ -325,16 +325,16 @@ void kds_s2000w_option_get_descriptor_eightteen_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(18);
 
-       assert_string_equal("foreground-boldness-aggressiveness", option->name);
-       assert_string_equal("Foreground Boldness Aggressiveness", option->title);
-       assert_string_equal("Foreground Boldness Aggressiveness", option->desc);
+       assert_string_equal("colorbalancegreen", option->name);
+       assert_string_equal("colorbalancegreen", option->title);
+       assert_string_equal("colorbalancegreen", option->desc);
        assert_int_equal(SANE_TYPE_INT, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
-       assert_int_equal(sizeof(SANE_Int), 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_RANGE, option->constraint_type);
-       assert_int_equal(-10, option->constraint.range->min);
-       assert_int_equal(10, option->constraint.range->max);
+       assert_int_equal(-50, option->constraint.range->min);
+       assert_int_equal(50, option->constraint.range->max);
        assert_int_equal(1, option->constraint.range->quant);
 }