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

genesys: Extract function to enable active area shading

merge-requests/340/head
Povilas Kanapickas 2020-02-02 13:08:48 +02:00
rodzic 12e113ab52
commit 6bbdb7afc8
1 zmienionych plików z 15 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

25
backend/genesys/gl843.cpp
Wyświetl plik

@ -1682,6 +1682,19 @@ void CommandSetGl843::init_regs_for_coarse_calibration(Genesys_Device* dev,
dev->interface->write_registers(regs);
}
static bool should_calibrate_only_active_area(const Genesys_Device& dev,
const Genesys_Settings& settings)
{
if (settings.scan_method == ScanMethod::TRANSPARENCY ||
settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED)
{
if (dev.model->model_id == ModelId::CANON_8600F && settings.xres == 4800) {
return true;
}
}
return false;
}
// init registers for shading calibration shading calibration is done at dpihw
void CommandSetGl843::init_regs_for_shading(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const
@ -1709,11 +1722,7 @@ void CommandSetGl843::init_regs_for_shading(Genesys_Device* dev, const Genesys_S
const auto& calib_sensor = sanei_genesys_find_sensor(dev, resolution, dev->calib_channels,
dev->settings.scan_method);
if ((dev->settings.scan_method == ScanMethod::TRANSPARENCY ||
dev->settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) &&
dev->model->model_id == ModelId::CANON_8600F &&
dev->settings.xres == 4800)
{
if (should_calibrate_only_active_area(*dev, dev->settings)) {
float offset = static_cast<float>(get_model_x_offset_ta(*dev, dev->settings));
offset /= calib_sensor.get_ccd_size_divisor_for_dpi(resolution);
offset = static_cast<float>((offset * calib_sensor.optical_res) / MM_PER_INCH);
@ -2042,11 +2051,7 @@ void CommandSetGl843::offset_calibration(Genesys_Device* dev, const Genesys_Sens
int start_pixel = 0;
black_pixels = calib_sensor.black_pixels / factor;
if ((dev->settings.scan_method == ScanMethod::TRANSPARENCY ||
dev->settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) &&
dev->model->model_id == ModelId::CANON_8600F &&
dev->settings.xres == 4800)
{
if (should_calibrate_only_active_area(*dev, dev->settings)) {
start_pixel = static_cast<int>(get_model_x_offset_ta(*dev, dev->settings));
start_pixel /= calib_sensor.get_ccd_size_divisor_for_dpi(resolution);
start_pixel = static_cast<int>((start_pixel * calib_sensor.optical_res) / MM_PER_INCH);