genesys: Fix definition of session's output_segment_pixel_group_count

merge-requests/317/merge
Povilas Kanapickas 2020-01-04 12:09:25 +02:00
rodzic 2269e05fac
commit c39cb0d4b9
1 zmienionych plików z 4 dodań i 5 usunięć

Wyświetl plik

@ -1158,16 +1158,15 @@ void compute_session(const Genesys_Device* dev, ScanSession& s, const Genesys_Se
if (dev->model->asic_type == AsicType::GL124 || if (dev->model->asic_type == AsicType::GL124 ||
dev->model->asic_type == AsicType::GL843) dev->model->asic_type == AsicType::GL843)
{ {
s.output_segment_pixel_group_count = multiply_by_depth_ceil( s.output_segment_pixel_group_count = s.output_pixels /
s.output_pixels / s.ccd_size_divisor / s.segment_count, s.params.depth); (s.ccd_size_divisor * s.segment_count);
} }
if (dev->model->asic_type == AsicType::GL845 || if (dev->model->asic_type == AsicType::GL845 ||
dev->model->asic_type == AsicType::GL846 || dev->model->asic_type == AsicType::GL846 ||
dev->model->asic_type == AsicType::GL847) dev->model->asic_type == AsicType::GL847)
{ {
s.output_segment_pixel_group_count = multiply_by_depth_ceil( s.output_segment_pixel_group_count = s.optical_pixels /
s.optical_pixels / (s.hwdpi_divisor * s.segment_count * ccd_pixels_per_system_pixel), (s.hwdpi_divisor * s.segment_count * ccd_pixels_per_system_pixel);
s.params.depth);
} }
s.output_line_bytes_requested = multiply_by_depth_ceil( s.output_line_bytes_requested = multiply_by_depth_ceil(