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

pixma_bjnp.c: fix regression in bjnp support

merge-requests/1/head
Louis Lagendijk 2014-02-11 21:46:49 +01:00
rodzic 74fd53f720
commit bd851f2a3e
1 zmienionych plików z 1 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
backend/pixma_bjnp.c
Wyświetl plik

@ -2220,7 +2220,7 @@ sanei_bjnp_read_bulk (SANE_Int dn, SANE_Byte * buffer, size_t * size)
(unsigned long) device[dn].scanner_data_left,
(unsigned long) device[dn].scanner_data_left ) );
do
while ( (recvd < requested) && !( device[dn].last_block && (device[dn].scanner_data_left == 0)) )
{
PDBG (bjnp_dbg
(LOG_DEBUG,
@ -2291,7 +2291,6 @@ sanei_bjnp_read_bulk (SANE_Int dn, SANE_Byte * buffer, size_t * size)
device[dn].scanner_data_left = device[dn].scanner_data_left - read_size;
recvd = recvd + read_size;
}
while ( (recvd < requested) && !( device[dn].last_block && (device[dn].scanner_data_left == 0)) );
PDBG (bjnp_dbg (LOG_DEBUG, "bjnp_read_bulk: %s: Returning %ld bytes, backend expexts %ld\n",
(recvd == *size)? "OK": "NOTICE",recvd, *size ) );
@ -2370,7 +2369,6 @@ sanei_bjnp_write_bulk (SANE_Int dn, const SANE_Byte * buffer, size_t * size)
/* we can expect data from the scanner */
device[dn].last_block = 0;
device[dn].blocksize = BJNP_BLOCKSIZE_START;
return SANE_STATUS_GOOD;
}