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

pixma: fix pixma backend bug for compilation with USE_PTHREAD/-lpthread 

backend/pixma_mp150.c: correctly reset state to idle at end of scan, as threading
                       will use the same address space and variables between pages.
merge-requests/1/head
Nicolas Martin 2009-12-04 22:52:16 +01:00
rodzic f28ae7bbaa
commit eb66f734ba
2 zmienionych plików z 5 dodań i 1 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 @@
2009-12-04 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c:
pixma: fix pixma backend bug for compilation with USE_PTHREAD/-lpthread
2009-12-01 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys_gl841.c: take amount of data in scanner's buffer
into account when detecting end of document

2
backend/pixma_mp150.c
Wyświetl plik

@ -1424,7 +1424,6 @@ mp150_finish_scan (pixma_t * s)
error = abort_session (s); /* FIXME: it probably doesn't work in duplex mode! */
if (error < 0)
PDBG (pixma_dbg (1, "WARNING:abort_session() failed %d\n", error));
mp->state = state_idle;
/* Generation 4: send XML end of scan dialog */
if (mp->generation == 4)
@ -1433,6 +1432,7 @@ mp150_finish_scan (pixma_t * s)
PDBG (pixma_dbg (1, "WARNING:XML_END dialog failed \n"));
}
}
mp->state = state_idle;
/* fall through */
case state_idle:
break;