change skip blank page position

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index e21aaaa707316e27202e521eddd5ac746fe837ca..dd634712184bf0bc6c8bd8209a7f246a23fc7d54 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -247,7 +247,7 @@ 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 33:
-                       value_object = json_object_object_get(config, "SkipBlankPagesContent");
+                       value_object = json_object_object_get(config, "SkipBlankPages");
                        _kds_s2000w_handler_opts_write_int_value(value_object, value);
                        break;
                case 34:
@@ -291,7 +291,7 @@ 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, "SkipBlankPages");
+                       value_object = json_object_object_get(config, "SkipBlankPagesContent");
                        _kds_s2000w_handler_opts_write_int_value(value_object, value);
                        break;
                case 45:
@@ -452,7 +452,7 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value
                        return;
                        break;
                case 33:
-                       value_object = json_object_object_get(config, "SkipBlankPagesContent");
+                       value_object = json_object_object_get(config, "SkipBlankPages");
                        _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
                        break;
                case 34:
@@ -496,7 +496,7 @@ 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, "SkipBlankPages");
+                       value_object = json_object_object_get(config, "SkipBlankPagesContent");
                        _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
                        break;
                case 45:

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 3670b2b348edfce84c058de949acd079bbeb9db4..4084092c92b5b01d3244498140aa75bf7d80c3af 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -1129,7 +1129,7 @@ void kds_s2000w_option_descriptors_init()
        descriptor_array[30] = _kds_s2000w_option_descriptor_binarization_contrast();
        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_page_content();
+       descriptor_array[33] = _kds_s2000w_option_descriptor_skip_blank_pages();
        descriptor_array[34] = _kds_s2000w_option_descriptor_multifeed_sensitivity();
        descriptor_array[35] = _kds_s2000w_option_descriptor_max_document_length();
        descriptor_array[36] = _kds_s2000w_option_descriptor_document_feeder_timeout();
@@ -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_pages();
+       descriptor_array[44] = _kds_s2000w_option_descriptor_skip_blank_page_content();
        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 06ab7a4d4389ceb675b4f262bd513bbece8f01a0..643330b28f68d7a3872bebbfa8687f3fe3311507 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -425,11 +425,11 @@ void sane_kds_s2000w_net_control_get_option_thirdythree_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;
+       int32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 33, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_int_equal(value, 5);
+       assert_int_equal(value, 0);
 
        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);
-       int32_t value = -1;
+       uint32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 44, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_int_equal(value, 0);
+       assert_int_equal(value, 5);
 
        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 c1189c406b84f98d3371acb68aaab9797d3c4f6e..064f271ed59a12e8ad6a699e5b58c02704f8b61f 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -583,17 +583,14 @@ void kds_s2000w_option_get_descriptor_thirdythree_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(33);
 
-       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("skip-blank-pages", option->name);
+       assert_string_equal("Blank Image Deletion Mode", option->title);
+       assert_string_equal("Blank Image Deletion Mode", option->desc);
+       assert_int_equal(SANE_TYPE_BOOL, option->type);
+       assert_int_equal(SANE_UNIT_NONE, option->unit);
+       assert_int_equal(sizeof(SANE_Bool),  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_NONE, option->constraint_type);
 }
 
 void kds_s2000w_option_get_descriptor_thirdyfour_test()
@@ -777,14 +774,17 @@ void kds_s2000w_option_get_descriptor_fourtyfour_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(44);
 
-       assert_string_equal("skip-blank-pages", option->name);
-       assert_string_equal("Blank Image Deletion Mode", option->title);
-       assert_string_equal("Blank Image Deletion Mode", option->desc);
-       assert_int_equal(SANE_TYPE_BOOL, option->type);
-       assert_int_equal(SANE_UNIT_NONE, option->unit);
-       assert_int_equal(sizeof(SANE_Bool),  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_NONE, option->constraint_type);
+       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_fourtyfive_test()