remove channels from handler

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index 19ee7347c7c2792e4d90cc345fb55f2bc647c92d..26f1d2f1e01504dccb87f95b99246fbfb650a307 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -23,6 +23,8 @@ void _get_current_metadata(handler* h)
        const char* color_value = json_object_get_string(metadata);
        blobdata* image = (blobdata*) h->image;
        blobdata* scanner_image = malloc(sizeof(blobdata));
+       int channels = 1;
+
        scanner_image->data = malloc(sizeof(char) *  image->size);
        scanner_image->size = image->size;
        memcpy(scanner_image->data,  image->data,  image->size);
@@ -31,7 +33,6 @@ void _get_current_metadata(handler* h)
        image->data = 0;
 
        h->current_metadata->valid = 0;
-       h->current_metadata->channels = 1;
 
        if (strcmp(color_value, "Color") == 0)
                h->current_metadata->format = 1;
@@ -43,7 +44,7 @@ void _get_current_metadata(handler* h)
                h->current_metadata->format = 0;
 
        if (h->current_metadata->format == 1)
-               h->current_metadata->channels = 3;
+               channels = 3;
 
        kds_s2000w_metadata_from_image(scanner_image, mdata);
        h->current_metadata->depth = mdata->depth;
@@ -62,9 +63,9 @@ void _get_current_metadata(handler* h)
 #endif
 
        if (h->current_metadata->depth == 1)
-               h->current_metadata->bytes_per_line = h->current_metadata->channels * floor((h->current_metadata->pixels_per_line + 7) / 8);
+               h->current_metadata->bytes_per_line = channels * floor((h->current_metadata->pixels_per_line + 7) / 8);
        else
-               h->current_metadata->bytes_per_line = h->current_metadata->channels * h->current_metadata->pixels_per_line * h->current_metadata->depth / 8;
+               h->current_metadata->bytes_per_line = channels * h->current_metadata->pixels_per_line * h->current_metadata->depth / 8;
 
        h->current_metadata->valid = 1;
        
@@ -177,7 +178,6 @@ handler* init_handler()
        h->current_scan_status->complete_scanned = 0;
        h->current_scan_status->feeder = 1;
        h->current_metadata->format = 1;
-       h->current_metadata->channels = 3;
        h->current_metadata->bytes_per_line = 0;
        h->current_metadata->pixels_per_line = 0;
        h->current_metadata->lines = 0;
@@ -233,7 +233,6 @@ void reset_handler(handler* h)
        h->current_scan_status->downloaded_images = 0;
        h->current_scan_status->complete_scanned = 0;
        h->current_metadata->format = 1;
-       h->current_metadata->channels = 3;
        h->current_metadata->bytes_per_line = 0;
        h->current_metadata->pixels_per_line = 0;
        h->current_metadata->lines = 0;

diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index bb06a8276a9b0443a8b78356d080a636cd277bf9..bb6d4bfca184f1abb00c7833bd4d8a58874dde03 100644 (file)
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -20,7 +20,6 @@ typedef struct {
 
 typedef struct {
        int format;
-       int channels;
        int bytes_per_line;
        int pixels_per_line;
        int lines;

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 934ffa2241f54f8427f6948318e920003f882b41..c00736781a4813856c817d201aaa1ee4985e0033 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -93,7 +93,6 @@ void _set_option_to_default(handler* h)
        capabilities = NULL;
 
        h->current_metadata->format = 1;
-       h->current_metadata->channels = 3;
        h->current_metadata->depth = 8;
 }
 
@@ -265,15 +264,12 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf
                        char* str_Value = (char*) value;
                        if (strcmp(str_Value, "Color") == 0) {
                                h->current_metadata->format = 1;
-                               h->current_metadata->channels = 3;
                                h->current_metadata->depth = 8;
                        } else if (strcmp(str_Value, "Gray") == 0) {
                                h->current_metadata->format = 0;
-                               h->current_metadata->channels = 1;
                                h->current_metadata->depth = 8;
                        } else {
                                h->current_metadata->format = 0;
-                               h->current_metadata->channels = 1;
                                h->current_metadata->depth = 1;
                        }
 

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index bc8a67e3f162f1d667cd3e5565d6aaed2d9b8527..84d19f6327f8ecb771271db96d330ce382f55c85 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -166,7 +166,6 @@ void sane_kds_s2000w_net_start(void** state)
        assert_int_equal(result, SANE_STATUS_GOOD);
        assert_int_equal(h->current_scan_status->complete_scanned, 0);
        assert_int_equal(h->current_metadata->depth, 8);
-       assert_int_equal(h->current_metadata->channels, 3);
        assert_int_equal(h->current_metadata->format, 1);
        assert_int_equal(h->current_metadata->pixels_per_line, 2);
        assert_int_equal(h->current_metadata->lines, 1);
@@ -235,7 +234,6 @@ void sane_kds_s2000w_net_start_one_page_per_flatscan(void** state)
        assert_int_equal(result, SANE_STATUS_GOOD);
        assert_int_equal(h->current_scan_status->complete_scanned, 0);
        assert_int_equal(h->current_metadata->depth, 8);
-       assert_int_equal(h->current_metadata->channels, 3);
        assert_int_equal(h->current_metadata->format, 1);
        assert_int_equal(h->current_metadata->pixels_per_line, 2);
        assert_int_equal(h->current_metadata->lines, 1);
@@ -307,7 +305,6 @@ void sane_kds_s2000w_net_start_one_page_per_feeder(void** state)
        assert_int_equal(result, SANE_STATUS_GOOD);
        assert_int_equal(h->current_scan_status->complete_scanned, 1);
        assert_int_equal(h->current_metadata->depth, 8);
-       assert_int_equal(h->current_metadata->channels, 3);
        assert_int_equal(h->current_metadata->format, 1);
        assert_int_equal(h->current_metadata->pixels_per_line, 2);
        assert_int_equal(h->current_metadata->lines, 1);
@@ -409,7 +406,6 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder(void** state)
        assert_int_equal(result, SANE_STATUS_GOOD);
        assert_int_equal(h->current_scan_status->complete_scanned, 1);
        assert_int_equal(h->current_metadata->depth, 8);
-       assert_int_equal(h->current_metadata->channels, 3);
        assert_int_equal(h->current_metadata->format, 1);
        assert_int_equal(h->current_metadata->pixels_per_line, 2);
        assert_int_equal(h->current_metadata->lines, 1);
@@ -510,7 +506,6 @@ void sane_kds_s2000w_net_start_slow_two_pages_per_feeder(void** state)
        assert_int_equal(result, SANE_STATUS_GOOD);
        assert_int_equal(h->current_scan_status->complete_scanned, 1);
        assert_int_equal(h->current_metadata->depth, 8);
-       assert_int_equal(h->current_metadata->channels, 3);
        assert_int_equal(h->current_metadata->format, 1);
        assert_int_equal(h->current_metadata->pixels_per_line, 2);
        assert_int_equal(h->current_metadata->lines, 1);