add color drop and aggressiv

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 151d2fb8041066b0a898d2a30f681a48de2d7bec..017906a8383d3b4d92e90522ddb705dfc7aea506 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -153,17 +153,31 @@ const SANE_Option_Descriptor* _sane_kds_s2000w_net_get_option_descriptor(
                        option_descriptors[option].name = "colordrop";
                        option_descriptors[option].title = "colordrop";
                        option_descriptors[option].desc = "colordrop";
-                       option_descriptors[option].cap = SANE_CAP_SOFT_DETECT;
-                       option_descriptors[option].constraint_type = SANE_CONSTRAINT_NONE;
-                       option_descriptors[option].constraint.string_list = NULL;
+                       option_descriptors[option].cap = SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT;
+                       option_descriptors[option].constraint_type = SANE_CONSTRAINT_STRING_LIST;
+                       SANE_String_Const* constraint_colordrop = malloc(sizeof(char*) * 9);
+                       constraint_colordrop[0] = "None";
+                       constraint_colordrop[1] = "Red";
+                       constraint_colordrop[2] = "Green";
+                       constraint_colordrop[3] = "Blue";
+                       constraint_colordrop[4] = "Orange";
+                       constraint_colordrop[5] = "OrangeAndRed";
+                       constraint_colordrop[6] = "Predominant";
+                       constraint_colordrop[7] = "Multiple";
+                       constraint_colordrop[8] = NULL;
+                       option_descriptors[option].constraint.string_list = constraint_colordrop;
                        break;
                case 7:
                        option_descriptors[option].name = "colordropoutaggressiveness";
                        option_descriptors[option].title = "colordropoutaggressiveness";
                        option_descriptors[option].desc = "colordropoutaggressiveness";
-                       option_descriptors[option].cap = SANE_CAP_SOFT_DETECT;
-                       option_descriptors[option].constraint_type = SANE_CONSTRAINT_NONE;
-                       option_descriptors[option].constraint.string_list = NULL;
+                       option_descriptors[option].cap = SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT;
+                       option_descriptors[option].constraint_type = SANE_CONSTRAINT_RANGE;
+                       SANE_Range* color_drop_out_aggressiveness_range = malloc(sizeof(SANE_Range));
+                       color_drop_out_aggressiveness_range->min = -10;
+                       color_drop_out_aggressiveness_range->max = 10;
+                       color_drop_out_aggressiveness_range->quant = 1;
+                       option_descriptors[option].constraint.range = color_drop_out_aggressiveness_range;
                        break;
                case 8:
                        option_descriptors[option].name = "outputtype";