change image offset x position

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 2a98d0de2433be491f5a481ac3968ec9a2e18364..b4d4c016b21a028cca3131658bb6e5453d01f4b3 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -167,7 +167,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 9:
-                       value_object = json_object_object_get(config, "ColorDropOutAggressiveness");
+                       value_object = json_object_object_get(config, "ImageOffsetX");
                        _kds_s2000w_handler_opts_write_int_value(value_object, value);
                        break;
                case 10:
@@ -283,7 +283,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 38:
-                       value_object = json_object_object_get(config, "ImageOffsetX");
+                       value_object = json_object_object_get(config, "ColorDropOutAggressiveness");
                        _kds_s2000w_handler_opts_write_int_value(value_object, value);
                        break;
                case 39:
@@ -361,7 +361,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 9:
-                       value_object = json_object_object_get(config, "ColorDropOutAggressiveness");
+                       value_object = json_object_object_get(config, "ImageOffsetX");
                        _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
                        break;
                case 10:
@@ -477,7 +477,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 38:
-                       value_object = json_object_object_get(config, "ImageOffsetX");
+                       value_object = json_object_object_get(config, "ColorDropOutAggressiveness");
                        _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
                        break;
                case 39:

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 31392a469c4a87d4b7b62ea3b7b7ee94e00942c6..b9a4d52990b762662ec6417e3e36bdfa7f5ff6b8 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -1069,7 +1069,7 @@ void kds_s2000w_option_descriptors_init()
        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_cropping_image();
-       descriptor_array[9] = _kds_s2000w_option_descriptor_color_drop_out_aggressiveness();
+       descriptor_array[9] = _kds_s2000w_option_descriptor_image_offset_x();
        descriptor_array[10] = _kds_s2000w_option_descriptor_color_auto_brightness_mode();
        descriptor_array[11] = _kds_s2000w_option_descriptor_color_sharpen();
        descriptor_array[12] = _kds_s2000w_option_descriptor_color_balance_mode();
@@ -1098,7 +1098,7 @@ void kds_s2000w_option_descriptors_init()
        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_color_contrast();
-       descriptor_array[38] = _kds_s2000w_option_descriptor_image_offset_x();
+       descriptor_array[38] = _kds_s2000w_option_descriptor_color_drop_out_aggressiveness();
        descriptor_array[39] = _kds_s2000w_option_descriptor_image_offset_y();
        descriptor_array[40] = _kds_s2000w_option_descriptor_image_width();
        descriptor_array[41] = _kds_s2000w_option_descriptor_image_height();

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index 5cebe22120a277f80c332200513549ebe1be3162..e93f261072c3bd7623432f940ae505ac5fb33d75 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -125,7 +125,7 @@ void sane_kds_s2000w_net_control_get_option_nine_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, 9, SANE_ACTION_GET_VALUE, &value, NULL);
 
@@ -560,7 +560,7 @@ void sane_kds_s2000w_net_control_get_option_thirdyeight_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, 38, SANE_ACTION_GET_VALUE, &value, NULL);
 

diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index 8c4cf590a8f7af42abd681aa2af9e2a95f404574..4b7ebce7f7a0bab04aca649a4f37613015f55898 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -174,17 +174,17 @@ void kds_s2000w_option_get_descriptor_nine_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(9);
 
-       assert_string_equal("colordropoutaggressiveness", option->name);
-       assert_string_equal("colordropoutaggressiveness", option->title);
-       assert_string_equal("colordropoutaggressiveness", option->desc);
+       assert_string_equal("image-offset-x", option->name);
+       assert_string_equal("Image offset x", option->title);
+       assert_string_equal("Image offset x", option->desc);
        assert_int_equal(SANE_TYPE_INT, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
-       assert_int_equal(sizeof(SANE_Int),  option->size);
+       assert_int_equal(sizeof(SANE_Int), option->size);
        assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap);
        assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type);
-       assert_int_equal(-10, option->constraint.range->min);
-       assert_int_equal(10, option->constraint.range->max);
-       assert_int_equal(1, option->constraint.range->quant);
+       assert_int_equal(option->constraint.range->min, 0);
+       assert_int_equal(option->constraint.range->max, 75);
+       assert_int_equal(option->constraint.range->quant, 1);
 }
 
 void kds_s2000w_option_get_descriptor_ten_test()
@@ -687,17 +687,17 @@ void kds_s2000w_option_get_descriptor_thirdyeight_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(38);
 
-       assert_string_equal("image-offset-x", option->name);
-       assert_string_equal("Image offset x", option->title);
-       assert_string_equal("Image offset x", option->desc);
+       assert_string_equal("colordropoutaggressiveness", option->name);
+       assert_string_equal("colordropoutaggressiveness", option->title);
+       assert_string_equal("colordropoutaggressiveness", option->desc);
        assert_int_equal(SANE_TYPE_INT, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
-       assert_int_equal(sizeof(SANE_Int), option->size);
+       assert_int_equal(sizeof(SANE_Int),  option->size);
        assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, 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, 75);
-       assert_int_equal(option->constraint.range->quant, 1);
+       assert_int_equal(-10, option->constraint.range->min);
+       assert_int_equal(10, option->constraint.range->max);
+       assert_int_equal(1, option->constraint.range->quant);
 }
 
 void kds_s2000w_option_get_descriptor_thirdynine_test()