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-documentformat' into 'master' 

Choose the format according to availability and options.

See merge request sane-project/backends!560
escl-fix-sleep-mode
Ordissimo 2020-12-21 20:54:27 +00:00
rodzic ae06e017f4 4aa767327d
commit 87d9a86742
1 zmienionych plików z 27 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -169,6 +169,33 @@ escl_newjob (capabilities_t *scanner, const ESCL_Device *device, SANE_Status *st
return (NULL);
}
curl_handle = curl_easy_init();
if (scanner->caps[scanner->source].default_format)
free(scanner->caps[scanner->source].default_format);
scanner->caps[scanner->source].default_format = NULL;
int have_png = scanner->caps[scanner->source].have_png;
int have_jpeg = scanner->caps[scanner->source].have_jpeg;
int have_tiff = scanner->caps[scanner->source].have_tiff;
int have_pdf = scanner->caps[scanner->source].have_pdf;
if ((scanner->source == PLATEN && have_pdf == -1) ||
(scanner->source > PLATEN)) {
if (have_tiff != -1) {
scanner->caps[scanner->source].default_format =
strdup(scanner->caps[scanner->source].DocumentFormats[have_tiff]);
}
else if (have_png != -1) {
scanner->caps[scanner->source].default_format =
strdup(scanner->caps[scanner->source].DocumentFormats[have_png]);
}
else if (have_jpeg != -1) {
scanner->caps[scanner->source].default_format =
strdup(scanner->caps[scanner->source].DocumentFormats[have_jpeg]);
}
}
else {
scanner->caps[scanner->source].default_format =
strdup(scanner->caps[scanner->source].DocumentFormats[have_pdf]);
}
if (scanner->caps[scanner->source].format_ext == 1)
{
char f_ext_tmp[1024];