From f1a237520c1c47217edd1b5e5c8bb1e17688f21a Mon Sep 17 00:00:00 2001 From: Peter Kirchgessner Date: Mon, 4 Dec 2000 21:03:43 +0000 Subject: [PATCH] Fix problem with ADF-support (hp backend) --- backend/hp-handle.c | 16 +++++++++++----- backend/hp.c | 5 ++++- backend/hp.desc | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/backend/hp-handle.c b/backend/hp-handle.c index 111cfb332..e36d66a61 100644 --- a/backend/hp-handle.c +++ b/backend/hp-handle.c @@ -426,13 +426,19 @@ sanei_hp_handle_startScan (HpHandle this) /* HP ScanJet IIp does not support commands ADF scan window */ /* and unload document. We have to use the usual scan window. */ - if ( sanei_hp_device_support_get (this->dev->sanedev.name, - SCL_UNLOAD, &minval, &maxval) - != SANE_STATUS_GOOD ) + /* It turned out that other scanners also do not support unload */ + /* document, but change document (which is not supported by IIp too) */ + if ( (sanei_hp_device_support_get (this->dev->sanedev.name, + SCL_UNLOAD, &minval, &maxval) + != SANE_STATUS_GOOD ) + && (sanei_hp_device_support_get (this->dev->sanedev.name, + SCL_UNLOAD, &minval, &maxval) + != SANE_STATUS_GOOD ) ) { - DBG(1, "start: Request for ADF scan without support of unload doc.\n"); - DBG(1, " Seems to be a IIp. Use standard scan window command.\n"); + DBG(1, "start: Request for ADF scan without support of unload doc\n"); + DBG(1, " and change doc. Seems to be a IIp.\n"); + DBG(1, " Use standard scan window command.\n"); scl = SCL_START_SCAN; } diff --git a/backend/hp.c b/backend/hp.c index 4725f885c..515a641e3 100644 --- a/backend/hp.c +++ b/backend/hp.c @@ -43,9 +43,12 @@ HP Scanner Control Language (SCL). */ -static char *hp_backend_version = "0.92"; +static char *hp_backend_version = "0.93"; /* Changes: + V 0.93, 04-Dec-2000, PK (peter@kirchgessner.net) + - fix problem with ADF-support on ScanJet 6350 (and maybe others) + V 0.92, 03-Oct-2000, Rupert W. Curwen (rcurwen@uk.research.att.com): - try to not allocate accessors twice (only for accessors that have fixed length) diff --git a/backend/hp.desc b/backend/hp.desc index b9a511cde..93f5dbca6 100644 --- a/backend/hp.desc +++ b/backend/hp.desc @@ -10,7 +10,7 @@ ; :backend "hp" ; name of backend -:version "0.92" ; version of backend +:version "0.93" ; version of backend :status :beta ; :alpha, :beta, :stable, :new :manpage "sane-hp" ; name of manpage (if it exists) :url "http://www.kirchgessner.net/" ; backend's web page