change skip blank page content position

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index dd634712184bf0bc6c8bd8209a7f246a23fc7d54..96caaee4bb8e7b5e1060f6e661ad459e85ac62be 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -251,8 +251,8 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value
                        _kds_s2000w_handler_opts_write_int_value(value_object, value);
                        break;
                case 34:
-                       value_object = json_object_object_get(config, "MultifeedSensitivity");
-                       _kds_s2000w_handler_opts_write_string_value(value_object, value);
+                       value_object = json_object_object_get(config, "SkipBlankPagesContent");
+                       _kds_s2000w_handler_opts_write_int_value(value_object, value);
                        break;
                case 35:
                        value_object = json_object_object_get(config, "MaxDocumentLength");
@@ -291,8 +291,8 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value
                        _kds_s2000w_handler_opts_write_string_value(value_object, value);
                        break;
                case 44:
-                       value_object = json_object_object_get(config, "SkipBlankPagesContent");
-                       _kds_s2000w_handler_opts_write_int_value(value_object, value);
+                       value_object = json_object_object_get(config, "MultifeedSensitivity");
+                       _kds_s2000w_handler_opts_write_string_value(value_object, value);
                        break;
                case 45:
                        value_object = json_object_object_get(config, "JpegQuality");
@@ -456,8 +456,8 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value
                        _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
                        break;
                case 34:
-                       value_object = json_object_object_get(config, "MultifeedSensitivity");
-                       _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
+                       value_object = json_object_object_get(config, "SkipBlankPagesContent");
+                       _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
                        break;
                case 35:
                        value_object = json_object_object_get(config, "MaxDocumentLength");
@@ -496,8 +496,8 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value
                        _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
                        break;
                case 44:
-                       value_object = json_object_object_get(config, "SkipBlankPagesContent");
-                       _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
+                       value_object = json_object_object_get(config, "MultifeedSensitivity");
+                       _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
                        break;
                case 45:
                        value_object = json_object_object_get(config, "JpegQuality");

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 4084092c92b5b01d3244498140aa75bf7d80c3af..5f427f836333b3bc65bff1481ca7f654291dd3ca 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -1130,7 +1130,7 @@ void kds_s2000w_option_descriptors_init()
        descriptor_array[31] = _kds_s2000w_option_descriptor_config_reset();
        descriptor_array[32] = _kds_s2000w_option_descriptor_image_processing_group();
        descriptor_array[33] = _kds_s2000w_option_descriptor_skip_blank_pages();
-       descriptor_array[34] = _kds_s2000w_option_descriptor_multifeed_sensitivity();
+       descriptor_array[34] = _kds_s2000w_option_descriptor_skip_blank_page_content();
        descriptor_array[35] = _kds_s2000w_option_descriptor_max_document_length();
        descriptor_array[36] = _kds_s2000w_option_descriptor_document_feeder_timeout();
        descriptor_array[37] = _kds_s2000w_option_descriptor_multifeed_response();
@@ -1140,7 +1140,7 @@ void kds_s2000w_option_descriptors_init()
        descriptor_array[41] = _kds_s2000w_option_descriptor_post_scan_rotation();
        descriptor_array[42] = _kds_s2000w_option_descriptor_edge_fill();
        descriptor_array[43] = _kds_s2000w_option_descriptor_transport_handling();
-       descriptor_array[44] = _kds_s2000w_option_descriptor_skip_blank_page_content();
+       descriptor_array[44] = _kds_s2000w_option_descriptor_multifeed_sensitivity();
        descriptor_array[45] = _kds_s2000w_option_descriptor_jpeg_quality();
 }
 

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index 643330b28f68d7a3872bebbfa8687f3fe3311507..f6c1038087b6249c4b08933747bc2e141c25bddf 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -440,11 +440,11 @@ void sane_kds_s2000w_net_control_get_option_thirdyfour_test(void** state)
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
-       char* value[50] = {0};
+       uint32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 34, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_string_equal(value, "None");
+       assert_int_equal(value, 5);
 
        kds_s2000w_handler_free(h);
        h = NULL;
@@ -590,11 +590,11 @@ void sane_kds_s2000w_net_control_get_option_fourtyfour_test(void** state)
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
-       uint32_t value = -1;
+       char* value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 44, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_int_equal(value, 5);
+       assert_string_equal(value, "None");
 
        kds_s2000w_handler_free(h);
        h = NULL;

diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index 064f271ed59a12e8ad6a699e5b58c02704f8b61f..e8d97f5c9eab7fb9df49fe6ea31c6159bb4a0453 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -597,19 +597,17 @@ void kds_s2000w_option_get_descriptor_thirdyfour_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(34);
 
-       assert_string_equal("multifeed-sensitivity", option->name);
-       assert_string_equal("multifeed sensitivity", option->title);
-       assert_string_equal("multifeed sensitivity", 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*) * 5, option->size);
+       assert_string_equal("skip-blank-page-content", option->name);
+       assert_string_equal("skip blank page content", option->title);
+       assert_string_equal("skip blank page content", option->desc);
+       assert_int_equal(SANE_TYPE_INT, option->type);
+       assert_int_equal(SANE_UNIT_PERCENT, option->unit);
+       assert_int_equal(sizeof(SANE_Int), option->size);
        assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED, option->cap);
-       assert_int_equal(SANE_CONSTRAINT_STRING_LIST, option->constraint_type);
-       assert_string_equal("None", option->constraint.string_list[0]);
-       assert_string_equal("Low", option->constraint.string_list[1]);
-       assert_string_equal("Medium", option->constraint.string_list[2]);
-       assert_string_equal("High", option->constraint.string_list[3]);
-       assert_null(option->constraint.string_list[4]);
+       assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type);
+       assert_int_equal(option->constraint.range->min, 0);
+       assert_int_equal(option->constraint.range->max, 100);
+       assert_int_equal(option->constraint.range->quant, 1);
 }
 
 void kds_s2000w_option_get_descriptor_thirdyfive_test()
@@ -774,17 +772,19 @@ void kds_s2000w_option_get_descriptor_fourtyfour_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(44);
 
-       assert_string_equal("skip-blank-page-content", option->name);
-       assert_string_equal("skip blank page content", option->title);
-       assert_string_equal("skip blank page content", option->desc);
-       assert_int_equal(SANE_TYPE_INT, option->type);
-       assert_int_equal(SANE_UNIT_PERCENT, option->unit);
-       assert_int_equal(sizeof(SANE_Int), option->size);
+       assert_string_equal("multifeed-sensitivity", option->name);
+       assert_string_equal("multifeed sensitivity", option->title);
+       assert_string_equal("multifeed sensitivity", 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*) * 5, option->size);
        assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED, option->cap);
-       assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type);
-       assert_int_equal(option->constraint.range->min, 0);
-       assert_int_equal(option->constraint.range->max, 100);
-       assert_int_equal(option->constraint.range->quant, 1);
+       assert_int_equal(SANE_CONSTRAINT_STRING_LIST, option->constraint_type);
+       assert_string_equal("None", option->constraint.string_list[0]);
+       assert_string_equal("Low", option->constraint.string_list[1]);
+       assert_string_equal("Medium", option->constraint.string_list[2]);
+       assert_string_equal("High", option->constraint.string_list[3]);
+       assert_null(option->constraint.string_list[4]);
 }
 
 void kds_s2000w_option_get_descriptor_fourtyfive_test()