Revert "load format per load color option"

This reverts commit 5d4e90030aee942cd6f489448fbe24be20b468bd.

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 72f002dc020cdc3b7723539eff4ea042f4516024..0d4754c81a28981da2327d818d7f471b0e2149d6 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -138,12 +138,6 @@ void kds_s2000w_handler_get_option(handler* h, int option, void* value)
                case 4:
                        value_object = json_object_object_get(config, "ColorMode");
                        _write_string_value(value_object, value);
-
-                       if (strcmp(value, "Color") == 0)
-                               h->current_metadata->format = 1;
-                       else
-                               h->current_metadata->format = 0;
-
                        break;
                case 5:
                        value_object = json_object_object_get(config, "SkipBlankPages");

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 5972e9d24c187771cd21c12dd3207eb62f7abeac..93c324c04b9f7767b3a324215dd198f994723eef 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -123,20 +123,10 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
 {
        debug_printf(ALL, "sane_kds_s2000w_net_get_parameters");
        handler* h = (handler*) handle;
-
-       metadata mdata;
-       memcpy(&mdata, h->current_metadata, sizeof(metadata));
-
-       params->format = mdata.format;
-       params->last_frame = mdata.is_last;
-       params->bytes_per_line = mdata.bytes_per_line;
-       params->pixels_per_line = mdata.pixels_per_line;
-       params->lines = mdata.lines;
-       params->depth = mdata.depth;
-
        if (!h->read_info->scan_started)
                return SANE_STATUS_GOOD;
 
+       metadata mdata;
        if (h->current_metadata->is_last) {
                memcpy(&mdata, h->current_metadata, sizeof(metadata));