From 6420e00a38bbd239f33d407ad66e0b96e9178ad8 Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Thu, 9 Apr 2020 23:57:05 +0300 Subject: [PATCH] genesys: Don't hardcode depth during warmup --- backend/genesys/gl124.cpp | 2 +- backend/genesys/gl646.cpp | 2 +- backend/genesys/gl841.cpp | 2 +- backend/genesys/gl843.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/genesys/gl124.cpp b/backend/genesys/gl124.cpp index 7f6010686..2a3c79e61 100644 --- a/backend/genesys/gl124.cpp +++ b/backend/genesys/gl124.cpp @@ -1431,7 +1431,7 @@ void CommandSetGl124::init_regs_for_warmup(Genesys_Device* dev, const Genesys_Se session.params.starty = 0; session.params.pixels = dev->model->x_size_calib_mm * sensor.optical_res / MM_PER_INCH / 2; session.params.lines = 1; - session.params.depth = 8; + session.params.depth = dev->model->bpp_color_values.front(); session.params.channels = 3; session.params.scan_method = dev->settings.scan_method; session.params.scan_mode = ScanColorMode::COLOR_SINGLE_PASS; diff --git a/backend/genesys/gl646.cpp b/backend/genesys/gl646.cpp index 65ee5ae0d..c82da51f7 100644 --- a/backend/genesys/gl646.cpp +++ b/backend/genesys/gl646.cpp @@ -2481,7 +2481,7 @@ void CommandSetGl646::init_regs_for_warmup(Genesys_Device* dev, const Genesys_Se settings.pixels = dev->model->x_size_calib_mm * resolution / MM_PER_INCH; settings.requested_pixels = settings.pixels; settings.lines = 2; - settings.depth = 8; + settings.depth = dev->model->bpp_gray_values.front(); settings.color_filter = ColorFilter::RED; settings.disable_interpolation = 0; diff --git a/backend/genesys/gl841.cpp b/backend/genesys/gl841.cpp index 61d6ca08f..70e1c8c8b 100644 --- a/backend/genesys/gl841.cpp +++ b/backend/genesys/gl841.cpp @@ -2855,7 +2855,7 @@ void CommandSetGl841::init_regs_for_warmup(Genesys_Device* dev, const Genesys_Se session.params.starty = 0; session.params.pixels = num_pixels; session.params.lines = 1; - session.params.depth = 16; + session.params.depth = dev->model->bpp_color_values.front(); session.params.channels = 3; session.params.scan_method = dev->settings.scan_method; session.params.scan_mode = ScanColorMode::COLOR_SINGLE_PASS; diff --git a/backend/genesys/gl843.cpp b/backend/genesys/gl843.cpp index b3fd73e57..87cf5d89a 100644 --- a/backend/genesys/gl843.cpp +++ b/backend/genesys/gl843.cpp @@ -1779,7 +1779,7 @@ void CommandSetGl843::init_regs_for_warmup(Genesys_Device* dev, const Genesys_Se session.params.starty = 0; session.params.pixels = num_pixels; session.params.lines = 1; - session.params.depth = 8; + session.params.depth = dev->model->bpp_color_values.front(); session.params.channels = channels; session.params.scan_method = dev->settings.scan_method; session.params.scan_mode = ScanColorMode::COLOR_SINGLE_PASS;