From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 16 Feb 2025 08:17:31 +0000 (+0100)
Subject: add image border option
X-Git-Tag: v1.1.0^2~4^2~35
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=42d387bed92666f810eb73e5c599a09c6b5bd27c;p=sane-kds-s2000w-net.git

add image border option
---

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index cb59652..3c7b0a6 100644
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -5,7 +5,7 @@
 #include "kds_s2000w_debug.h"
 
 #define AUTOSTART_ON 1
-#define OPTION_COUNT 27
+#define OPTION_COUNT 28
 
 void _kds_s2000w_handler_opts_write_string_value(json_object* value_object, void* value)
 {
@@ -217,6 +217,10 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value
 			value_object = json_object_object_get(config, "EdgeFill");
 			_kds_s2000w_handler_opts_write_string_value(value_object, value);
 			break;
+		case 26:
+			value_object = json_object_object_get(config, "ImageBorder");
+			_kds_s2000w_handler_opts_write_string_value(value_object, value);
+			break;
 		default:
 			break;
 	}
@@ -345,6 +349,10 @@ 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 26:
+			value_object = json_object_object_get(config, "ImageBorder");
+			_kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
+			break;
+		case 27:
 			_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 2fa02d9..30c700e 100644
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -22,7 +22,7 @@ void sane_kds_s2000w_net_control_get_option_zero_test(void** state)
 
 	sane_kds_s2000w_net_control_option(h, 0, SANE_ACTION_GET_VALUE, &value, NULL);
 
-	assert_int_equal(value, 27);
+	assert_int_equal(value, 28);
 
 	kds_s2000w_handler_free(h);
 	h = NULL;
@@ -370,6 +370,21 @@ void sane_kds_s2000w_net_control_get_option_twentyfive_test(void** state)
 
 	assert_string_equal(value, "Automatic");
 
+	kds_s2000w_handler_free(h);
+	h = NULL;
+}
+
+void sane_kds_s2000w_net_control_get_option_twentysix_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};
+
+	sane_kds_s2000w_net_control_option(h, 26, SANE_ACTION_GET_VALUE, &value, NULL);
+
+	assert_string_equal(value, "None");
+
 	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 7ada635..9decedb 100644
--- a/tests/kds_s2000w_net_get_opt_tests.h
+++ b/tests/kds_s2000w_net_get_opt_tests.h
@@ -30,5 +30,6 @@ void sane_kds_s2000w_net_control_get_option_twentytwo_test(void** state);
 void sane_kds_s2000w_net_control_get_option_twentythree_test(void** state);
 void sane_kds_s2000w_net_control_get_option_twentyfour_test(void** state);
 void sane_kds_s2000w_net_control_get_option_twentyfive_test(void** state);
+void sane_kds_s2000w_net_control_get_option_twentysix_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 73a61c1..d1c15db 100644
--- a/tests/kds_s2000w_net_get_opt_tests_run.c
+++ b/tests/kds_s2000w_net_get_opt_tests_run.c
@@ -99,7 +99,8 @@ int main()
 		cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentytwo_test, setup_default_get_option, teardown_default_get_option),
 		cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentythree_test, setup_default_get_option, teardown_default_get_option),
 		cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentyfour_test, setup_default_get_option, teardown_default_get_option),
-		cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentyfive_test, setup_default_get_option, teardown_default_get_option)
+		cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentyfive_test, setup_default_get_option, teardown_default_get_option),
+		cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentysix_test, setup_default_get_option, teardown_default_get_option)
 	};
 
 	return cmocka_run_group_tests(net_tests, NULL, NULL);