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

fix generic is_compatible_cache for CCD case

merge-requests/1/head
Stphane Voltz 2011-08-02 07:31:38 +02:00
rodzic 0e83cf58eb
commit 867cd5e14c
1 zmienionych plików z 2 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
backend/genesys_low.c
Wyświetl plik

@ -1370,7 +1370,6 @@ sanei_genesys_is_compatible_calibration (Genesys_Device * dev,
sane_strstatus (status)); sane_strstatus (status));
return status; return status;
} }
resolution=sanei_genesys_compute_dpihw(dev,dev->settings.xres);
dev->current_setup.scan_method = dev->settings.scan_method; dev->current_setup.scan_method = dev->settings.scan_method;
DBG (DBG_proc, "sanei_genesys_is_compatible_calibration: checking\n"); DBG (DBG_proc, "sanei_genesys_is_compatible_calibration: checking\n");
@ -1379,10 +1378,12 @@ sanei_genesys_is_compatible_calibration (Genesys_Device * dev,
* requested scan. In the case of CIS scanners, dpi isn't a criteria */ * requested scan. In the case of CIS scanners, dpi isn't a criteria */
if (dev->model->is_cis == SANE_FALSE) if (dev->model->is_cis == SANE_FALSE)
{ {
resolution = dev->settings.xres;
compatible = (resolution == ((int) cache->used_setup.xres)); compatible = (resolution == ((int) cache->used_setup.xres));
} }
else else
{ {
resolution=sanei_genesys_compute_dpihw(dev,dev->settings.xres);
compatible = (resolution == ((int) sanei_genesys_compute_dpihw(dev,cache->used_setup.xres))); compatible = (resolution == ((int) sanei_genesys_compute_dpihw(dev,cache->used_setup.xres)));
} }
if (dev->current_setup.scan_method != cache->used_setup.scan_method) if (dev->current_setup.scan_method != cache->used_setup.scan_method)