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 matching xdpi and ydpi when calibrating shading on gl841

merge-requests/340/head
Povilas Kanapickas 2020-02-16 10:46:15 +02:00
rodzic 300bd3e645
commit 4a11453b06
1 zmienionych plików z 2 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
backend/genesys/gl841.cpp
Wyświetl plik

@ -2396,16 +2396,9 @@ void CommandSetGl841::init_regs_for_shading(Genesys_Device* dev, const Genesys_S
Genesys_Register_Set& regs) const Genesys_Register_Set& regs) const
{ {
DBG_HELPER(dbg); DBG_HELPER(dbg);
SANE_Int ydpi;
unsigned starty = 0; unsigned starty = 0;
ydpi = dev->motor.base_ydpi;
if (dev->model->motor_id == MotorId::PLUSTEK_OPTICPRO_3600) /* TODO PLUSTEK_3600: 1200dpi not yet working, produces dark bar */
{
ydpi = 600;
}
if (dev->model->motor_id == MotorId::CANON_LIDE_80) { if (dev->model->motor_id == MotorId::CANON_LIDE_80) {
ydpi = gl841_get_dpihw(dev);
/* get over extra dark area for this model. /* get over extra dark area for this model.
It looks like different devices have dark areas of different width It looks like different devices have dark areas of different width
due to manufacturing variability. The initial value of starty was 140, due to manufacturing variability. The initial value of starty was 140,
@ -2428,10 +2421,10 @@ void CommandSetGl841::init_regs_for_shading(Genesys_Device* dev, const Genesys_S
dev->settings.scan_method); dev->settings.scan_method);
unsigned calib_lines = unsigned calib_lines =
static_cast<unsigned>(dev->model->y_size_calib_mm * ydpi / MM_PER_INCH); static_cast<unsigned>(dev->model->y_size_calib_mm * resolution / MM_PER_INCH);
ScanSession session; ScanSession session;
session.params.xres = resolution; session.params.xres = resolution;
session.params.yres = ydpi; session.params.yres = resolution;
session.params.startx = 0; session.params.startx = 0;
session.params.starty = starty; session.params.starty = starty;
session.params.pixels = calib_sensor.sensor_pixels / factor; session.params.pixels = calib_sensor.sensor_pixels / factor;