summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2021-11-15 11:18:05 +0100
committerJörg Frings-Fürst <debian@jff.email>2021-11-15 11:18:05 +0100
commitf1e0a4db63ba7deb1d676c1cbf6a223e05652cab (patch)
tree08b2f3478489ed5e5f4062dc62d56ab988daf0a4 /src
parent243b138d715c3cfb5a2ea672148234cb679a2cc3 (diff)
parent21ae6e8c8b999caeb8e32849019713808cb5fdb3 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src')
-rw-r--r--src/scanner.vala5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/scanner.vala b/src/scanner.vala
index 01e77e2..d968aec 100644
--- a/src/scanner.vala
+++ b/src/scanner.vala
@@ -926,6 +926,7 @@ public class Scanner : Object
Sane.I18N ("Automatic Document Feeder"),
"ADF",
"Automatic Document Feeder(centrally aligned)", /* Seen in the proprietary brother3 driver */
+ "Automatic Document Feeder(center aligned)", /* Seen in Brother's proprietary brscan5 driver */
"Automatic Document Feeder(left aligned)", /* Seen in the proprietary brother3 driver */
"ADF Simplex" /* Samsung unified driver. LP: # 892915 */
};
@@ -1102,6 +1103,10 @@ public class Scanner : Object
/* Non-standard Epson GT-S50 ADF options */
option = get_option_by_name (handle, "adf-mode", out index);
+
+ /* Support Canon DR-C240 ADF_BOTH options */
+ if (option == null)
+ option = get_option_by_name (handle, "ScanMode", out index);
if (option != null)
{
string[] adf_simplex_modes =