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 dpiset calculation on gl845/gl846

fix-build-obselete-jpeg
Povilas Kanapickas 2020-03-21 00:11:28 +02:00
rodzic 4a5f65d2d2
commit a43d362b7b
2 zmienionych plików z 6 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -518,10 +518,6 @@ static void gl846_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
DBG_HELPER_ARGS(dbg, "exposure_time=%d", exposure_time);
GenesysRegister *r;
// resolution is divided according to ccd_pixels_per_system_pixel()
unsigned ccd_pixels_per_system_pixel = sensor.ccd_pixels_per_system_pixel();
DBG(DBG_io2, "%s: ccd_pixels_per_system_pixel=%d\n", __func__, ccd_pixels_per_system_pixel);
gl846_setup_sensor(dev, sensor, reg);
dev->cmd_set->set_fe(dev, sensor, AFE_SET);
@ -613,10 +609,7 @@ static void gl846_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
}*/
}
unsigned dpiset = session.params.xres * ccd_pixels_per_system_pixel;
reg->set16(REG_DPISET, dpiset);
DBG(DBG_io2, "%s: dpiset used=%d\n", __func__, dpiset);
reg->set16(REG_DPISET, sensor.dpiset_override);
reg->set16(REG_STRPIXEL, session.pixel_startx);
reg->set16(REG_ENDPIXEL, session.pixel_endx);

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

@ -3300,6 +3300,7 @@ void genesys_init_sensor_tables()
for (const CustomSensorSettings& setting : custom_settings) {
sensor.resolutions = setting.resolutions;
sensor.register_dpihw = setting.register_dpihw;
sensor.dpiset_override = setting.resolutions.values()[0];
sensor.shading_resolution = setting.register_dpihw;
sensor.pixel_count_ratio = setting.pixel_count_ratio;
sensor.shading_factor = setting.shading_factor;
@ -3353,6 +3354,7 @@ void genesys_init_sensor_tables()
for (const CustomSensorSettings& setting : custom_settings) {
sensor.resolutions = setting.resolutions;
sensor.register_dpihw = setting.register_dpihw;
sensor.dpiset_override = setting.resolutions.values()[0];
sensor.shading_resolution = setting.register_dpihw;
sensor.pixel_count_ratio = setting.pixel_count_ratio;
sensor.shading_factor = setting.shading_factor;
@ -3446,7 +3448,9 @@ void verify_sensor_tables()
}
if (asic_type == AsicType::GL124 ||
asic_type == AsicType::GL841 ||
asic_type == AsicType::GL843)
asic_type == AsicType::GL843 ||
asic_type == AsicType::GL845 ||
asic_type == AsicType::GL846)
{
if (sensor.dpiset_override == 0) {
throw SaneException("dpiset_override is not defined");