From 4870a9f97529b09fa9cf013c76b3e40329078024 Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Thu, 12 Sep 2019 22:21:57 +0300 Subject: [PATCH] genesys: Properly set conseq_pixel_dist_bytes on gl124 --- backend/genesys_gl124.cc | 1 - backend/genesys_low.cc | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/genesys_gl124.cc b/backend/genesys_gl124.cc index f529ed5e5..e4ad5a0d2 100644 --- a/backend/genesys_gl124.cc +++ b/backend/genesys_gl124.cc @@ -948,7 +948,6 @@ static void gl124_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens dev->deseg.curr_byte = 0; dev->deseg.skip_bytes = 0; dev->deseg.pixel_groups = session.output_line_bytes_raw / session.segment_count; - const_cast(session).conseq_pixel_dist_bytes = session.output_line_bytes_raw / session.segment_count; dev->line_count = 0; dev->line_interp = 0; diff --git a/backend/genesys_low.cc b/backend/genesys_low.cc index b08c493f3..177c690b4 100644 --- a/backend/genesys_low.cc +++ b/backend/genesys_low.cc @@ -1360,10 +1360,9 @@ void compute_session(Genesys_Device* dev, ScanSession& s, const Genesys_Sensor& if (dev->model->asic_type == AsicType::GL124) { s.output_line_bytes_raw = multiply_by_depth_ceil(s.output_pixels / s.ccd_size_divisor, s.params.depth); + s.conseq_pixel_dist_bytes = s.output_line_bytes_raw / s.segment_count; } - // TODO: gl124 conseq_pixel_dist_bytes - compute_session_buffer_sizes(dev->model->asic_type, s); } @@ -2052,6 +2051,7 @@ void debug_dump(unsigned level, const ScanSession& session) DBG(level, " segment_count : %d\n", session.segment_count); DBG(level, " pixel_startx : %d\n", session.pixel_startx); DBG(level, " pixel_endx : %d\n", session.pixel_endx); + DBG(level, " conseq_pixel_dist_bytes : %d\n", session.conseq_pixel_dist_bytes); DBG(level, " buffer_size_read : %zu\n", session.buffer_size_read); DBG(level, " buffer_size_read : %zu\n", session.buffer_size_lines); DBG(level, " buffer_size_shrink : %zu\n", session.buffer_size_shrink);