From 691d90c713c0283693824efa9c9d788099f373de Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sat, 15 Feb 2025 20:02:34 +0100 Subject: [PATCH] add manual color brightness mode --- src/kds_s2000w_option_descriptors.c | 9 +++++---- tests/kds_s2000w_option_descriptor_tests.c | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index c3f0f76..a563e2d 100644 --- 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 562769d..7c5fb11 100644 --- 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() -- 2.39.5