change enable cropping image from config

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 19cf5c8f91b22cccbf528947aec3df7ba45408be..55970779791079c67a1d694a7b3ad378fa10d574 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -96,18 +96,22 @@ void _kds_s2000w_handler_opts_set_options(handler* h)
        resp = NULL;
 }
 
-void _kds_s2000w_handler_opts_set_soft_select_cropping_image(json_object* value_object, void* value)
+void _kds_s2000w_handler_opts_set_enable_cropping_image(json_object* config)
 {
+       json_object* cropping_mode = json_object_object_get(config, "CroppingMode");
+       const char* cropping_mode_value = json_object_get_string(cropping_mode);
+
+       json_object* copping_image = json_object_object_get(config, "CroppingImage");
        SANE_Option_Descriptor* cropping_image = kds_s2000w_option_descriptors_get_by_name("cropping-image");
 
        cropping_image->cap |= SANE_CAP_SOFT_SELECT;
-       if (strcmp(value, "Automatic") == 0) {
-               _kds_s2000w_handler_opts_write_string_value_to_json(value_object, "EntireDocument");
+       if (strcmp(cropping_mode_value, "Automatic") == 0) {
+               _kds_s2000w_handler_opts_write_string_value_to_json(copping_image, "EntireDocument");
                cropping_image->cap &= ~SANE_CAP_SOFT_SELECT;
        }
 
-       if (strcmp(value, "Manual") == 0) {
-               _kds_s2000w_handler_opts_write_string_value_to_json(value_object, "PartialDocument");
+       if (strcmp(cropping_mode_value, "Manual") == 0) {
+               _kds_s2000w_handler_opts_write_string_value_to_json(copping_image, "PartialDocument");
                cropping_image->cap &= ~SANE_CAP_SOFT_SELECT;
        }
 }
@@ -349,9 +353,7 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value
                case 7:
                        value_object = json_object_object_get(config, "CroppingMode");
                        _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
-
-                       value_object = json_object_object_get(config, "CroppingImage");
-                       _kds_s2000w_handler_opts_set_soft_select_cropping_image(value_object, value);
+                       _kds_s2000w_handler_opts_set_enable_cropping_image(config);
 
                        if (info != NULL)
                                *info = RELOAD_OPTIONS;