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

change gl841_detect_document_end byte to flush 

- use only signed variables so ther is no mixe with unsigned values
- break calculation in several steps
merge-requests/1/head
Stphane Voltz 2009-11-27 07:07:02 +01:00
rodzic 145045bf89
commit 09ec19e512
1 zmienionych plików z 13 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

19
backend/genesys_gl841.c
Wyświetl plik

@ -3927,8 +3927,8 @@ gl841_detect_document_end (Genesys_Device * dev)
{ {
SANE_Status status = SANE_STATUS_GOOD; SANE_Status status = SANE_STATUS_GOOD;
SANE_Bool paper_loaded; SANE_Bool paper_loaded;
unsigned int flines, channels, depth, bytes_remain, sublines, int flines, channels, depth, bytes_remain, sublines,
bytes_to_flush, lines, sub_bytes; bytes_to_flush, lines, sub_bytes, tmp, read_bytes_left;
DBG (DBG_proc, "%s: begin\n", __FUNCTION__); DBG (DBG_proc, "%s: begin\n", __FUNCTION__);
RIE (gl841_get_paper_sensor (dev, &paper_loaded)); RIE (gl841_get_paper_sensor (dev, &paper_loaded));
@ -3941,6 +3941,8 @@ gl841_detect_document_end (Genesys_Device * dev)
channels = dev->current_setup.channels; channels = dev->current_setup.channels;
depth = dev->current_setup.depth; depth = dev->current_setup.depth;
read_bytes_left = (int) dev->read_bytes_left;
DBG (DBG_io, "gl841_detect_document_end: read_bytes_left=%d\n", read_bytes_left);
/* adjust number of bytes to read /* adjust number of bytes to read
* we need to read the final bytes which are word per line * number of last lines * we need to read the final bytes which are word per line * number of last lines
@ -3954,9 +3956,14 @@ gl841_detect_document_end (Genesys_Device * dev)
bytes_to_flush = lines * dev->wpl; bytes_to_flush = lines * dev->wpl;
/* if we are already close to end of scan, flushing isn't needed */ /* if we are already close to end of scan, flushing isn't needed */
if (bytes_to_flush < dev->read_bytes_left) if (bytes_to_flush < read_bytes_left)
{ {
bytes_remain = dev->total_bytes_to_read - dev->total_bytes_read; /* we take all these step to work around an overflow on some plateforms */
tmp=(int)dev->total_bytes_read;
DBG (DBG_io, "gl841_detect_document_end: tmp=%d\n", tmp);
bytes_remain = (int)dev->total_bytes_to_read;
DBG (DBG_io, "gl841_detect_document_end: bytes_remain=%d\n", bytes_remain);
bytes_remain = bytes_remain - tmp;
DBG (DBG_io, "gl841_detect_document_end: bytes_remain=%d\n", bytes_remain); DBG (DBG_io, "gl841_detect_document_end: bytes_remain=%d\n", bytes_remain);
/* remaining lines to read by frontend for the current scan */ /* remaining lines to read by frontend for the current scan */
@ -3988,12 +3995,12 @@ gl841_detect_document_end (Genesys_Device * dev)
DBG (DBG_io, "gl841_detect_document_end: sublines=%d\n", sublines); DBG (DBG_io, "gl841_detect_document_end: sublines=%d\n", sublines);
DBG (DBG_io, "gl841_detect_document_end: subbytes=%d\n", sub_bytes); DBG (DBG_io, "gl841_detect_document_end: subbytes=%d\n", sub_bytes);
DBG (DBG_io, "gl841_detect_document_end: total_bytes_to_read=%d\n", dev->total_bytes_to_read); DBG (DBG_io, "gl841_detect_document_end: total_bytes_to_read=%d\n", dev->total_bytes_to_read);
DBG (DBG_io, "gl841_detect_document_end: read_bytes_left=%d\n", dev->read_bytes_left); DBG (DBG_io, "gl841_detect_document_end: read_bytes_left=%d\n", read_bytes_left);
dev->total_bytes_to_read -= sub_bytes; dev->total_bytes_to_read -= sub_bytes;
/* then adjust the physical bytes to read */ /* then adjust the physical bytes to read */
if(dev->read_bytes_left>sub_bytes) if(read_bytes_left>sub_bytes)
{ {
dev->read_bytes_left -= sub_bytes; dev->read_bytes_left -= sub_bytes;
} }