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

genesys: Remove *_compute_exposure() wrappers

merge-requests/146/head
Povilas Kanapickas 2019-08-24 10:00:50 +03:00
rodzic 66c804a7ea
commit 21f949bd87
3 zmienionych plików z 9 dodań i 37 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
backend/genesys_gl124.cc
Wyświetl plik

@ -557,19 +557,6 @@ static void gl124_set_fe(Genesys_Device* dev, const Genesys_Sensor& sensor, uint
}
}
/**@brief compute exposure to use
* compute the sensor exposure based on target resolution
* @param dev pointer to device description
* @param xres sensor's required resolution
* @param ccd_size_divisor how many CCD pixels are processed for output pixel
*/
static int gl124_compute_exposure(const Genesys_Sensor& sensor, int xres, unsigned ccd_size_divisor)
{
return get_sensor_profile(sensor, xres, ccd_size_divisor).exposure_lperiod;
}
static void gl124_init_motor_regs_scan(Genesys_Device* dev,
const Genesys_Sensor& sensor,
Genesys_Register_Set* reg,
@ -1152,7 +1139,8 @@ static void gl124_init_scan_regs(Genesys_Device* dev, const Genesys_Sensor& sens
}
else
{
exposure_time = gl124_compute_exposure(sensor, used_res, session.ccd_size_divisor);
exposure_time = get_sensor_profile(sensor, used_res,
session.ccd_size_divisor).exposure_lperiod;
scan_step_type = sanei_genesys_compute_step_type(gl124_motor_profiles,
dev->model->motor_type, exposure_time);
}
@ -1311,7 +1299,9 @@ gl124_calculate_current_setup (Genesys_Device * dev, const Genesys_Sensor& senso
used_pixels = (session.params.pixels * optical_res) / session.params.xres;
DBG (DBG_info, "%s: used_pixels=%d\n", __func__, used_pixels);
exposure_time = gl124_compute_exposure(sensor, session.params.xres, session.ccd_size_divisor);
exposure_time = get_sensor_profile(sensor, session.params.xres,
session.ccd_size_divisor).exposure_lperiod;
DBG (DBG_info, "%s : exposure_time=%d pixels\n", __func__, exposure_time);
max_shift = sanei_genesys_compute_max_shift(dev, session.params.channels,

13
backend/genesys_gl846.cc
Wyświetl plik

@ -183,15 +183,6 @@ static const SensorProfile& get_sensor_profile(const Genesys_Sensor& sensor, uns
return sensor.sensor_profiles[best_i];
}
/**@brief compute exposure to use
* compute the sensor exposure based on target resolution
*/
static unsigned gl846_compute_exposure(const Genesys_Sensor& sensor, unsigned xres)
{
return get_sensor_profile(sensor, xres).exposure_lperiod;
}
/** @brief sensor specific settings
*/
static void gl846_setup_sensor(Genesys_Device * dev, const Genesys_Sensor& sensor,
@ -1022,7 +1013,7 @@ static void gl846_init_scan_regs(Genesys_Device* dev, const Genesys_Sensor& sens
slope_dpi = slope_dpi * (1 + dummy);
exposure_time = gl846_compute_exposure(sensor, used_res);
exposure_time = get_sensor_profile(sensor, used_res).exposure_lperiod;
scan_step_type = sanei_genesys_compute_step_type(gl846_motor_profiles, dev->model->motor_type,
exposure_time);
@ -1208,7 +1199,7 @@ gl846_calculate_current_setup(Genesys_Device * dev, const Genesys_Sensor& sensor
slope_dpi = slope_dpi * (1 + dummy);
exposure_time = gl846_compute_exposure(sensor, used_res);
exposure_time = get_sensor_profile(sensor, used_res).exposure_lperiod;
DBG(DBG_info, "%s : exposure_time=%d pixels\n", __func__, exposure_time);
max_shift = sanei_genesys_compute_max_shift(dev, session.params.channels, session.params.yres, 0);

13
backend/genesys_gl847.cc
Wyświetl plik

@ -178,15 +178,6 @@ static const SensorProfile& get_sensor_profile(const Genesys_Sensor& sensor, uns
return sensor.sensor_profiles[best_i];
}
/**@brief compute exposure to use
* compute the sensor exposure based on target resolution
*/
static int gl847_compute_exposure(const Genesys_Sensor& sensor, unsigned xres)
{
return get_sensor_profile(sensor, xres).exposure_lperiod;
}
/** @brief sensor specific settings
*/
static void gl847_setup_sensor(Genesys_Device * dev, const Genesys_Sensor& sensor,
@ -1039,7 +1030,7 @@ static void gl847_init_scan_regs(Genesys_Device* dev, const Genesys_Sensor& sens
slope_dpi = slope_dpi * (1 + dummy);
exposure_time = gl847_compute_exposure(sensor, used_res);
exposure_time = get_sensor_profile(sensor, used_res).exposure_lperiod;
scan_step_type = sanei_genesys_compute_step_type(gl847_motor_profiles, dev->model->motor_type,
exposure_time);
@ -1225,7 +1216,7 @@ gl847_calculate_current_setup(Genesys_Device * dev, const Genesys_Sensor& sensor
slope_dpi = slope_dpi * (1 + dummy);
exposure_time = gl847_compute_exposure(sensor, used_res);
exposure_time = get_sensor_profile(sensor, used_res).exposure_lperiod;
DBG(DBG_info, "%s : exposure_time=%d pixels\n", __func__, exposure_time);
max_shift = sanei_genesys_compute_max_shift(dev, session.params.channels, session.params.yres, 0);