remove gamma r option

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 66e6805aba3d3b84eee178a3aa2345ec95377e18..f308ee2028d0acf56fc0a28e52eb247aef0530ee 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -109,9 +109,10 @@ void kds_s2000w_handler_get_option(int option, void* value)
        json_object* value_object = NULL;
        switch(option) {
                case 0:
+                       const int COUNT_CUSTOM_OPTIONS = 3;
                        _load_options();
                        int* int_value_ptr = (int*) value;
-                       *int_value_ptr = json_object_object_length(config) + 4;
+                       *int_value_ptr = json_object_object_length(config) + COUNT_CUSTOM_OPTIONS;
                        break;
                case 2:
                        value_object = json_object_object_get(config, "DPI");
@@ -201,9 +202,6 @@ void kds_s2000w_handler_get_option(int option, void* value)
                        value_object = json_object_object_get(config, "ScanSource");
                        _write_string_value(value_object, value);
                        break;
-               case 24:
-                       int* gamma_vector_r = (int*) value;
-                       *gamma_vector_r = 1;
                default:
                        break;
        }
@@ -321,7 +319,7 @@ void kds_s2000w_handler_set_option(int option, void* value, int* info)
                        value_object = json_object_object_get(config, "ScanSource");
                        _write_string_value_to_json(value_object, value);
                        break;
-               case 25:
+               case 24:
                        resp = kds_s2000w_client_response_init();
                        kds_s2000w_client_get_capabilities(resp);
                        json_object* capabilities = json_tokener_parse(resp->data);

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index c372a2a4d32da90ae82a2b9882712d5a61957849..ff628554faf2b492bb9b33c309f0fdc14bdf3dfc 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -164,9 +164,6 @@ const SANE_Option_Descriptor* _sane_kds_s2000w_net_get_option_descriptor(
                        kds_s2000w_option_descriptor_scan_source(&option_descriptors[option]);
                        break;
                case 24:
-                       kds_s2000w_option_descriptor_gamma_vector_r(&option_descriptors[option]);
-                       break;
-               case 25:
                        kds_s2000w_option_descriptor_config_reset(&option_descriptors[option]);
                        break;
                default:

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 36f8f40ef8a19f7664ccac2a1a9a436d5ee6b53c..88884c09f40fa0a65ab6ed7eea133b398b03e20c 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -465,18 +465,6 @@ void kds_s2000w_option_descriptor_scan_source(SANE_Option_Descriptor* descriptor
        descriptor->size = sizeof(SANE_String) * 50;
 }
 
-void kds_s2000w_option_descriptor_gamma_vector_r(SANE_Option_Descriptor* descriptor)
-{
-       descriptor->name = SANE_NAME_GAMMA_VECTOR_R;
-       descriptor->title = SANE_TITLE_GAMMA_VECTOR_R;
-       descriptor->desc = SANE_DESC_GAMMA_VECTOR_R;
-       descriptor->cap = SANE_CAP_SOFT_DETECT;
-       descriptor->constraint_type = SANE_CONSTRAINT_NONE;
-       descriptor->type = SANE_TYPE_BOOL;
-       descriptor->unit = SANE_UNIT_NONE;
-       descriptor->size = sizeof(SANE_Bool);
-}
-
 void kds_s2000w_option_descriptor_config_reset(SANE_Option_Descriptor* descriptor)
 {
        descriptor->name = "config-reset";

diff --git a/src/kds_s2000w_option_descriptors.h b/src/kds_s2000w_option_descriptors.h
index da9a48368c12ee421f7552637b195d02da9e62e9..8f3b872be094dbc5f90e601ba4f4f3fdfa539d4d 100644 (file)
--- a/src/kds_s2000w_option_descriptors.h
+++ b/src/kds_s2000w_option_descriptors.h
@@ -1,7 +1,7 @@
 #ifndef KDS_S2000W_OPTION_DESCRIPTORS_H
 #include <sane/sane.h>
 
-#define MAX_OPTION_COUNT 26
+#define MAX_OPTION_COUNT 25
 
 SANE_Option_Descriptor* kds_s2000w_option_descriptor_init_option_descriptors();
 void kds_s2000w_option_descriptor_free_option_descriptors(SANE_Option_Descriptor* descriptor_array);
@@ -30,6 +30,5 @@ void kds_s2000w_option_descriptor_binarization_mode(SANE_Option_Descriptor* desc
 void kds_s2000w_option_descriptor_binarization_contrast(SANE_Option_Descriptor* descriptor);
 void kds_s2000w_option_descriptor_max_document_length(SANE_Option_Descriptor* descriptor);
 void kds_s2000w_option_descriptor_scan_source(SANE_Option_Descriptor* descriptor);
-void kds_s2000w_option_descriptor_gamma_vector_r(SANE_Option_Descriptor* descriptor);
 void kds_s2000w_option_descriptor_config_reset(SANE_Option_Descriptor* descriptor);
 #endif
\ No newline at end of file