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

genesys: Return errors as exceptions from genesys_start_scan()

merge-requests/104/head
Povilas Kanapickas 2019-07-20 11:02:40 +03:00
rodzic 1ad6aca501
commit 53450b6810
1 zmienionych plików z 3 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
backend/genesys.cc
Wyświetl plik

@ -3373,9 +3373,8 @@ static void genesys_warmup_lamp(Genesys_Device* dev)
} }
/* High-level start of scanning */ // High-level start of scanning
static SANE_Status static void genesys_start_scan(Genesys_Device* dev, SANE_Bool lamp_off)
genesys_start_scan (Genesys_Device * dev, SANE_Bool lamp_off)
{ {
DBG_HELPER(dbg); DBG_HELPER(dbg);
unsigned int steps, expected; unsigned int steps, expected;
@ -3546,8 +3545,6 @@ genesys_start_scan (Genesys_Device * dev, SANE_Bool lamp_off)
} }
while (steps < 1); while (steps < 1);
} }
return SANE_STATUS_GOOD;
} }
/* this is _not_ a ringbuffer. /* this is _not_ a ringbuffer.
@ -6733,7 +6730,7 @@ SANE_Status sane_start_impl(SANE_Handle handle)
parameters will be overwritten below, but that's OK. */ parameters will be overwritten below, but that's OK. */
RIE (calc_parameters (s)); RIE (calc_parameters (s));
RIE(genesys_start_scan(s->dev, s->lamp_off)); genesys_start_scan(s->dev, s->lamp_off);
s->scanning = SANE_TRUE; s->scanning = SANE_TRUE;