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

genesys: Fix computation of total_bytes_to_read

merge-requests/154/head
Povilas Kanapickas 2019-09-12 18:22:57 +03:00
rodzic da9307c7a6
commit 77e0acde22
2 zmienionych plików z 6 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
backend/genesys_gl124.cc
Wyświetl plik

@ -1195,10 +1195,10 @@ static void gl124_init_scan_regs(Genesys_Device* dev, const Genesys_Sensor& sens
dev->total_bytes_read = 0; dev->total_bytes_read = 0;
if (session.params.depth == 1) { if (session.params.depth == 1) {
dev->total_bytes_to_read = ((session.params.get_requested_pixels() * dev->settings.lines) / 8 + dev->total_bytes_to_read = ((session.params.get_requested_pixels() * session.params.lines) / 8 +
(((session.params.get_requested_pixels() * dev->settings.lines) % 8) ? 1 : 0)) * session.params.channels; (((session.params.get_requested_pixels() * session.params.lines) % 8) ? 1 : 0)) * session.params.channels;
} else { } else {
dev->total_bytes_to_read = session.params.get_requested_pixels() * dev->settings.lines * dev->total_bytes_to_read = session.params.get_requested_pixels() * session.params.lines *
session.params.channels * (session.params.depth / 8); session.params.channels * (session.params.depth / 8);
} }

6
backend/genesys_gl841.cc
Wyświetl plik

@ -1985,11 +1985,11 @@ dummy \ scanned lines
dev->total_bytes_read = 0; dev->total_bytes_read = 0;
if (session.params.depth == 1) { if (session.params.depth == 1) {
dev->total_bytes_to_read = ((session.params.get_requested_pixels() * dev->settings.lines) / 8 + dev->total_bytes_to_read = ((session.params.get_requested_pixels() * session.params.lines) / 8 +
(((session.params.get_requested_pixels() * dev->settings.lines)%8)?1:0)) * session.params.channels; (((session.params.get_requested_pixels() * session.params.lines)%8)?1:0)) * session.params.channels;
} else { } else {
dev->total_bytes_to_read = dev->total_bytes_to_read =
session.params.get_requested_pixels() * dev->settings.lines * session.params.channels * (session.params.depth / 8); session.params.get_requested_pixels() * session.params.lines * session.params.channels * (session.params.depth / 8);
} }
DBG(DBG_info, "%s: total bytes to send = %lu\n", __func__, (u_long) dev->total_bytes_to_read); DBG(DBG_info, "%s: total bytes to send = %lu\n", __func__, (u_long) dev->total_bytes_to_read);