summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2021-09-28 11:53:18 +0200
committerJörg Frings-Fürst <debian@jff.email>2021-09-28 11:53:18 +0200
commitecd78b4dbc7cb634fc7bda67205a5bd04b13d5ea (patch)
treedc7b1845ae0476a061858277a30665b70d80e4fe /src
parent9a828fe5ebd2383cce394eb76f44d14a9dbf143e (diff)
parent60e8a606e56fe8e140e405cd167c13989e9dbbf1 (diff)
Merge branch 'release/debian/40.5-1'debian/40.5-1
Diffstat (limited to 'src')
-rw-r--r--src/scanner.vala12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/scanner.vala b/src/scanner.vala
index 745b779..01e77e2 100644
--- a/src/scanner.vala
+++ b/src/scanner.vala
@@ -925,8 +925,8 @@ public class Scanner : Object
"Automatic Document Feeder",
Sane.I18N ("Automatic Document Feeder"),
"ADF",
- "Automatic Document Feeder(left aligned)", /* Seen in the proprietary brother3 driver */
"Automatic Document Feeder(centrally aligned)", /* Seen in the proprietary brother3 driver */
+ "Automatic Document Feeder(left aligned)", /* Seen in the proprietary brother3 driver */
"ADF Simplex" /* Samsung unified driver. LP: # 892915 */
};
@@ -1140,7 +1140,7 @@ public class Scanner : Object
set_fixed_or_int_option (handle, option, index, job.dpi, out job.dpi);
option = get_option_by_name (handle, Sane.NAME_SCAN_Y_RESOLUTION, out index);
}
- else
+ else
option = get_option_by_name (handle, Sane.NAME_SCAN_RESOLUTION, out index);
if (option == null) /* #161 Lexmark CX310dn Duplex */
option = get_option_by_name (handle, "scan-resolution", out index);
@@ -1172,11 +1172,17 @@ public class Scanner : Object
else
set_option_to_max (handle, option, index);
}
- if (job.page_width == 0) /* #90 Fix automatic mode for Epson scanners */
+ if (job.page_width == 0)
{
+ /* #90 Fix automatic mode for Epson scanners */
option = get_option_by_name (handle, "scan-area", out index);
if (option != null)
set_string_option (handle, option, index, "Maximum", null);
+
+ /* #264 Enable automatic document size for Brother scanners */
+ option = get_option_by_name (handle, "AutoDocumentSize", out index);
+ if (option != null)
+ set_bool_option (handle, option, index, true, null);
}
/* Set page size */
option = get_option_by_name (handle, Sane.NAME_PAGE_WIDTH, out index);