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

Merge branch 'genesys'

merge-requests/1/head
Stphane Voltz 2009-12-01 21:47:36 +01:00
rodzic 2dfb35c7b6 56ade2e8c5
commit f28ae7bbaa
1 zmienionych plików z 12 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
backend/genesys_gl841.c
Wyświetl plik

@ -3927,6 +3927,7 @@ 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 words = 0;
int flines, channels, depth, bytes_remain, sublines, int flines, channels, depth, bytes_remain, sublines,
bytes_to_flush, lines, sub_bytes, tmp, read_bytes_left; bytes_to_flush, lines, sub_bytes, tmp, read_bytes_left;
DBG (DBG_proc, "%s: begin\n", __FUNCTION__); DBG (DBG_proc, "%s: begin\n", __FUNCTION__);
@ -3966,12 +3967,19 @@ gl841_detect_document_end (Genesys_Device * dev)
bytes_remain = bytes_remain - tmp; 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);
/* we substract the amount of data that is still in scanner's buffer */
status = sanei_genesys_read_valid_words (dev, &words);
if (status == SANE_STATUS_GOOD)
{
bytes_remain -= words;
}
/* remaining lines to read by frontend for the current scan */ /* remaining lines to read by frontend for the current scan */
if (depth == 1 || dev->settings.scan_mode == SCAN_MODE_LINEART) if (depth == 1 || dev->settings.scan_mode == SCAN_MODE_LINEART)
{ {
flines = bytes_remain * 8 flines = bytes_remain * 8
/ dev->settings.pixels / channels; / dev->settings.pixels / channels;
} }
else else
flines = bytes_remain / (depth / 8) flines = bytes_remain / (depth / 8)
/ dev->settings.pixels / channels; / dev->settings.pixels / channels;
@ -6204,3 +6212,5 @@ sanei_gl841_init_cmd_set (Genesys_Device * dev)
dev->model->cmd_set = &gl841_cmd_set; dev->model->cmd_set = &gl841_cmd_set;
return SANE_STATUS_GOOD; return SANE_STATUS_GOOD;
} }
/* vim: set sw=2 cino=>2se-1sn-1s{s^-1st0(0u0 smarttab expandtab: */