change position crop mode

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 6f10f80cfc0e34e1589ac0aebc97cdae30309b63..55b51f7b5d07ca0de59f856c18222f3911f687cd 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -159,8 +159,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 7:
-                       value_object = json_object_object_get(config, "SkipBlankPages");
-                       _kds_s2000w_handler_opts_write_int_value(value_object, value);
+                       value_object = json_object_object_get(config, "CroppingMode");
+                       _kds_s2000w_handler_opts_write_string_value(value_object, value);
                        break;
                case 8:
                        value_object = json_object_object_get(config, "ColorDropOut");
@@ -255,8 +255,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 31:
-                       value_object = json_object_object_get(config, "CroppingMode");
-                       _kds_s2000w_handler_opts_write_string_value(value_object, value);
+                       value_object = json_object_object_get(config, "SkipBlankPages");
+                       _kds_s2000w_handler_opts_write_int_value(value_object, value);
                        break;
                case 32:
                        value_object = json_object_object_get(config, "CroppingImage");
@@ -347,9 +347,15 @@ 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 7:
-                       value_object = json_object_object_get(config, "SkipBlankPages");
-                       _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
-                       break;
+                       value_object = json_object_object_get(config, "CroppingMode");
+                       _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
+
+                       value_object = json_object_object_get(config, "CroppingImage");
+                       _kds_s2000w_handler_opts_set_soft_select_cropping_image(value_object, value);
+
+                       if (info != NULL)
+                               *info = RELOAD_OPTIONS;
+               break;
                case 8:
                        value_object = json_object_object_get(config, "ColorDropOut");
                        _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
@@ -443,14 +449,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 31:
-                       value_object = json_object_object_get(config, "CroppingMode");
-                       _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
-
-                       value_object = json_object_object_get(config, "CroppingImage");
-                       _kds_s2000w_handler_opts_set_soft_select_cropping_image(value_object, value);
-
-                       if (info != NULL)
-                               *info = RELOAD_OPTIONS;
+                       value_object = json_object_object_get(config, "SkipBlankPages");
+                       _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
                        break;
                case 32:
                        value_object = json_object_object_get(config, "CroppingImage");

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 4f0925c8309af874382143b04f5f853b19bf6c2c..168624e83ca787554ce496e316facb9c1d83f968 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -1067,7 +1067,7 @@ void kds_s2000w_option_descriptors_init()
        descriptor_array[4] = _kds_s2000w_option_descriptor_dpi();
        descriptor_array[5] = _kds_s2000w_option_descriptor_scanside();
        descriptor_array[6] = _kds_s2000w_option_descriptor_geometry_group();
-       descriptor_array[7] = _kds_s2000w_option_descriptor_skip_blank_pages();
+       descriptor_array[7] = _kds_s2000w_option_descriptor_cropping_mode();
        descriptor_array[8] = _kds_s2000w_option_descriptor_color_drop();
        descriptor_array[9] = _kds_s2000w_option_descriptor_color_drop_out_aggressiveness();
        descriptor_array[10] = _kds_s2000w_option_descriptor_color_auto_brightness_mode();
@@ -1091,7 +1091,7 @@ void kds_s2000w_option_descriptors_init()
        descriptor_array[28] = _kds_s2000w_option_descriptor_jpeg_quality();
        descriptor_array[29] = _kds_s2000w_option_descriptor_document_feeder_timeout_response();
        descriptor_array[30] = _kds_s2000w_option_descriptor_hole_fill();
-       descriptor_array[31] = _kds_s2000w_option_descriptor_cropping_mode();
+       descriptor_array[31] =  _kds_s2000w_option_descriptor_skip_blank_pages();
        descriptor_array[32] = _kds_s2000w_option_descriptor_cropping_image();
        descriptor_array[33] = _kds_s2000w_option_descriptor_skip_blank_page_content();
        descriptor_array[34] = _kds_s2000w_option_descriptor_color_brightness();

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index 7e03bd2a0772029ba000afa6b5058f4430c73c80..f9fbdf3efef6044567266362e3e1bda454dc7af5 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -95,11 +95,11 @@ void sane_kds_s2000w_net_control_get_option_seven_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;
+       char value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 7, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_int_equal(value, 0);
+       assert_string_equal(value, "AutomaticStraighten");
 
        kds_s2000w_handler_free(h);
        h = NULL;
@@ -455,11 +455,11 @@ void sane_kds_s2000w_net_control_get_option_thirdyone_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};
+       int32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 31, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_string_equal(value, "AutomaticStraighten");
+       assert_int_equal(value, 0);
 
        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 b2363512ab20809d6b6bf2d900fc30a48e9930bc..30af5fe01d849b18060550675ac21f493f149c5f 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -138,14 +138,19 @@ void kds_s2000w_option_get_descriptor_seven_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(7);
 
-       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_string_equal("cropping-mode", option->name);
+       assert_string_equal("Cropping mode", option->title);
+       assert_string_equal("Cropping mode", option->desc);
+       assert_int_equal(SANE_TYPE_STRING, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
-       assert_int_equal(sizeof(SANE_Bool),  option->size);
+       assert_int_equal(sizeof(SANE_String_Const*) * 5, option->size);
        assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap);
-       assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type);
+       assert_int_equal(SANE_CONSTRAINT_STRING_LIST, option->constraint_type);
+       assert_string_equal("AutomaticStraighten", option->constraint.string_list[0]);
+       assert_string_equal("Automatic", option->constraint.string_list[1]);
+       assert_string_equal("Photograph", option->constraint.string_list[2]);
+       assert_string_equal("Manual", option->constraint.string_list[3]);
+       assert_null(option->constraint.string_list[4]);
 }
 
 void kds_s2000w_option_get_descriptor_eight_test()
@@ -566,19 +571,14 @@ void kds_s2000w_option_get_descriptor_thirdyone_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(31);
 
-       assert_string_equal("cropping-mode", option->name);
-       assert_string_equal("Cropping mode", option->title);
-       assert_string_equal("Cropping mode", option->desc);
-       assert_int_equal(SANE_TYPE_STRING, option->type);
+       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_String_Const*) * 5, option->size);
+       assert_int_equal(sizeof(SANE_Bool),  option->size);
        assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap);
-       assert_int_equal(SANE_CONSTRAINT_STRING_LIST, option->constraint_type);
-       assert_string_equal("AutomaticStraighten", option->constraint.string_list[0]);
-       assert_string_equal("Automatic", option->constraint.string_list[1]);
-       assert_string_equal("Photograph", option->constraint.string_list[2]);
-       assert_string_equal("Manual", option->constraint.string_list[3]);
-       assert_null(option->constraint.string_list[4]);
+       assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type);
 }
 
 void kds_s2000w_option_get_descriptor_thirdytwo_test()