summaryrefslogtreecommitdiff
path: root/backend/epson2.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-02-12 17:36:29 +0100
committerJörg Frings-Fürst <debian@jff.email>2023-02-12 17:36:29 +0100
commit882fd010527b8d8823f09e19edbed3746265fa08 (patch)
treebe5c7cace6697afc753c152d13ad5145d0884a42 /backend/epson2.c
parent527bedac30eb120915718eb7997e6dacd583512e (diff)
parente0d94cf4d39395df1e2c6bb4d967200298c13881 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/epson2.c')
-rw-r--r--backend/epson2.c17
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);