summaryrefslogtreecommitdiff
path: root/backend/canon.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-03-30 21:30:45 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-03-30 21:30:45 +0200
commitee770c2346eb37e0dcb8b6cf3eaacf3d8efd6bbc (patch)
tree58f05092be1a17a939e861f8cadcda1b6ca2ecef /backend/canon.c
parent0da9e21872802cfc6e975b1ebaf9efb9e5934d84 (diff)
parentfef76e17ed4c607ea73b81279f9ef1d7121be900 (diff)
Merge branch 'release/experimental/1.0.29-1_experimental1'experimental/1.0.29-1_experimental1
Diffstat (limited to 'backend/canon.c')
-rw-r--r--backend/canon.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/backend/canon.c b/backend/canon.c
index 168b2d6..4a5a2a2 100644
--- a/backend/canon.c
+++ b/backend/canon.c
@@ -62,7 +62,7 @@
. . - sane_get_parameters() : returns actual scan-parameters
. . - sane_read() : read image-data (from pipe)
. . - sane_cancel() : cancel operation, kill reader_process
-
+
. - sane_close() : close opened scanner-device, do_cancel, free buffer and handle
- sane_exit() : terminate use of backend, free devicename and device-struture
*/
@@ -140,7 +140,7 @@ static const SANE_String_Const mode_list[] = {
SANE_VALUE_SCAN_MODE_HALFTONE,
SANE_VALUE_SCAN_MODE_GRAY,
SANE_VALUE_SCAN_MODE_COLOR,
- 0
+ 0
};
/* modification for FS2710 */
@@ -193,11 +193,6 @@ static const SANE_String_Const tpu_filmtype_list[] = {
0
};
-static const SANE_String_Const papersize_list[] = {
- "A4", "Letter", "B5", "Maximal",
- 0
-};
-
/**************************************************/
static const SANE_Range u8_range = {
@@ -462,7 +457,7 @@ sense_handler (int scsi_fd, u_char * result, void *arg)
status = SANE_STATUS_UNSUPPORTED;
break;
case 0x8002:
- sense_str = SANE_I18N("option not connect");
+ sense_str = SANE_I18N("option not correct");
status = SANE_STATUS_UNSUPPORTED;
break;
default: