mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fixed color three-pass scanning for some scanners. 

Henning Meier-Geinitz <henning@meier-geinitz.de>
DEVEL_2_0_BRANCH-1
Henning Geinitz 2002-04-06 20:39:01 +00:00
rodzic 797a910e48
commit 4958dd297b
2 zmienionych plików z 22 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
backend/mustek.c
Wyświetl plik

@ -46,7 +46,7 @@
/**************************************************************************/ /**************************************************************************/
/* Mustek backend version */ /* Mustek backend version */
#define BUILD 119 #define BUILD 120
/**************************************************************************/ /**************************************************************************/
#include "../include/sane/config.h" #include "../include/sane/config.h"
@ -470,7 +470,15 @@ dev_wait_ready (Mustek_Scanner *s)
if (s->hw->flags & MUSTEK_FLAG_N) if (s->hw->flags & MUSTEK_FLAG_N)
return n_wait_ready (s); return n_wait_ready (s);
else if (s->hw->flags & MUSTEK_FLAG_THREE_PASS) else if (s->hw->flags & MUSTEK_FLAG_THREE_PASS)
return scsi_area_wait_ready (s); {
SANE_Status status;
/* some 3-pass scanners seem to need the inquiry wait, too */
status = scsi_area_wait_ready (s);
if (status != SANE_STATUS_GOOD)
return status;
return scsi_inquiry_wait_ready (s);
}
else if ((s->hw->flags & MUSTEK_FLAG_PARAGON_1) else if ((s->hw->flags & MUSTEK_FLAG_PARAGON_1)
|| (s->hw->flags & MUSTEK_FLAG_PARAGON_2)) || (s->hw->flags & MUSTEK_FLAG_PARAGON_2))
return scsi_inquiry_wait_ready (s); return scsi_inquiry_wait_ready (s);
@ -982,13 +990,17 @@ attach (SANE_String_Const devname, Mustek_Device **devp, SANE_Bool may_wait)
} }
else else
{ {
/* Check for Trust scanners an print warning */ /* Check for some non-Mustek scanners an print warning */
if (strncmp ((SANE_String) result + 8, "Trust", 5) == 0) if (strncmp ((SANE_String) result + 8, "Trust", 5) == 0)
DBG(1, "attach: this is a real Trust scanner. It is not " DBG(1, "attach: this is a real Trust scanner. It is not "
" supported by this backend.\n"); " supported by this backend.\n");
if (strncmp ((SANE_String) result + 8, "Aashima", 7) == 0) if (strncmp ((SANE_String) result + 8, "Aashima", 7) == 0)
DBG(1, "attach: this is an Aashima/Teco scanner. It is not " DBG(1, "attach: this is an Aashima/Teco scanner. It is not "
" supported by this backend.\n"); " supported by this backend.\n");
if (strncmp ((SANE_String) result + 16, "Flatbed Scanner", 15) == 0
&& strncmp ((SANE_String) result + 42, "TECO", 4) == 0)
DBG(1, "attach: this is a Relysis/Teco scanner. It is not "
" supported by this backend.\n");
DBG(1, "attach: device %s doesn't look like a Mustek scanner\n", DBG(1, "attach: device %s doesn't look like a Mustek scanner\n",
devname); devname);
return SANE_STATUS_INVAL; return SANE_STATUS_INVAL;

7
doc/mustek/mustek.CHANGES
Wyświetl plik

@ -1,5 +1,12 @@
CHANGES for the SANE Mustek backend CHANGES for the SANE Mustek backend
2002-04-06:
* Released Mustek backend 1.0-120.
2002-04-05:
* For 3-pass scanners use area_wait_ready and inquiry_wait_ready. The first
wait doesn't seem to be enough for some scanners.
2002-03-20: 2002-03-20:
* Released Mustek backend 1.0-119. * Released Mustek backend 1.0-119.