add manual color brightness mode

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index c3f0f76177c6923d63178882f0b6e51aad948443..a563e2d93169a4474ccd931be17e095c75ea3fe9 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -218,10 +218,11 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_color_auto_brightness_mode(
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_option_descriptor_color_auto_brightness_mode");
 
-       constraint_color_auto_brightnessmode = malloc(sizeof(SANE_String_Const*) * 3);
+       constraint_color_auto_brightnessmode = malloc(sizeof(SANE_String_Const*) * 4);
        constraint_color_auto_brightnessmode[0] = "None";
-       constraint_color_auto_brightnessmode[1] = "Automatic";
-       constraint_color_auto_brightnessmode[2] = NULL;
+       constraint_color_auto_brightnessmode[1] = "Manual";
+       constraint_color_auto_brightnessmode[2] = "Automatic";
+       constraint_color_auto_brightnessmode[3] = NULL;
 
        SANE_Option_Descriptor descriptor = {
                "colorautobrightnessmode",
@@ -229,7 +230,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_color_auto_brightness_mode(
                "colorautobrightnessmode",
                SANE_TYPE_STRING,
                SANE_UNIT_NONE,
-               sizeof(SANE_String_Const*) * 3,
+               sizeof(SANE_String_Const*) * 4,
                SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT,
                SANE_CONSTRAINT_STRING_LIST,
                {.string_list = constraint_color_auto_brightnessmode}

diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index 562769d9a7dde9af7f57e56b80cec863f16c0141..7c5fb1133914a81a461151e43130a34a73727902 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -195,12 +195,13 @@ void kds_s2000w_option_get_descriptor_ten_test()
        assert_string_equal("colorautobrightnessmode", 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*) * 3,  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_STRING_LIST, option->constraint_type);
        assert_string_equal("None", option->constraint.string_list[0]);
-       assert_string_equal("Automatic", option->constraint.string_list[1]);
-       assert_null(option->constraint.string_list[2]);
+       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_eleven_test()