mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Changed page scan end condition to handle correctly PIXMA ADF.

merge-requests/1/head
Nicolas Martin 2008-07-15 20:24:26 +00:00
rodzic 3fc582ce61
commit cc60422d01
2 zmienionych plików z 7 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
ChangeLog
Wyświetl plik

@ -1,3 +1,7 @@
2008-07-15 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c:
Changed page scan end condition to handle correctly PIXMA ADF.
2008-07-14 Julien Blache <jb@jblache.org>
* doc/*.man: Fix hyphen vs. minus sign issues in the manpages,
breaking copy/paste of command-lines and options in UTF-8

6
backend/pixma_mp150.c
Wyświetl plik

@ -1042,8 +1042,6 @@ mp150_fill_buffer (pixma_t * s, pixma_imagebuf_t * ib)
if ((mp->last_block & 0x28) == 0x28)
{
/* end of image */
if (mp->last_block != 0x38)
abort_session (s); /* FIXME: it probably doesn't work in duplex mode! */
mp->state = state_finished;
return 0;
}
@ -1102,6 +1100,8 @@ mp150_finish_scan (pixma_t * s)
PDBG (pixma_dbg (1, "WARNING:abort_session() failed %d\n", error));
/* fall through */
case state_finished:
if (mp->last_block != 0x38)
abort_session (s); /* FIXME: it probably doesn't work in duplex mode! */
mp->state = state_idle;
/* fall through */
case state_idle:
@ -1147,7 +1147,7 @@ static const pixma_scan_ops_t pixma_mp150_ops = {
#define DEVICE(name, pid, dpi, cap) { \
name, /* name */ \
CANON_VID, pid, /* vid pid */ \
CANON_VID, pid, /* vid pid */ \
0, /* iface */ \
&pixma_mp150_ops, /* ops */ \
dpi, 2*(dpi), /* xdpi, ydpi */ \