Merge branch 'escl-device-crash-without-flatbed' into 'master'

Escl device crash without flatbed

See merge request sane-project/backends!554
merge-requests/562/merge
Olaf Meeuwissen 2020-12-17 10:57:02 +00:00
commit fc1c5667da
3 zmienionych plików z 25 dodań i 3 usunięć

Wyświetl plik

@ -578,8 +578,25 @@ init_options(SANE_String_Const name_source, escl_sane_t *s)
s->scanner->source = PLATEN;
if (source == s->scanner->source) return status;
}
else
s->scanner->source = PLATEN;
if (s->scanner->caps[s->scanner->source].ColorModes == NULL) {
if (s->scanner->caps[PLATEN].ColorModes)
s->scanner->source = PLATEN;
else if (s->scanner->caps[ADFSIMPLEX].ColorModes)
s->scanner->source = ADFSIMPLEX;
else if (s->scanner->caps[ADFDUPLEX].ColorModes)
s->scanner->source = ADFDUPLEX;
else
return SANE_STATUS_INVAL;
}
if (s->scanner->source == PLATEN) {
DBG (10, "SOURCE PLATEN.\n");
}
else if (s->scanner->source == ADFDUPLEX) {
DBG (10, "SOURCE ADFDUPLEX.\n");
}
else if (s->scanner->source == ADFSIMPLEX) {
DBG (10, "SOURCE ADFSIMPLEX.\n");
}
memset (s->opt, 0, sizeof (s->opt));
memset (s->val, 0, sizeof (s->val));
for (i = 0; i < NUM_OPTIONS; ++i) {

Wyświetl plik

@ -107,6 +107,11 @@
:status :good
:comment "All resolutions supported."
:model "DeskJet 3760"
:interface "WiFi"
:status :good
:comment "All resolutions supported."
:model "LaserJet MFP M28w"
:interface "WiFi"
:status :untested

Wyświetl plik

@ -27,7 +27,7 @@ CANON PIXMA TR8500, TR8520
.br
EPSON ET3740, ET4750
.br
HP DESKJET 2710, DESKJET 2723, LASERJET MFP M28W,
HP DESKJET 2710, DESKJET 2723, DESKJET 3760, LASERJET MFP M28W,
.br
HP OFFICEJET 4630, OFFICEJET PRO 8610
.br