summaryrefslogtreecommitdiff
path: root/backend/fujitsu.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-02-02 17:13:42 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-02-02 17:13:42 +0100
commit3dade5db2a37543f19f0967901d8d80a52a1e459 (patch)
tree808b2499b54563b3290f34d70d159b1024310873 /backend/fujitsu.c
parent5bb4cf12855ec0151de15d6c5a2354ff08766957 (diff)
parentffa8801644a7d53cc1c785e3450f794c07a14eb0 (diff)
Update upstream source from tag 'upstream/1.0.29'
Update to upstream version '1.0.29' with Debian dir 2d358af604988ebe4348e38096245d66036fe5ed
Diffstat (limited to 'backend/fujitsu.c')
-rw-r--r--backend/fujitsu.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/backend/fujitsu.c b/backend/fujitsu.c
index 3ac4c8e..5dc466c 100644
--- a/backend/fujitsu.c
+++ b/backend/fujitsu.c
@@ -6,7 +6,7 @@
Copyright (C) 2000 Randolph Bentson
Copyright (C) 2001 Frederik Ramm
Copyright (C) 2001-2004 Oliver Schirrmeister
- Copyright (C) 2003-2016 m. allan noah
+ Copyright (C) 2003-2019 m. allan noah
JPEG output and low memory usage support funded by:
Archivista GmbH, www.archivista.ch
@@ -603,6 +603,8 @@
v134 2019-02-23, MAN
- rewrite init_vpd for scanners which fail to report
overscan correctly
+ v135 2019-11-10, MAN
+ - set has_MS_lamp=0 for fi-72x0, bug #134
SANE FLOW DIAGRAM
@@ -2404,6 +2406,8 @@ init_model (struct fujitsu *s)
else if (strstr (s->model_name,"fi-7280")
|| strstr (s->model_name,"fi-7260")){
+ /* locks up scanner if we try to auto detect */
+ s->has_MS_lamp = 0;
/* weirdness */
/* these machines have longer max paper at lower res */
@@ -4377,7 +4381,7 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
if(option==OPT_TOP){
opt->name = "top-edge";
opt->title = SANE_I18N ("Top edge");
- opt->desc = SANE_I18N ("Paper is pulled partly into adf");
+ opt->desc = SANE_I18N ("Paper is pulled partly into ADF");
opt->type = SANE_TYPE_BOOL;
opt->unit = SANE_UNIT_NONE;
if (s->has_cmd_hw_status || s->ghs_in_rs)
@@ -6935,7 +6939,7 @@ sane_start (SANE_Handle handle)
else{
ret = scanner_control(s, SC_function_adf);
if (ret != SANE_STATUS_GOOD) {
- DBG (5, "sane_start: ERROR: cannot control adf, ignoring\n");
+ DBG (5, "sane_start: ERROR: cannot control ADF, ignoring\n");
}
}