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

genesys: Simplify shading resolution calculation on gl646

fix-build-obselete-jpeg
Povilas Kanapickas 2020-03-21 00:11:31 +02:00
rodzic c8c9deaf6d
commit 5bcb5f3e80
1 zmienionych plików z 6 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -1552,15 +1552,18 @@ void CommandSetGl646::init_regs_for_shading(Genesys_Device* dev, const Genesys_S
DBG_HELPER(dbg); DBG_HELPER(dbg);
(void) regs; (void) regs;
Genesys_Settings settings; Genesys_Settings settings;
int cksel = 1;
/* fill settings for scan : always a color scan */ /* fill settings for scan : always a color scan */
int channels = 3; int channels = 3;
unsigned ccd_size_divisor = sensor.get_ccd_size_divisor_for_dpi(dev->settings.xres);
unsigned cksel = get_cksel(dev->model->sensor_id, dev->settings.xres, channels);
unsigned resolution = sensor.optical_res / ccd_size_divisor / cksel;
// FIXME: we select wrong calibration sensor
const auto& calib_sensor = sanei_genesys_find_sensor(dev, dev->settings.xres, channels, const auto& calib_sensor = sanei_genesys_find_sensor(dev, dev->settings.xres, channels,
dev->settings.scan_method); dev->settings.scan_method);
unsigned ccd_size_divisor = calib_sensor.get_ccd_size_divisor_for_dpi(dev->settings.xres);
settings.scan_method = dev->settings.scan_method; settings.scan_method = dev->settings.scan_method;
settings.scan_mode = dev->settings.scan_mode; settings.scan_mode = dev->settings.scan_mode;
@ -1568,9 +1571,7 @@ void CommandSetGl646::init_regs_for_shading(Genesys_Device* dev, const Genesys_S
// FIXME: always a color scan, but why don't we set scan_mode to COLOR_SINGLE_PASS always? // FIXME: always a color scan, but why don't we set scan_mode to COLOR_SINGLE_PASS always?
settings.scan_mode = ScanColorMode::COLOR_SINGLE_PASS; settings.scan_mode = ScanColorMode::COLOR_SINGLE_PASS;
} }
settings.xres = sensor.optical_res / ccd_size_divisor; settings.xres = resolution;
cksel = get_cksel(dev->model->sensor_id, dev->settings.xres, channels);
settings.xres = settings.xres / cksel;
settings.yres = settings.xres; settings.yres = settings.xres;
settings.tl_x = 0; settings.tl_x = 0;
settings.tl_y = 0; settings.tl_y = 0;