From 0986f2a8fa185a4eb49b0446a07d17634d637af9 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mar 23 2020 08:15:34 +0000 Subject: Complete fix for #1807751 --- diff --git a/genesys-slope-assert.patch b/genesys-slope-assert.patch index 7e24b48..9ed4e46 100644 --- a/genesys-slope-assert.patch +++ b/genesys-slope-assert.patch @@ -1,5 +1,5 @@ diff --git a/backend/genesys/gl841.cpp b/backend/genesys/gl841.cpp -index 470f9ba..c11a434 100644 +index 470f9ba..1c9cbe7 100644 --- a/backend/genesys/gl841.cpp +++ b/backend/genesys/gl841.cpp @@ -944,7 +944,7 @@ HOME_FREE: 3 @@ -11,3 +11,27 @@ index 470f9ba..c11a434 100644 r = sanei_genesys_get_address(reg, 0x67); r->value = 0x3f; +@@ -1165,18 +1165,18 @@ HOME_FREE: 3 + r->value &= ~0x40; + } + +- gl841_send_slope_table(dev, 0, slow_table.table, 256); ++ gl841_send_slope_table(dev, 0, slow_table.table, 255); + +- gl841_send_slope_table(dev, 1, back_table.table, 256); ++ gl841_send_slope_table(dev, 1, back_table.table, 255); + +- gl841_send_slope_table(dev, 2, slow_table.table, 256); ++ gl841_send_slope_table(dev, 2, slow_table.table, 255); + + if (use_fast_fed) { +- gl841_send_slope_table(dev, 3, fast_table.table, 256); ++ gl841_send_slope_table(dev, 3, fast_table.table, 255); + } + + if (has_flag(flags, MotorFlag::AUTO_GO_HOME)) { +- gl841_send_slope_table(dev, 4, fast_table.table, 256); ++ gl841_send_slope_table(dev, 4, fast_table.table, 255); + } + + /* now reg 0x21 and 0x24 are available, we can calculate reg 0x22 and 0x23, diff --git a/sane-backends.spec b/sane-backends.spec index 82936c9..202662c 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -14,7 +14,7 @@ Summary: Scanner access software Name: sane-backends Version: 1.0.29 -Release: 5%{?dist} +Release: 6%{?dist} # lib/ is LGPLv2+, backends are GPLv2+ with exceptions # Tools are GPLv2+, docs are public domain # see LICENSE for details @@ -424,6 +424,9 @@ exit 0 %{_unitdir}/saned@.service %changelog +* Mon Mar 23 2020 Zdenek Dohnal - 1.0.29-6 +- complete fix for #1807751 + * Mon Mar 23 2020 Zdenek Dohnal - 1.0.29-5 - 1807751 - [abrt] sane-backends: std::__replacement_assert(): scanimage killed by SIGABRT