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

Enable Slide on DigitDia 4000, correct misspelling

merge-requests/620/head
grmpl 2021-04-03 18:41:06 +02:00
rodzic e16d023b2b
commit 696ccd2d7b
3 zmienionych plików z 8 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
backend/pieusb.c
Wyświetl plik

@ -110,6 +110,8 @@ extern void write_tiff_rgbi_header (FILE *fptr, int width, int height, int depth
/* device flags */
#define FLAG_SLIDE_TRANSPORT 0x01
/* Some scanners do understand SLIDE_TRANSPORT but not CMD_17 - introducing a new flag */
#define FLAG_CMD_17_NOSUPPORT 0x02
/* --------------------------------------------------------------------------
*
@ -1004,10 +1006,12 @@ sane_start (SANE_Handle handle)
/* ----------------------------------------------------------------------
*
* Function 17
* This function is not supported by all scanners which are capable of
* slide transport, therefore FLAG_CMD_17_NOSUPPORT was introduced.
*
* ---------------------------------------------------------------------- */
if (scanner->device->flags & FLAG_SLIDE_TRANSPORT) {
if ( (scanner->device->flags & FLAG_SLIDE_TRANSPORT) & !(scanner->device->flags & FLAG_CMD_17_NOSUPPORT) ) {
sanei_pieusb_cmd_17 (scanner->device_number, 1, &status);
if (status.pieusb_status != PIEUSB_STATUS_GOOD) {
DBG (DBG_error, "sane_start(): sanei_pieusb_cmd_17 failed: %d\n", status.pieusb_status);

4
backend/pieusb.conf.in
Wyświetl plik

@ -16,5 +16,5 @@
usb 0x05e3 0x0145 0x47 0x00
# Reflecta CrystalScan 3600
usb 0x05e3 0x0145 0x2e 0x00
# Reflecta DigitDia 4000
usb 0x05e3 0x0142 0x2f 0x00
# Reflecta DigitDia 4000 - SLIDE_TRANSPORT but no CMD_17
usb 0x05e3 0x0142 0x2f 0x03

2
backend/pieusb_specific.c
Wyświetl plik

@ -753,7 +753,7 @@ sanei_pieusb_init_options (Pieusb_Scanner* scanner)
scanner->opt[OPT_FAST_INFRARED].cap |= SANE_CAP_SOFT_SELECT;
/* automatically advance to next slide after scan */
scanner->opt[OPT_ADVANCE_SLIDE].name = "advcane";
scanner->opt[OPT_ADVANCE_SLIDE].name = "advance";
scanner->opt[OPT_ADVANCE_SLIDE].title = "Advance slide";
scanner->opt[OPT_ADVANCE_SLIDE].desc = "Automatically advance to next slide after scan";
scanner->opt[OPT_ADVANCE_SLIDE].type = SANE_TYPE_BOOL;