diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2023-02-12 17:35:53 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2023-02-12 17:35:53 +0100 |
commit | 84357741a6a6e6430f199b2c3f7498e0e97da9ad (patch) | |
tree | 23e8d66ede9506b94c76fb36910ca3c7dd15c74e /backend/epson2.c | |
parent | 302276dc1b90cfc972fb726ca94a23b18f4b0088 (diff) |
New upstream version 1.2.1upstream/1.2.1upstream
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); |