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

genesys: Use scan method out of setup params for cache comparison

merge-requests/82/head
Povilas Kanapickas 2019-06-08 14:04:23 +03:00
rodzic bf0ed8ed09
commit 8d5ff56ee9
3 zmienionych plików z 6 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
backend/genesys_gl646.cc
Wyświetl plik

@ -4723,7 +4723,6 @@ gl646_is_compatible_calibration (Genesys_Device * dev, const Genesys_Sensor& sen
dev->current_setup.channels = 1;
}
dev->current_setup.xres = dev->settings.xres;
dev->current_setup.scan_method = dev->settings.scan_method;
DBG(DBG_io, "%s: requested=(%d,%f), tested=(%d,%f)\n", __func__, dev->current_setup.channels,
dev->current_setup.xres, cache->used_setup.channels, cache->used_setup.xres);
@ -4742,11 +4741,11 @@ gl646_is_compatible_calibration (Genesys_Device * dev, const Genesys_Sensor& sen
compatible =
(dev->current_setup.channels == cache->used_setup.channels);
}
if (dev->current_setup.scan_method != cache->used_setup.scan_method)
if (dev->current_setup.params.scan_method != cache->used_setup.params.scan_method)
{
DBG(DBG_io, "%s: current method=%d, used=%d\n", __func__,
static_cast<unsigned>(dev->current_setup.scan_method),
static_cast<unsigned>(cache->used_setup.scan_method));
static_cast<unsigned>(dev->current_setup.params.scan_method),
static_cast<unsigned>(cache->used_setup.params.scan_method));
compatible = 0;
}
if (!compatible)

7
backend/genesys_low.cc
Wyświetl plik

@ -1853,7 +1853,6 @@ sanei_genesys_is_compatible_calibration (Genesys_Device * dev,
sane_strstatus (status));
return status;
}
dev->current_setup.scan_method = dev->settings.scan_method;
DBG (DBG_proc, "%s: checking\n", __func__);
@ -1880,11 +1879,11 @@ sanei_genesys_is_compatible_calibration (Genesys_Device * dev,
dev->current_setup.ccd_size_divisor, cache->used_setup.ccd_size_divisor);
compatible = 0;
}
if (dev->current_setup.scan_method != cache->used_setup.scan_method)
if (dev->current_setup.params.scan_method != cache->used_setup.params.scan_method)
{
DBG (DBG_io, "%s: current method=%d, used=%d\n", __func__,
static_cast<unsigned>(dev->current_setup.scan_method),
static_cast<unsigned>(cache->used_setup.scan_method));
static_cast<unsigned>(dev->current_setup.params.scan_method),
static_cast<unsigned>(cache->used_setup.params.scan_method));
compatible = 0;
}
if (!compatible)

1
backend/genesys_low.h
Wyświetl plik

@ -1237,7 +1237,6 @@ struct Genesys_Current_Setup
// channel count expected from scanner
int channels = 0;
ScanMethod scan_method = ScanMethod::FLATBED;
// used exposure time
int exposure_time = 0;
// used xres