diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
| commit | d087d778ffb62e2713cb848540bcc819470365bd (patch) | |
| tree | d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /backend/hpljm1005.c | |
| parent | c8bd2513ecba169cff44c09c8058c36987357b18 (diff) | |
| parent | 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/hpljm1005.c')
| -rw-r--r-- | backend/hpljm1005.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/backend/hpljm1005.c b/backend/hpljm1005.c index 9460c48..be3b8f4 100644 --- a/backend/hpljm1005.c +++ b/backend/hpljm1005.c @@ -1,6 +1,6 @@ /* sane - Scanner Access Now Easy. - Copyright (C) 2007-2008 Philippe Rétornaz + Copyright (C) 2007-2008 Philippe Rétornaz This file is part of the SANE package. @@ -41,7 +41,7 @@ If you do not wish that, delete this exception notice. This backend is for HP LaserJet M1005 MFP - + Highly inspired from the epson backend */ @@ -177,7 +177,7 @@ static int devlist_count; /* Number of element in the list */ /* * List of pointers to devices - will be dynamically allocated depending - * on the number of devices found. + * on the number of devices found. */ static SANE_Device **devlist = NULL; @@ -193,7 +193,7 @@ update_img_size (struct device_s *dev) { int dx, dy; - /* Only update the width when not scanning, + /* Only update the width when not scanning, * otherwise the scanner give us the correct width */ if (dev->status == STATUS_SCANNING) { @@ -235,7 +235,7 @@ update_img_size (struct device_s *dev) dev->height = round2 ((dy / ((double) MAX_Y_S)) * 14025); break; } - + DBG(2,"New image size: %dx%d\n",dev->width, dev->height); } @@ -990,8 +990,8 @@ sane_start (SANE_Handle h) } -static void -do_cancel(struct device_s *dev) +static void +do_cancel(struct device_s *dev) { while (get_data (dev) == SANE_STATUS_GOOD); free (dev->buffer); @@ -1064,7 +1064,7 @@ sane_read (SANE_Handle h, SANE_Byte * buf, SANE_Int maxlen, SANE_Int * len) } /* Special case where sane_cancel is called while scanning */ - if (dev->status == STATUS_CANCELING) + if (dev->status == STATUS_CANCELING) { do_cancel(dev); return SANE_STATUS_CANCELLED; @@ -1078,7 +1078,7 @@ sane_cancel (SANE_Handle h) struct device_s *dev = (struct device_s *) h; - if (dev->status == STATUS_SCANNING) + if (dev->status == STATUS_SCANNING) { dev->status = STATUS_CANCELING; return; @@ -1101,4 +1101,3 @@ sane_get_select_fd (SANE_Handle __sane_unused__ handle, { return SANE_STATUS_UNSUPPORTED; } - |