change position crop image

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 55b51f7b5d07ca0de59f856c18222f3911f687cd..2a98d0de2433be491f5a481ac3968ec9a2e18364 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -163,7 +163,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 8:
-                       value_object = json_object_object_get(config, "ColorDropOut");
+                       value_object = json_object_object_get(config, "CroppingImage");
                        _kds_s2000w_handler_opts_write_string_value(value_object, value);
                        break;
                case 9:
@@ -259,7 +259,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 32:
-                       value_object = json_object_object_get(config, "CroppingImage");
+                       value_object = json_object_object_get(config, "ColorDropOut");
                        _kds_s2000w_handler_opts_write_string_value(value_object, value);
                        break;
                case 33:
@@ -357,7 +357,7 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value
                                *info = RELOAD_OPTIONS;
                break;
                case 8:
-                       value_object = json_object_object_get(config, "ColorDropOut");
+                       value_object = json_object_object_get(config, "CroppingImage");
                        _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
                        break;
                case 9:
@@ -453,7 +453,7 @@ 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 32:
-                       value_object = json_object_object_get(config, "CroppingImage");
+                       value_object = json_object_object_get(config, "ColorDropOut");
                        _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
                        break;
                case 33:

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 168624e83ca787554ce496e316facb9c1d83f968..31392a469c4a87d4b7b62ea3b7b7ee94e00942c6 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -1068,7 +1068,7 @@ void kds_s2000w_option_descriptors_init()
        descriptor_array[5] = _kds_s2000w_option_descriptor_scanside();
        descriptor_array[6] = _kds_s2000w_option_descriptor_geometry_group();
        descriptor_array[7] = _kds_s2000w_option_descriptor_cropping_mode();
-       descriptor_array[8] = _kds_s2000w_option_descriptor_color_drop();
+       descriptor_array[8] = _kds_s2000w_option_descriptor_cropping_image();
        descriptor_array[9] = _kds_s2000w_option_descriptor_color_drop_out_aggressiveness();
        descriptor_array[10] = _kds_s2000w_option_descriptor_color_auto_brightness_mode();
        descriptor_array[11] = _kds_s2000w_option_descriptor_color_sharpen();
@@ -1091,8 +1091,8 @@ 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_skip_blank_pages();
-       descriptor_array[32] = _kds_s2000w_option_descriptor_cropping_image();
+       descriptor_array[31] = _kds_s2000w_option_descriptor_skip_blank_pages();
+       descriptor_array[32] = _kds_s2000w_option_descriptor_color_drop();
        descriptor_array[33] = _kds_s2000w_option_descriptor_skip_blank_page_content();
        descriptor_array[34] = _kds_s2000w_option_descriptor_color_brightness();
        descriptor_array[35] = _kds_s2000w_option_descriptor_max_document_length();

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index f9fbdf3efef6044567266362e3e1bda454dc7af5..5cebe22120a277f80c332200513549ebe1be3162 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -114,7 +114,7 @@ void sane_kds_s2000w_net_control_get_option_eight_test(void** state)
 
        sane_kds_s2000w_net_control_option(h, 8, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_string_equal(value, "None");
+       assert_string_equal(value, "EntireDocument");
 
        kds_s2000w_handler_free(h);
        h = NULL;
@@ -474,7 +474,7 @@ void sane_kds_s2000w_net_control_get_option_thirdytwo_test(void** state)
 
        sane_kds_s2000w_net_control_option(h, 32, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_string_equal(value, "EntireDocument");
+       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 30af5fe01d849b18060550675ac21f493f149c5f..8c4cf590a8f7af42abd681aa2af9e2a95f404574 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -157,23 +157,17 @@ void kds_s2000w_option_get_descriptor_eight_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(8);
 
-       assert_string_equal("colordrop", option->name);
-       assert_string_equal("colordrop", option->title);
-       assert_string_equal("colordrop", option->desc);
+       assert_string_equal("cropping-image", option->name);
+       assert_string_equal("Cropping image", option->title);
+       assert_string_equal("Cropping image", 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*) * 9,  option->size);
+       assert_int_equal(sizeof(SANE_String_Const*) * 3, 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("None", option->constraint.string_list[0]);
-       assert_string_equal("Red", option->constraint.string_list[1]);
-       assert_string_equal("Green", option->constraint.string_list[2]);
-       assert_string_equal("Blue", option->constraint.string_list[3]);
-       assert_string_equal("Orange", option->constraint.string_list[4]);
-       assert_string_equal("OrangeAndRed", option->constraint.string_list[5]);
-       assert_string_equal("Predominant", option->constraint.string_list[6]);
-       assert_string_equal("Multiple", option->constraint.string_list[7]);
-       assert_null(option->constraint.string_list[8]);
+       assert_string_equal("EntireDocument", option->constraint.string_list[0]);
+       assert_string_equal("PartialDocument", option->constraint.string_list[1]);
+       assert_null(option->constraint.string_list[2]);
 }
 
 void kds_s2000w_option_get_descriptor_nine_test()
@@ -585,17 +579,23 @@ void kds_s2000w_option_get_descriptor_thirdytwo_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(32);
 
-       assert_string_equal("cropping-image", option->name);
-       assert_string_equal("Cropping image", option->title);
-       assert_string_equal("Cropping image", option->desc);
+       assert_string_equal("colordrop", option->name);
+       assert_string_equal("colordrop", option->title);
+       assert_string_equal("colordrop", 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*) * 3, option->size);
+       assert_int_equal(sizeof(SANE_String_Const*) * 9,  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("EntireDocument", option->constraint.string_list[0]);
-       assert_string_equal("PartialDocument", option->constraint.string_list[1]);
-       assert_null(option->constraint.string_list[2]);
+       assert_string_equal("None", option->constraint.string_list[0]);
+       assert_string_equal("Red", option->constraint.string_list[1]);
+       assert_string_equal("Green", option->constraint.string_list[2]);
+       assert_string_equal("Blue", option->constraint.string_list[3]);
+       assert_string_equal("Orange", option->constraint.string_list[4]);
+       assert_string_equal("OrangeAndRed", option->constraint.string_list[5]);
+       assert_string_equal("Predominant", option->constraint.string_list[6]);
+       assert_string_equal("Multiple", option->constraint.string_list[7]);
+       assert_null(option->constraint.string_list[8]);
 }
 
 void kds_s2000w_option_get_descriptor_thirdythree_test()