diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2023-02-16 10:20:08 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2023-02-16 10:20:08 +0100 |
| commit | 778ebf8ee9cb22ea5727844333bcd5a6ee6bc0de (patch) | |
| tree | a754e785b286ed82b45fe4e50b980714ad80e0a7 /backend/epson2.c | |
| parent | 7d8aac1f3634dc58785bec7acf097dd6bac8c394 (diff) | |
| parent | 32cb765f681299af226ca0520993cbe47ba5ecd0 (diff) | |
Merge branch 'release/debian/1.2.1-1'debian/1.2.1-1
Diffstat (limited to 'backend/epson2.c')
| -rw-r--r-- | backend/epson2.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/backend/epson2.c b/backend/epson2.c index 5bb75d4..cfc2aca 100644 --- a/backend/epson2.c +++ b/backend/epson2.c @@ -2297,21 +2297,6 @@ sane_start(SANE_Handle handle) return status; } -static inline int -get_color(int status) -{ - switch ((status >> 2) & 0x03) { - case 1: - return 1; - case 2: - return 0; - case 3: - return 2; - default: - return 0; /* required to make the compiler happy */ - } -} - /* this moves data from our buffers to SANE */ SANE_Status @@ -2348,7 +2333,7 @@ sane_read(SANE_Handle handle, SANE_Byte *data, SANE_Int max_length, /* XXX if FS G and STATUS_IOERR, use e2_check_extended_status */ DBG(18, "moving data %p %p, %d (%d lines)\n", - s->ptr, s->end, + (void *) s->ptr, (void *) s->end, max_length, max_length / s->params.bytes_per_line); e2_copy_image_data(s, data, max_length, length); |