From 7ab8c8e0307a0d58438619693c53d9844763f1e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 12 Sep 2020 11:16:14 +0200 Subject: New upstream version 3.38.0 --- src/scanner.vala | 80 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 36 deletions(-) (limited to 'src/scanner.vala') diff --git a/src/scanner.vala b/src/scanner.vala index dc58f14..becb9fa 100644 --- a/src/scanner.vala +++ b/src/scanner.vala @@ -429,7 +429,7 @@ public class Scanner : Object return false; var status = Sane.control_option (handle, option_index, Sane.Action.SET_AUTO, null, null); - debug ("sane_control_option (%d, SANE_ACTION_SET_AUTO) -> %s", (int) option_index, Sane.status_to_string (status)); + debug ("sane_control_option (%d, SANE_ACTION_SET_AUTO, %s=auto) -> %s", (int) option_index, option.name, Sane.status_to_string (status)); if (status != Sane.Status.GOOD) warning ("Error setting default option %s: %s", option.name, Sane.strstatus(status)); @@ -443,7 +443,7 @@ public class Scanner : Object Sane.Bool v = (Sane.Bool) value; var status = Sane.control_option (handle, option_index, Sane.Action.SET_VALUE, &v, null); result = (bool) v; - debug ("sane_control_option (%d, SANE_ACTION_SET_VALUE, %s) -> (%s, %s)", (int) option_index, value ? "SANE_TRUE" : "SANE_FALSE", Sane.status_to_string (status), result ? "SANE_TRUE" : "SANE_FALSE"); + debug ("sane_control_option (%d, SANE_ACTION_SET_VALUE, %s=%s) -> (%s, %s)", (int) option_index, option.name, value ? "SANE_TRUE" : "SANE_FALSE", Sane.status_to_string (status), result ? "SANE_TRUE" : "SANE_FALSE"); } private void set_int_option (Sane.Handle handle, Sane.OptionDescriptor option, Sane.Int option_index, int value, out int result) @@ -480,7 +480,7 @@ public class Scanner : Object } var status = Sane.control_option (handle, option_index, Sane.Action.SET_VALUE, &v, null); - debug ("sane_control_option (%d, SANE_ACTION_SET_VALUE, %d) -> (%s, %d)", (int) option_index, value, Sane.status_to_string (status), (int) v); + debug ("sane_control_option (%d, SANE_ACTION_SET_VALUE, %s=%d) -> (%s, %d)", (int) option_index, option.name, value, Sane.status_to_string (status), (int) v); result = (int) v; } @@ -520,7 +520,7 @@ public class Scanner : Object v_fixed = Sane.FIX (v); var status = Sane.control_option (handle, option_index, Sane.Action.SET_VALUE, &v_fixed, null); - debug ("sane_control_option (%d, SANE_ACTION_SET_VALUE, %f) -> (%s, %f)", (int) option_index, value, Sane.status_to_string (status), Sane.UNFIX (v_fixed)); + debug ("sane_control_option (%d, SANE_ACTION_SET_VALUE, %s=%f) -> (%s, %f)", (int) option_index, option.name, value, Sane.status_to_string (status), Sane.UNFIX (v_fixed)); result = Sane.UNFIX (v_fixed); } @@ -550,9 +550,9 @@ public class Scanner : Object var status = Sane.control_option (handle, option_index, Sane.Action.SET_VALUE, &option.range.max, null); if (option.type == Sane.ValueType.FIXED) - debug ("sane_control_option (%d, SANE_ACTION_SET_VALUE, option.range.max=%f) -> (%s)", (int) option_index, Sane.UNFIX (option.range.max), Sane.status_to_string (status)); + debug ("sane_control_option (%d, SANE_ACTION_SET_VALUE, %s=option.range.max=%f) -> (%s)", (int) option_index, option.name, Sane.UNFIX (option.range.max), Sane.status_to_string (status)); else - debug ("sane_control_option (%d, SANE_ACTION_SET_VALUE, option.range.max=%d) -> (%s)", (int) option_index, (int) option.range.max, Sane.status_to_string (status)); + debug ("sane_control_option (%d, SANE_ACTION_SET_VALUE, %s=option.range.max=%d) -> (%s)", (int) option_index, option.name, (int) option.range.max, Sane.status_to_string (status)); } private bool set_string_option (Sane.Handle handle, Sane.OptionDescriptor option, Sane.Int option_index, string value, out string result) @@ -568,7 +568,7 @@ public class Scanner : Object s[i] = '\0'; var status = Sane.control_option (handle, option_index, Sane.Action.SET_VALUE, s, null); result = (string) s; - debug ("sane_control_option (%d, SANE_ACTION_SET_VALUE, \"%s\") -> (%s, \"%s\")", (int) option_index, value, Sane.status_to_string (status), result); + debug ("sane_control_option (%d, SANE_ACTION_SET_VALUE, %s=\"%s\") -> (%s, \"%s\")", (int) option_index, option.name, value, Sane.status_to_string (status), result); return status == Sane.Status.GOOD; } @@ -918,7 +918,6 @@ public class Scanner : Object option = get_option_by_name (handle, Sane.NAME_SCAN_SOURCE, out index); if (option == null) { - debug ("SCAN_SOURCE not available, trying alternative \"doc-source\""); option = get_option_by_name (handle, "doc-source", out index); /* Samsung unified driver. LP: #892915 */ } if (option != null) @@ -932,7 +931,7 @@ public class Scanner : Object "FlatBed", "Normal", Sane.I18N ("Normal"), - "Document Table" /* Epson scanners, eg. ET-3760 */ + "Document Table" /* Epson scanners, eg. ET-3760 */ }; string[] adf_sources = @@ -1135,7 +1134,12 @@ public class Scanner : Object else set_option_to_max (handle, option, index); } - + 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); + } /* Set page size */ option = get_option_by_name (handle, Sane.NAME_PAGE_WIDTH, out index); if (option != null && job.page_width > 0.0) @@ -1147,40 +1151,34 @@ public class Scanner : Object option = get_option_by_name (handle, Sane.NAME_BRIGHTNESS, out index); if (option != null) { - if (job.brightness != 0) + if (option.type == Sane.ValueType.FIXED) { - if (option.type == Sane.ValueType.FIXED) - { - var brightness = scale_fixed (-100, 100, option, job.brightness); - set_fixed_option (handle, option, index, brightness, null); - } - else if (option.type == Sane.ValueType.INT) - { - var brightness = scale_int (-100, 100, option, job.brightness); - set_int_option (handle, option, index, brightness, null); - } - else - warning ("Unable to set brightness, please file a bug"); + var brightness = scale_fixed (-100, 100, option, job.brightness); + set_fixed_option (handle, option, index, brightness, null); } + else if (option.type == Sane.ValueType.INT) + { + var brightness = scale_int (-100, 100, option, job.brightness); + set_int_option (handle, option, index, brightness, null); + } + else + warning ("Unable to set brightness, please file a bug"); } option = get_option_by_name (handle, Sane.NAME_CONTRAST, out index); if (option != null) { - if (job.contrast != 0) + if (option.type == Sane.ValueType.FIXED) { - if (option.type == Sane.ValueType.FIXED) - { - var contrast = scale_fixed (-100, 100, option, job.contrast); - set_fixed_option (handle, option, index, contrast, null); - } - else if (option.type == Sane.ValueType.INT) - { - var contrast = scale_int (-100, 100, option, job.contrast); - set_int_option (handle, option, index, contrast, null); - } - else - warning ("Unable to set contrast, please file a bug"); + var contrast = scale_fixed (-100, 100, option, job.contrast); + set_fixed_option (handle, option, index, contrast, null); + } + else if (option.type == Sane.ValueType.INT) + { + var contrast = scale_int (-100, 100, option, job.contrast); + set_int_option (handle, option, index, contrast, null); } + else + warning ("Unable to set contrast, please file a bug"); } /* Test scanner options (hoping will not effect other scanners...) */ @@ -1294,6 +1292,16 @@ public class Scanner : Object /* Error displayed when no documents at the start of scanning */ _("Document feeder empty")); } + else if (status == Sane.Status.NO_MEM) + { + fail_scan (status, + /* Out of memory error message with help instruction. + Message written in Pango text markup language, + A carriage return makes a line break, tag makes a monospace font */ + _("Insufficient memory to perform scan.\n" + + "Try to decrease Resolution or Page Size in Preferences menu. " + + "For some scanners when scanning in high resolution, the scan size is restricted.")); + } else if (status == Sane.Status.DEVICE_BUSY) { /* If device is busy don't interrupt, but keep waiting for scanner */ -- cgit v1.2.3