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

genesys: Pick correct sensors during option parsing

merge-requests/137/head
Povilas Kanapickas 2019-08-17 11:05:37 +03:00
rodzic 1902c9fbcb
commit eb1c4fadb9
1 zmienionych plików z 4 dodań i 5 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

@ -5652,8 +5652,8 @@ get_option_value (Genesys_Scanner * s, int option, void *val)
unsigned option_size = 0; unsigned option_size = 0;
SANE_Status status = SANE_STATUS_GOOD; SANE_Status status = SANE_STATUS_GOOD;
// FIXME: we should pick correct sensor here const Genesys_Sensor& sensor = sanei_genesys_find_sensor(s->dev, s->resolution,
const Genesys_Sensor& sensor = sanei_genesys_find_sensor_any(s->dev); s->dev->settings.scan_method);
switch (option) switch (option)
{ {
@ -5864,9 +5864,6 @@ set_option_value (Genesys_Scanner * s, int option, void *val,
SANE_Range *x_range, *y_range; SANE_Range *x_range, *y_range;
unsigned option_size = 0; unsigned option_size = 0;
// FIXME: we should modify device-specific sensor
auto& sensor = sanei_genesys_find_sensor_any_for_write(s->dev);
switch (option) switch (option)
{ {
case OPT_TL_X: case OPT_TL_X:
@ -6184,6 +6181,8 @@ set_option_value (Genesys_Scanner * s, int option, void *val,
} }
break; break;
case OPT_CALIBRATE: { case OPT_CALIBRATE: {
auto& sensor = sanei_genesys_find_sensor_for_write(s->dev, s->resolution,
s->dev->settings.scan_method);
catch_all_exceptions(__func__, [&]() catch_all_exceptions(__func__, [&]()
{ {
s->dev->cmd_set->save_power(s->dev, SANE_FALSE); s->dev->cmd_set->save_power(s->dev, SANE_FALSE);