add group image processing options

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 1806d0e7b35ad2f6cf92ef31253f4b65b5d90ea4..fa36f030c470c3d50666ac1f68581ce11db67848 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -6,7 +6,7 @@
 #include "kds_s2000w_debug.h"
 
 #define AUTOSTART_ON 1
-#define OPTION_COUNT 45
+#define OPTION_COUNT 46
 
 void _kds_s2000w_handler_opts_write_string_value(json_object* value_object, void* value)
 {

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 0da45177f640bb23338d7517b74cf7caa0ac6985..01da38993e08d948fefab7b7edd411e7d216130e 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -4,7 +4,7 @@
 #include "kds_s2000w_option_descriptors.h"
 #include "kds_s2000w_debug.h"
 
-#define MAX_OPTION_COUNT 45
+#define MAX_OPTION_COUNT 46
 
 SANE_Option_Descriptor* descriptor_array = NULL;
 
@@ -1073,6 +1073,24 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_boldness_color_group()
        return descriptor;
 }
 
+SANE_Option_Descriptor _kds_s2000w_option_descriptor_image_processing_group()
+{
+       kds_s2000w_debug_printf(ALL, "kds_s2000w_option_descriptor_image_processing_group");
+
+       SANE_Option_Descriptor descriptor = {
+               "image-processing-options",
+               "Image Processing Options",
+               "Image Processing Options",
+               SANE_TYPE_GROUP,
+               SANE_UNIT_NONE,
+               0,
+               SANE_CAP_SOFT_DETECT,
+               SANE_CONSTRAINT_NONE
+       };
+
+       return descriptor;
+}
+
 void kds_s2000w_option_descriptors_init()
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_option_descriptor_init_option_descriptors");
@@ -1123,6 +1141,7 @@ void kds_s2000w_option_descriptors_init()
        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[45] = _kds_s2000w_option_descriptor_image_processing_group();
 }
 
 void kds_s2000w_option_descriptors_free()

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index 8d630713b4dc83aefc93a34882f59da9e7775ecf..1bfa8f2590e081ab9bc13f78e8e4d69e217c3338 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -7,7 +7,7 @@
 #include "../src/kds_s2000w_net.h"
 #include "../src/kds_s2000w_handler.h"
 
-#define MAX_OPTION_COUNT 45
+#define MAX_OPTION_COUNT 46
 
 void sane_kds_s2000w_net_control_get_option_zero_test(void** state)
 {

diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index 42be273bc7cdbe787d40d137ab3a8405d076a7dc..a71e4772a49930f495203d2b4354db8b6891f75c 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -4,7 +4,7 @@
 #include "kds_s2000w_client_mock.h"
 #include "../src/kds_s2000w_option_descriptors.h"
 
-#define MAX_OPTION_COUNT 45
+#define MAX_OPTION_COUNT 46
 
 int setup(void** state)
 {
@@ -704,7 +704,6 @@ void kds_s2000w_option_get_descriptor_thirdynine_test()
        assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type);
 }
 
-
 void kds_s2000w_option_get_descriptor_fourty_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(40);
@@ -794,6 +793,20 @@ void kds_s2000w_option_get_descriptor_fourtyfour_test()
        assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type);
 }
 
+void kds_s2000w_option_get_descriptor_fourtyfive_test()
+{
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(45);
+
+       assert_string_equal("image-processing-options", option->name);
+       assert_string_equal("Image Processing Options", option->title);
+       assert_string_equal("Image Processing Options", option->desc);
+       assert_int_equal(SANE_TYPE_GROUP, option->type);
+       assert_int_equal(SANE_UNIT_NONE, option->unit);
+       assert_int_equal(0,  option->size);
+       assert_int_equal(SANE_CAP_SOFT_DETECT, option->cap);
+       assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type);
+}
+
 void kds_s2000w_option_get_descriptor_get_by_name_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_name("config-reset");

diff --git a/tests/kds_s2000w_option_descriptor_tests.h b/tests/kds_s2000w_option_descriptor_tests.h
index f101d01d4cfbe10909cf40606f4c3dde3fbd4fb2..446bbb7a2980a39303f9fa215f61a4480b15ba6d 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.h
+++ b/tests/kds_s2000w_option_descriptor_tests.h
@@ -53,6 +53,7 @@ void kds_s2000w_option_get_descriptor_fourtyone_test();
 void kds_s2000w_option_get_descriptor_fourtytwo_test();
 void kds_s2000w_option_get_descriptor_fourtythree_test();
 void kds_s2000w_option_get_descriptor_fourtyfour_test();
+void kds_s2000w_option_get_descriptor_fourtyfive_test();
 void kds_s2000w_option_get_descriptor_get_by_name_test();
 void kds_s2000w_option_get_descriptor_over_max_options_test();
 #endif
\ No newline at end of file

diff --git a/tests/kds_s2000w_option_descriptor_tests_run.c b/tests/kds_s2000w_option_descriptor_tests_run.c
index cb8672e014b513779e663065013425849094dda3..39bf44a4bbb8ecce4cce6f5fec3b5c1266b9598f 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests_run.c
+++ b/tests/kds_s2000w_option_descriptor_tests_run.c
@@ -48,6 +48,7 @@ int main()
                cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtytwo_test, setup, teardown),
                cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtythree_test, setup, teardown),
                cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyfour_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyfive_test, setup, teardown),
                cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_get_by_name_test, setup, teardown),
                cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_over_max_options_test, setup, teardown),
        };