diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-15 11:29:05 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-15 11:29:05 +0200 |
| commit | 324a8a71bb7d9e4f8bc49b6bc47efaf9fb58282e (patch) | |
| tree | bd2d48a139bfbe869f4f49359b63097931a45e7b /backend/epson.c | |
| parent | 2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff) | |
| parent | 1edb02101a9306fc711cd422ed507d18165b1691 (diff) | |
Merge branch 'release/experimental/1.0.27-1_experimental1'experimental/1.0.27-1_experimental1
Diffstat (limited to 'backend/epson.c')
| -rw-r--r-- | backend/epson.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/backend/epson.c b/backend/epson.c index 6b111f2..3fc264f 100644 --- a/backend/epson.c +++ b/backend/epson.c @@ -4232,7 +4232,7 @@ SANE_Status sane_get_parameters (SANE_Handle handle, SANE_Parameters * params) { Epson_Scanner *s = (Epson_Scanner *) handle; - int ndpi, max_x, max_y; + int ndpi; int bytes_per_pixel; DBG (5, "sane_get_parameters()\n"); @@ -4270,8 +4270,6 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params) ndpi = s->val[OPT_RESOLUTION].w; - max_x = max_y = 0; - s->params.pixels_per_line = SANE_UNFIX (s->val[OPT_BR_X].w - s->val[OPT_TL_X].w) / 25.4 * ndpi + 0.5; s->params.lines = @@ -5271,7 +5269,6 @@ sane_read (SANE_Handle handle, SANE_Byte * data, SANE_Int max_length, int index = 0; SANE_Bool reorder = SANE_FALSE; SANE_Bool needStrangeReorder = SANE_FALSE; - int bytes_to_process = 0; START_READ: DBG (5, "sane_read: begin\n"); @@ -5447,9 +5444,7 @@ START_READ: reorder = SANE_TRUE; } - bytes_to_process = receive (s, s->buf, buf_len, &status); - - /* bytes_to_process = buf_len; */ + receive (s, s->buf, buf_len, &status); if (SANE_STATUS_GOOD != status) { |