add read option six

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index b2764548d5cfc286293c5528b353a59d155e12ec..e72c9e29c49c768abdc9501f12c9d6df3bbaf6af 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -87,7 +87,7 @@ void kds_s2000w_handler_get_option(int option, void* value)
        switch(option) {
                case 0:
                        int_value_ptr = (int*) value;
-                       *int_value_ptr = 6;
+                       *int_value_ptr = 7;
                        break;
                case 1:
                        value_object = json_object_object_get(config, "DPI");
@@ -121,6 +121,13 @@ void kds_s2000w_handler_get_option(int option, void* value)
                        int_value_ptr = (int*) value;
                        *int_value_ptr = int_value;
                        break;
+               case 6:
+                       value_object = json_object_object_get(config, "ColorDropOut");
+                       string_value = json_object_get_string(value_object);
+                       char_value = (char*) value;
+                       value_length = strlen(char_value);
+                       memcpy(char_value, string_value, sizeof(char) * value_length);
+                       break;  
                default:
                        break;
        }

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index cd53e14222d04bf82ed95ac1a84f0d11bed77836..a089bf3309739fd2f1128e97a47f6b3ba79803b3 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -166,6 +166,17 @@ const SANE_Option_Descriptor* _sane_kds_s2000w_net_get_option_descriptor(
                        option_descriptor_array.option_descriptors[option]->cap = SANE_CAP_SOFT_DETECT;
                        option_descriptor_array.option_descriptors[option]->constraint_type = SANE_CONSTRAINT_NONE;
                        option_descriptor_array.option_descriptors[option]->constraint.string_list = NULL;
+                       break;
+               case 6:
+                       free(option_descriptor_array.option_descriptors[option]);
+                       option_descriptor_array.option_descriptors[option] = NULL;
+                       option_descriptor_array.option_descriptors[option] = malloc(sizeof(SANE_Option_Descriptor));
+                       option_descriptor_array.option_descriptors[option]->name = "colordrop";
+                       option_descriptor_array.option_descriptors[option]->title = "colordrop";
+                       option_descriptor_array.option_descriptors[option]->desc = "colordrop";
+                       option_descriptor_array.option_descriptors[option]->cap = SANE_CAP_SOFT_DETECT;
+                       option_descriptor_array.option_descriptors[option]->constraint_type = SANE_CONSTRAINT_NONE;
+                       option_descriptor_array.option_descriptors[option]->constraint.string_list = NULL;
                        break;  
                default:
                        return NULL;
@@ -183,6 +194,7 @@ const SANE_Option_Descriptor* _sane_kds_s2000w_net_get_option_descriptor(
                        break;
                case 2:
                case 3:
+               case 6:
                        option_descriptor_array.option_descriptors[option]->type = SANE_TYPE_STRING;
                        option_descriptor_array.option_descriptors[option]->unit = SANE_UNIT_NONE;
                        option_descriptor_array.option_descriptors[option]->size = sizeof(SANE_String) * 50;