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

Merge branch 'escl-fix-feeder-not-duplex' into 'master' 

Escl fix feeder not duplex

See merge request sane-project/backends!429
merge-requests/463/merge
Ordissimo 2020-05-06 09:21:28 +00:00
rodzic 833c25c3ae c9fdb62060
commit 050e73d07e
2 zmienionych plików z 11 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

25
backend/escl/escl_capabilities.c
Wyświetl plik

@ -330,31 +330,22 @@ print_xml_c(xmlNode *node, capabilities_t *scanner, int type)
find_true_variables(node, scanner, type);
}
if (!strcmp((const char *)node->name, "PlatenInputCaps")) {
scanner->Sources =
char_to_array(scanner->Sources,
&scanner->SourcesSize,
(SANE_String_Const)SANE_I18N ("Flatbed"),
0);
scanner->Sources[PLATEN] = (SANE_String_Const)strdup(SANE_I18N ("Flatbed"));
scanner->SourcesSize++;
scanner->source = PLATEN;
print_xml_c(node->children, scanner, PLATEN);
scanner->caps[PLATEN].duplex = 0;
}
else if (!strcmp((const char *)node->name, "AdfSimplexInputCaps")) {
scanner->Sources =
char_to_array(scanner->Sources,
&scanner->SourcesSize,
(SANE_String_Const)SANE_I18N("ADF"),
0);
scanner->Sources[ADFSIMPLEX] = (SANE_String_Const)strdup(SANE_I18N("ADF"));
scanner->SourcesSize++;
if (scanner->source == -1) scanner->source = ADFSIMPLEX;
print_xml_c(node->children, scanner, ADFSIMPLEX);
scanner->caps[ADFSIMPLEX].duplex = 0;
}
else if (!strcmp((const char *)node->name, "AdfDuplexInputCaps")) {
scanner->Sources =
char_to_array(scanner->Sources,
&scanner->SourcesSize,
(SANE_String_Const)SANE_I18N ("ADF Duplex"),
0);
scanner->Sources[ADFDUPLEX] = (SANE_String_Const)strdup(SANE_I18N ("ADF Duplex"));
scanner->SourcesSize++;
if (scanner->source == -1) scanner->source = ADFDUPLEX;
print_xml_c(node->children, scanner, ADFDUPLEX);
scanner->caps[ADFDUPLEX].duplex = 1;
@ -406,6 +397,7 @@ escl_capabilities(const ESCL_Device *device, SANE_Status *status)
struct cap *var = NULL;
xmlDoc *data = NULL;
xmlNode *node = NULL;
int i = 0;
const char *scanner_capabilities = "/eSCL/ScannerCapabilities";
*status = SANE_STATUS_GOOD;
@ -438,6 +430,9 @@ escl_capabilities(const ESCL_Device *device, SANE_Status *status)
}
scanner->source = 0;
scanner->Sources = (SANE_String_Const *)malloc(sizeof(SANE_String_Const) * 4);
for (i = 0; i < 4; i++)
scanner->Sources[i] = NULL;
print_xml_c(node, scanner, -1);
_reduce_color_modes(scanner);
clean:

2
backend/escl/escl_newjob.c
Wyświetl plik

@ -169,7 +169,7 @@ escl_newjob (capabilities_t *scanner, const ESCL_Device *device, SANE_Status *st
}
else
format_ext = f_ext;
if(scanner->source > PLATEN) {
if(scanner->source > PLATEN && scanner->Sources[ADFDUPLEX]) {
snprintf(duplex_mode, sizeof(duplex_mode),
" <scan:Duplex>%s</scan:Duplex>",
scanner->source == ADFDUPLEX ? "true" : "false");