Patch from Sam Varshavchik to deal with libusb 64 read issue, for ImageClass MFPs.

merge-requests/1/head
Nicolas Martin 2008-06-25 20:54:16 +00:00
rodzic f3ed5342cc
commit 7ef8119579
3 zmienionych plików z 7 dodań i 2 usunięć

Wyświetl plik

@ -1,3 +1,8 @@
2008-06-25 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_imageclass.c:
Patch from Sam Varshavchik to deal with libusb 64 read issue,
for ImageClass MFPs.
2008-06-24 m. allan noah <kitno455 a t gmail d o t com>
* backend/fujitsu.[ch], backend/fujitsu-scsi.h,
doc/descriptions/fujitsu.desc, doc/sane-fujitsu.man:

Wyświetl plik

@ -255,7 +255,7 @@ read_image_block (pixma_t * s, uint8_t * data, unsigned size)
if (size >= MAX_CHUNK_SIZE)
chunksize = MAX_CHUNK_SIZE;
else if (size < MIN_CHUNK_SIZE)
chunksize = MIN_CHUNK_SIZE;
chunksize = size;
else
chunksize = size - (size % MIN_CHUNK_SIZE);
error = pixma_read (s->io, data, chunksize);

Wyświetl plik

@ -235,7 +235,7 @@ map_error (SANE_Status ss)
case SANE_STATUS_NO_DOCS:
return PIXMA_ENO_PAPER;
case SANE_STATUS_EOF:
case SANE_STATUS_HW_LOCKED: /* unused by pixma */
case SANE_STATUS_HW_LOCKED: /* unused by pixma */
case SANE_STATUS_WARMING_UP: /* unused by pixma */
break;
}