remove read only option binarization mode

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 07516a3b6f5cf9ab252f80123e6428411f85a578..fe5af544781dbe4a31729298bf12097c7eb6a9d9 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -5,7 +5,7 @@
 #include "kds_s2000w_handler_opts.h"
 #include "kds_s2000w_debug.h"
 
-#define COUNT_CUSTOM_OPTIONS 9
+#define COUNT_CUSTOM_OPTIONS 8
 
 extern json_object* resp_config;
 extern json_object* config;
@@ -208,27 +208,23 @@ void kds_s2000w_handler_get_option(handler* h, int option, void* value, int* inf
                        _write_int_value(value_object, value);
                        break;
                case 23:
-                       value_object = json_object_object_get(config, "BinarizationMode");
-                       _write_string_value(value_object, value);
-                       break;
-               case 24:
                        value_object = json_object_object_get(config, "BinarizationContrast");
                        _write_int_value(value_object, value);
                        break;
-               case 25:
+               case 24:
                        value_object = json_object_object_get(config, "MaxDocumentLength");
                        _write_int_value(value_object, value);
                        break;
-               case 27:
+               case 26:
                        memcpy(value, &gamma_table[0][0], sizeof(int) * 256);
                        break;
-               case 28:
+               case 27:
                        memcpy(value, &gamma_table[1][0], sizeof(int) * 256);
                        break;
-               case 29:
+               case 28:
                        memcpy(value, &gamma_table[2][0], sizeof(int) * 256);
                        break;
-               case 30:
+               case 29:
                        memcpy(value, &gamma_table[3][0], sizeof(int) * 256);
                        break;
                default:
@@ -358,18 +354,14 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf
                        _write_int_value_to_json(value_object, value);
                        break;
                case 23:
-                       value_object = json_object_object_get(config, "BinarizationMode");
-                       _write_string_value_to_json(value_object, value);
-                       break;
-               case 24:
                        value_object = json_object_object_get(config, "BinarizationContrast");
                        _write_int_value_to_json(value_object, value);
                        break;
-               case 25:
+               case 24:
                        value_object = json_object_object_get(config, "MaxDocumentLength");
                        _write_int_value_to_json(value_object, value);
                        break;
-               case 26:
+               case 25:
                        response* 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_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 4c44a604db1cbf14d8c5cb64153b5dcd5922cece..2e55c929131e122279bfa822b09d8d5354a90210 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -480,27 +480,6 @@ SANE_Option_Descriptor* _kds_s2000w_option_descriptor_background_smoothing_aggre
        return descriptor;
 }
 
-SANE_Option_Descriptor* _kds_s2000w_option_descriptor_binarization_mode()
-{
-       debug_printf(ALL, "kds_s2000w_option_descriptor_binarization_mode");
-       SANE_Option_Descriptor* descriptor = malloc(sizeof(SANE_Option_Descriptor));
-
-       descriptor->name = "binarization-mode";
-       descriptor->title = "binarizationmode";
-       descriptor->desc = "binarizationmode";
-       descriptor->cap = SANE_CAP_SOFT_DETECT;
-       descriptor->constraint_type = SANE_CONSTRAINT_STRING_LIST;
-       constraint_binarization_mode = malloc(sizeof(char*) * 2);
-       constraint_binarization_mode[0] = "iThresholding";
-       constraint_binarization_mode[1] = NULL;
-       descriptor->constraint.string_list = constraint_binarization_mode;
-       descriptor->type = SANE_TYPE_STRING;
-       descriptor->unit = SANE_UNIT_NONE;
-       descriptor->size = sizeof(SANE_String) * 50;
-
-       return descriptor;
-}
-
 SANE_Option_Descriptor* _kds_s2000w_option_descriptor_binarization_contrast()
 {
        debug_printf(ALL, "kds_s2000w_option_descriptor_binarization_contrast");
@@ -722,14 +701,13 @@ void kds_s2000w_option_descriptor_init_option_descriptors()
        descriptor_array[20] = _kds_s2000w_option_descriptor_foreground_boldness_aggressiveness();
        descriptor_array[21] = _kds_s2000w_option_descriptor_background_smoothing_mode();
        descriptor_array[22] = _kds_s2000w_option_descriptor_background_smoothing_aggressiveness();
-       descriptor_array[23] = _kds_s2000w_option_descriptor_binarization_mode();
-       descriptor_array[24] = _kds_s2000w_option_descriptor_binarization_contrast();
-       descriptor_array[25] = _kds_s2000w_option_descriptor_max_document_length();
-       descriptor_array[26] = _kds_s2000w_option_descriptor_config_reset();
-       descriptor_array[27] = _kds_s2000w_option_descriptor_gamma_vector();
-       descriptor_array[28] = _kds_s2000w_option_descriptor_gamma_vector_r();
-       descriptor_array[29] = _kds_s2000w_option_descriptor_gamma_vector_g();
-       descriptor_array[30] = _kds_s2000w_option_descriptor_gamma_vector_b();
+       descriptor_array[23] = _kds_s2000w_option_descriptor_binarization_contrast();
+       descriptor_array[24] = _kds_s2000w_option_descriptor_max_document_length();
+       descriptor_array[25] = _kds_s2000w_option_descriptor_config_reset();
+       descriptor_array[26] = _kds_s2000w_option_descriptor_gamma_vector();
+       descriptor_array[27] = _kds_s2000w_option_descriptor_gamma_vector_r();
+       descriptor_array[28] = _kds_s2000w_option_descriptor_gamma_vector_g();
+       descriptor_array[29] = _kds_s2000w_option_descriptor_gamma_vector_b();
 }
 
 void kds_s2000w_option_descriptor_free_option_descriptors()

diff --git a/src/kds_s2000w_option_descriptors.h b/src/kds_s2000w_option_descriptors.h
index 8361c9fe4a4f5cd9fc7ff92b0ea7a4865933ea38..49a05c691f8487965df7f8f39046c9ba3bfa6d42 100644 (file)
--- a/src/kds_s2000w_option_descriptors.h
+++ b/src/kds_s2000w_option_descriptors.h
@@ -2,7 +2,7 @@
 #define KDS_S2000W_OPTION_DESCRIPTORS_H
 #include <sane/sane.h>
 
-#define MAX_OPTION_COUNT 31
+#define MAX_OPTION_COUNT 30
 
 void kds_s2000w_option_descriptor_init_option_descriptors();
 void kds_s2000w_option_descriptor_free_option_descriptors();