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

genesys: Make definition of optical_resolution more consistent on gl646

merge-requests/213/head^2
Povilas Kanapickas 2020-04-13 07:19:51 +03:00
rodzic 6db2f94598
commit 71f3dd8643
1 zmienionych plików z 2 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
backend/genesys/low.cpp
Wyświetl plik

@ -838,7 +838,7 @@ void compute_session_pixel_offsets(const Genesys_Device* dev, ScanSession& s,
}
s.pixel_startx += s.params.startx * sensor.optical_res / s.params.xres;
s.pixel_endx = s.pixel_startx + s.optical_pixels;
s.pixel_endx = s.pixel_startx + s.optical_pixels * s.ccd_size_divisor;
s.pixel_startx /= sensor.ccd_pixels_per_system_pixel() * s.ccd_size_divisor;
s.pixel_endx /= sensor.ccd_pixels_per_system_pixel() * s.ccd_size_divisor;
@ -973,11 +973,7 @@ void compute_session(const Genesys_Device* dev, ScanSession& s, const Genesys_Se
s.ccd_size_divisor = sensor.get_ccd_size_divisor_for_dpi(s.params.xres);
s.pixel_count_ratio = sensor.pixel_count_ratio;
if (dev->model->asic_type == AsicType::GL646) {
s.optical_resolution = sensor.optical_res;
} else {
s.optical_resolution = sensor.optical_res / s.ccd_size_divisor;
}
s.optical_resolution = sensor.optical_res / s.ccd_size_divisor;
s.output_resolution = s.params.xres;
if (s.output_resolution > s.optical_resolution) {