mapping data for image one

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index 11d5d4e54f0623ea66dc22065f186e16d8ce7662..ded8c3d4fa41d00fdb44e72f65b9a54d9f88bf73 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -486,6 +486,10 @@ metadata kds_s2000w_handler_get_parameters(int image_number)
        mdata.size = json_object_get_int(mdata_value);
        mdata_value = NULL;
 
+       mdata_value = json_object_object_get(metadata, "ImageWidth");
+       mdata.pixels_per_line = json_object_get_int(mdata_value);
+       mdata_value = NULL;
+
        mdata_value = json_object_object_get(metadata, "ImageHeight");
        mdata.lines = json_object_get_int(mdata_value);
        mdata_value = NULL;

diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index bf20fc52ffd512339811466d1af02cfa1db64702..d1a181b7b334ecdcc58ae3ab2589a92c611cf3c9 100644 (file)
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -20,6 +20,7 @@ typedef struct {
        int is_last;
        int size;
        int bytes_per_line;
+       int pixels_per_line;
        int lines;
        int depth;
        int valid;

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 8d4a633020b5c433ca9c57c66be1a978bd3bddc9..def8c8412f1062b78231e19cb7de34f3f2a5ab0f 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -179,12 +179,12 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
                sleep(1);
        }
 
-       params->format = SANE_FRAME_GRAY;
-       params->last_frame = SANE_FALSE;
-       params->bytes_per_line = 256;
-       params->pixels_per_line = 0;
-       params->lines = 0;
-       params->depth = 8;
+       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;
 
        return SANE_STATUS_UNSUPPORTED;
 }