kopia lustrzana https://gitlab.com/sane-project/backends
genesys: Simplify lamp warmup setup on gl843
rodzic
3c8b103d82
commit
fe8ffefe1b
|
@ -100,6 +100,16 @@ struct MethodResolutions
|
||||||
return *std::min_element(resolutions_x.begin(), resolutions_x.end());
|
return *std::min_element(resolutions_x.begin(), resolutions_x.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsigned get_nearest_resolution_x(unsigned resolution) const
|
||||||
|
{
|
||||||
|
return *std::min_element(resolutions_x.begin(), resolutions_x.end(),
|
||||||
|
[&](unsigned lhs, unsigned rhs)
|
||||||
|
{
|
||||||
|
return std::abs(static_cast<int>(lhs) - static_cast<int>(resolution)) <
|
||||||
|
std::abs(static_cast<int>(rhs) - static_cast<int>(resolution));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
unsigned get_min_resolution_y() const
|
unsigned get_min_resolution_y() const
|
||||||
{
|
{
|
||||||
return *std::min_element(resolutions_y.begin(), resolutions_y.end());
|
return *std::min_element(resolutions_y.begin(), resolutions_y.end());
|
||||||
|
|
|
@ -1752,14 +1752,11 @@ void CommandSetGl843::init_regs_for_warmup(Genesys_Device* dev, const Genesys_Se
|
||||||
int* total_size) const
|
int* total_size) const
|
||||||
{
|
{
|
||||||
DBG_HELPER(dbg);
|
DBG_HELPER(dbg);
|
||||||
int dpihw;
|
(void) sensor;
|
||||||
int resolution;
|
|
||||||
|
|
||||||
/* setup scan */
|
*channels=3;
|
||||||
*channels=3;
|
unsigned resolution = dev->model->get_resolution_settings(dev->settings.scan_method)
|
||||||
resolution=600;
|
.get_nearest_resolution_x(600);
|
||||||
dpihw = sensor.get_register_hwdpi(resolution);
|
|
||||||
resolution=dpihw;
|
|
||||||
|
|
||||||
const auto& calib_sensor = sanei_genesys_find_sensor(dev, resolution, *channels,
|
const auto& calib_sensor = sanei_genesys_find_sensor(dev, resolution, *channels,
|
||||||
dev->settings.scan_method);
|
dev->settings.scan_method);
|
||||||
|
|
Ładowanie…
Reference in New Issue