From: Bastian Dehn <hhaalo@arcor.de>
Date: Sat, 2 Mar 2024 07:03:35 +0000 (+0100)
Subject: move color to position three
X-Git-Tag: v1.0.0^2~145^2~2
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=998b6a6b8bd6b054aff84002e03c1d855b0e392f;p=sane-kds-s2000w-net.git

move color to position three
---

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 04978ed..07516a3 100644
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -131,22 +131,22 @@ void kds_s2000w_handler_get_option(handler* h, int option, void* value, int* inf
 			_write_string_value(value_object, value);
 			break;
 		case 3:
+			value_object = json_object_object_get(config, "ColorMode");
+			_write_string_value(value_object, value);
+			break;
+		case 4:
 			value_object = json_object_object_get(config, "DPI");
 			_write_int_value(value_object, value);
 			break;
-		case 4:
+		case 5:
 			value_object = json_object_object_get(config, "ScanSide");
 			_write_string_value(value_object, value);
 			break;
-		case 5:
+		case 6:
 			int depth = h->current_metadata->depth;
 			int* int_value = (int*) value;
 			*int_value = depth;
 			break;
-		case 7:
-			value_object = json_object_object_get(config, "ColorMode");
-			_write_string_value(value_object, value);
-			break;
 		case 8:
 			value_object = json_object_object_get(config, "SkipBlankPages");
 			_write_int_value(value_object, value);
@@ -249,20 +249,6 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf
 			_write_string_value_to_json(value_object, value);
 			break;
 		case 3:
-			value_object = json_object_object_get(config, "DPI");
-			_write_int_value_to_json(value_object, value);
-			break;
-		case 4:
-			value_object = json_object_object_get(config, "ScanSide");
-			_write_string_value_to_json(value_object, value);
-			value_object = NULL;
-			break;
-		case 5:
-			int* int_value = (int*) value;
-			h->current_metadata->depth = *int_value;
-			*info = RELOAD_PARAMS;
-			break;
-		case 7:
 			value_object = json_object_object_get(config, "ColorMode");
 			_write_string_value_to_json(value_object, value);
 			value_object = NULL;
@@ -283,6 +269,20 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf
 
 			*info |= RELOAD_PARAMS;
 
+			break;
+		case 4:
+			value_object = json_object_object_get(config, "DPI");
+			_write_int_value_to_json(value_object, value);
+			break;
+		case 5:
+			value_object = json_object_object_get(config, "ScanSide");
+			_write_string_value_to_json(value_object, value);
+			value_object = NULL;
+			break;
+		case 6:
+			int* int_value = (int*) value;
+			h->current_metadata->depth = *int_value;
+			*info = RELOAD_PARAMS;
 			break;
 		case 8:
 			value_object = json_object_object_get(config, "SkipBlankPages");
diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 1e6375c..4c44a60 100644
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -702,11 +702,11 @@ void kds_s2000w_option_descriptor_init_option_descriptors()
 	descriptor_array[0] = _kds_s2000w_option_descriptor_num_options();
 	descriptor_array[1] = _kds_s2000w_option_descriptor_standard_group();
 	descriptor_array[2] = _kds_s2000w_option_descriptor_scan_source();
-	descriptor_array[3] = _kds_s2000w_option_descriptor_dpi();
-	descriptor_array[4] = _kds_s2000w_option_descriptor_scanside();
-	descriptor_array[5] = _kds_s2000w_option_descriptor_depth();
-	descriptor_array[6] = _kds_s2000w_option_descriptor_geometry_group();
-	descriptor_array[7] = _kds_s2000w_option_descriptor_color_mode();
+	descriptor_array[3] = _kds_s2000w_option_descriptor_color_mode();
+	descriptor_array[4] = _kds_s2000w_option_descriptor_dpi();
+	descriptor_array[5] = _kds_s2000w_option_descriptor_scanside();
+	descriptor_array[6] = _kds_s2000w_option_descriptor_depth();
+	descriptor_array[7] = _kds_s2000w_option_descriptor_geometry_group();
 	descriptor_array[8] = _kds_s2000w_option_descriptor_skip_blank_pages();
 	descriptor_array[9] = _kds_s2000w_option_descriptor_auto_start();
 	descriptor_array[10] = _kds_s2000w_option_descriptor_color_drop();