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 computation on gl846

fix-build-obselete-jpeg
Povilas Kanapickas 2020-03-21 00:03:33 +02:00
rodzic 0c0b484728
commit 3f6dcf84fe
2 zmienionych plików z 8 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
backend/genesys/gl846.cpp
Wyświetl plik

@ -821,7 +821,7 @@ void CommandSetGl846::init_regs_for_shading(Genesys_Device* dev, const Genesys_S
float move;
unsigned channels = 3;
unsigned resolution = sensor.get_register_hwdpi(dev->settings.xres);
unsigned resolution = sensor.shading_resolution;
const auto& calib_sensor = sanei_genesys_find_sensor(dev, resolution, channels,
dev->settings.scan_method);
@ -967,7 +967,6 @@ SensorExposure CommandSetGl846::led_calibration(Genesys_Device* dev, const Genes
Genesys_Register_Set& regs) const
{
DBG_HELPER(dbg);
int used_res;
int i;
int avg[3], top[3], bottom[3];
int turn;
@ -984,19 +983,19 @@ SensorExposure CommandSetGl846::led_calibration(Genesys_Device* dev, const Genes
/* offset calibration is always done in color mode */
unsigned channels = 3;
used_res = sensor.get_register_hwdpi(dev->settings.xres);
const auto& calib_sensor = sanei_genesys_find_sensor(dev, used_res, channels,
unsigned resolution = sensor.shading_resolution;
const auto& calib_sensor = sanei_genesys_find_sensor(dev, resolution, channels,
dev->settings.scan_method);
/* initial calibration reg values */
regs = dev->reg;
ScanSession session;
session.params.xres = used_res;
session.params.yres = used_res;
session.params.xres = resolution;
session.params.yres = resolution;
session.params.startx = 0;
session.params.starty = 0;
session.params.pixels = dev->model->x_size_calib_mm * used_res / MM_PER_INCH;
session.params.pixels = dev->model->x_size_calib_mm * resolution / MM_PER_INCH;
session.params.lines = 1;
session.params.depth = 16;
session.params.channels = channels;

2
backend/genesys/tables_sensor.cpp
Wyświetl plik

@ -3077,6 +3077,7 @@ void genesys_init_sensor_tables()
for (const CustomSensorSettings& setting : custom_settings) {
sensor.resolutions = setting.resolutions;
sensor.register_dpihw_override = setting.register_dpihw_override;
sensor.shading_resolution = setting.register_dpihw_override;
sensor.pixel_count_ratio = setting.pixel_count_ratio;
sensor.shading_factor = setting.shading_factor;
sensor.custom_regs = base_custom_regs;
@ -3130,6 +3131,7 @@ void genesys_init_sensor_tables()
for (const CustomSensorSettings& setting : custom_settings) {
sensor.resolutions = setting.resolutions;
sensor.register_dpihw_override = setting.register_dpihw_override;
sensor.shading_resolution = setting.register_dpihw_override;
sensor.pixel_count_ratio = setting.pixel_count_ratio;
sensor.shading_factor = setting.shading_factor;
s_sensors->push_back(sensor);