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

genesys: Fix incorrect handling of start position on gl843

merge-requests/213/head^2
Povilas Kanapickas 2020-04-13 07:37:57 +03:00
rodzic 0932b751e0
commit df0fccf899
2 zmienionych plików z 3 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
backend/genesys/gl843.cpp
Wyświetl plik

@ -1188,15 +1188,6 @@ ScanSession CommandSetGl843::calculate_scan_session(const Genesys_Device* dev,
}
start = start + settings.tl_x;
if ((dev->model->model_id == ModelId::CANON_4400F &&
settings.scan_method == ScanMethod::TRANSPARENCY) ||
dev->model->model_id == ModelId::CANON_8400F ||
dev->model->model_id == ModelId::CANON_8600F)
{
// FIXME: this is probably just an artifact of a bug elsewhere
start /= sensor.get_ccd_size_divisor_for_dpi(settings.xres);
}
start = static_cast<float>((start * settings.xres) / MM_PER_INCH);
ScanSession session;

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

@ -831,12 +831,12 @@ void compute_session_pixel_offsets(const Genesys_Device* dev, ScanSession& s,
s.pixel_startx += s.output_startx * sensor.optical_res / s.params.xres;
s.pixel_endx = s.pixel_startx + s.optical_pixels * s.ccd_size_divisor;
} else if (dev->model->asic_type == AsicType::GL841) {
} else if (dev->model->asic_type == AsicType::GL841 ||
dev->model->asic_type == AsicType::GL843) {
s.pixel_startx = (s.output_startx * s.optical_resolution) / s.params.xres;
s.pixel_endx = s.pixel_startx + s.optical_pixels;
} else if (dev->model->asic_type == AsicType::GL843 ||
dev->model->asic_type == AsicType::GL845 ||
} else if (dev->model->asic_type == AsicType::GL845 ||
dev->model->asic_type == AsicType::GL846 ||
dev->model->asic_type == AsicType::GL847 ||
dev->model->asic_type == AsicType::GL124)