From bd4f00912218fceab4818a9fe66f584af8740cf8 Mon Sep 17 00:00:00 2001
From: Povilas Kanapickas <povilas@radix.lt>
Date: Mon, 27 Dec 2021 22:21:00 +0200
Subject: [PATCH] genesys: Remove true_gray variable by deriving its value
 directly

---
 backend/genesys/genesys.cpp | 6 ------
 backend/genesys/gl646.cpp   | 4 +++-
 backend/genesys/gl841.cpp   | 3 ++-
 backend/genesys/low.cpp     | 3 ++-
 backend/genesys/settings.h  | 3 ---
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/backend/genesys/genesys.cpp b/backend/genesys/genesys.cpp
index 9f20e04c3..653fc0934 100644
--- a/backend/genesys/genesys.cpp
+++ b/backend/genesys/genesys.cpp
@@ -4370,12 +4370,6 @@ static Genesys_Settings calculate_scan_settings(Genesys_Scanner* s)
         settings.color_filter = ColorFilter::NONE;
     }
 
-    if (s->color_filter == "None") {
-        settings.true_gray = 1;
-    } else {
-        settings.true_gray = 0;
-    }
-
     // brightness and contrast only for for 8 bit scans
     if (s->bit_depth == 8) {
         settings.contrast = (s->contrast * 127) / 100;
diff --git a/backend/genesys/gl646.cpp b/backend/genesys/gl646.cpp
index 6536fb4d3..04ddb7b4c 100644
--- a/backend/genesys/gl646.cpp
+++ b/backend/genesys/gl646.cpp
@@ -606,7 +606,9 @@ void CommandSetGl646::init_regs_for_scan_session(Genesys_Device* dev, const Gene
     }
 
   /* true CIS gray if needed */
-    if (dev->model->is_cis && session.params.channels == 1 && dev->settings.true_gray) {
+    if (dev->model->is_cis && session.params.channels == 1 &&
+        session.params.color_filter == ColorFilter::NONE)
+    {
         regs->find_reg(0x05).value |= REG_0x05_LEDADD;
     } else {
         regs->find_reg(0x05).value &= ~REG_0x05_LEDADD;
diff --git a/backend/genesys/gl841.cpp b/backend/genesys/gl841.cpp
index 41a4c48b5..eb073fa23 100644
--- a/backend/genesys/gl841.cpp
+++ b/backend/genesys/gl841.cpp
@@ -1093,7 +1093,8 @@ ScanSession CommandSetGl841::calculate_scan_session(const Genesys_Device* dev,
     ScanFlag flags = ScanFlag::NONE;
 
     // true gray (led add for cis scanners)
-    if (dev->model->is_cis && dev->settings.true_gray &&
+    if (dev->model->is_cis &&
+        settings.color_filter == ColorFilter::NONE &&
         dev->settings.scan_mode != ScanColorMode::COLOR_SINGLE_PASS &&
         dev->model->sensor_id != SensorId::CIS_CANON_LIDE_80)
     {
diff --git a/backend/genesys/low.cpp b/backend/genesys/low.cpp
index 371bebdd2..616cad5b2 100644
--- a/backend/genesys/low.cpp
+++ b/backend/genesys/low.cpp
@@ -1119,7 +1119,8 @@ void compute_session(const Genesys_Device* dev, ScanSession& s, const Genesys_Se
         dev->model->asic_type == AsicType::GL845 ||
         dev->model->asic_type == AsicType::GL846)
     {
-        s.enable_ledadd = (s.params.channels == 1 && dev->model->is_cis && dev->settings.true_gray);
+        s.enable_ledadd = (s.params.channels == 1 && dev->model->is_cis &&
+                           s.params.color_filter == ColorFilter::NONE);
     }
 
     s.use_host_side_calib = sensor.use_host_side_calib;
diff --git a/backend/genesys/settings.h b/backend/genesys/settings.h
index f95b12fe4..d2b7f1fa8 100644
--- a/backend/genesys/settings.h
+++ b/backend/genesys/settings.h
@@ -76,9 +76,6 @@ struct Genesys_Settings
 
     ColorFilter color_filter = ColorFilter::NONE;
 
-    // true if scan is true gray, false if monochrome scan
-    int true_gray = 0;
-
     // value for contrast enhancement in the [-100..100] range
     int contrast = 0;