add option for image height

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index b456e6417ef4da4110b34c1a3d73f0de1ae59840..939e880b15adce195be022e398f1ee7319ec511c 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 42
+#define OPTION_COUNT 43
 
 void _kds_s2000w_handler_opts_write_string_value(json_object* value_object, void* value)
 {
@@ -294,6 +294,10 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value
                        value_object = json_object_object_get(config, "ImageWidth");
                        _kds_s2000w_handler_opts_write_int_value(value_object, value);
                        break;
+               case 41:
+                       value_object = json_object_object_get(config, "ImageHeight");
+                       _kds_s2000w_handler_opts_write_int_value(value_object, value);
+                       break;
                default:
                        break;
        }
@@ -485,6 +489,10 @@ 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 41:
+                       value_object = json_object_object_get(config, "ImageHeight");
+                       _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
+                       break;
+               case 42:
                        _kds_s2000w_handler_opts_set_option_to_default(h);
                        _kds_s2000w_handler_opts_set_autostart_on(h);
 

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index 1e9eccbe53940e48b26925566d793c2360702058..436c496e3211797f2918e6269700de334d9bf768 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 42
+#define MAX_OPTION_COUNT 43
 
 void sane_kds_s2000w_net_control_get_option_zero_test(void** state)
 {
@@ -596,6 +596,21 @@ void sane_kds_s2000w_net_control_get_option_fourty_test(void** state)
 
        assert_int_equal(value, 10);
 
+       kds_s2000w_handler_free(h);
+       h = NULL;
+}
+
+void sane_kds_s2000w_net_control_get_option_fourtyone_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;
+
+       sane_kds_s2000w_net_control_option(h, 41, SANE_ACTION_GET_VALUE, &value, NULL);
+
+       assert_int_equal(value, 10);
+
        kds_s2000w_handler_free(h);
        h = NULL;
 }
\ No newline at end of file

diff --git a/tests/kds_s2000w_net_get_opt_tests.h b/tests/kds_s2000w_net_get_opt_tests.h
index e8daec14add41271301484e295a40791e43e034c..70481079bd4751035abe771050c044e8011d1954 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.h
+++ b/tests/kds_s2000w_net_get_opt_tests.h
@@ -45,5 +45,6 @@ void sane_kds_s2000w_net_control_get_option_thirdyseven_test(void** state);
 void sane_kds_s2000w_net_control_get_option_thirdyeight_test(void** state);
 void sane_kds_s2000w_net_control_get_option_thirdynine_test(void** state);
 void sane_kds_s2000w_net_control_get_option_fourty_test(void** state);
+void sane_kds_s2000w_net_control_get_option_fourtyone_test(void** state);
 
 #endif
\ No newline at end of file

diff --git a/tests/kds_s2000w_net_get_opt_tests_run.c b/tests/kds_s2000w_net_get_opt_tests_run.c
index d58a5d5e93f7cdcff263170e5ff7ff42b43d30eb..3e06910954bf846ef4803fd104a56ab1b9d4978b 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests_run.c
+++ b/tests/kds_s2000w_net_get_opt_tests_run.c
@@ -118,7 +118,8 @@ int main()
                cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdyseven_test, setup_default_get_option, teardown_default_get_option),
                cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdyeight_test, setup_default_get_option, teardown_default_get_option),
                cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdynine_test, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourty_test, setup_default_get_option, teardown_default_get_option)
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourty_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtyone_test, setup_default_get_option, teardown_default_get_option)
        };
 
        return cmocka_run_group_tests(net_tests, NULL, NULL);