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-formatext-pdf' into 'master' 

Add FormatExt for PDF.

See merge request sane-project/backends!356
merge-requests/213/head^2
Olaf Meeuwissen 2020-03-29 12:32:33 +00:00
rodzic 07f28a1ca6 8ecd54e8d2
commit ee54d3935f
1 zmienionych plików z 6 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -80,7 +80,10 @@ static char formatExtPNG[] =
static char formatExtTIFF[] = static char formatExtTIFF[] =
" <scan:DocumentFormatExt>image/tiff</scan:DocumentFormatExt>"; " <scan:DocumentFormatExt>image/tiff</scan:DocumentFormatExt>";
/** static char formatExtPDF[] =
" <scan:DocumentFormatExt>application/pdf</scan:DocumentFormatExt>";
/**
* \fn static size_t download_callback(void *str, size_t size, size_t nmemb, void *userp) * \fn static size_t download_callback(void *str, size_t size, size_t nmemb, void *userp)
* \brief Callback function that stocks in memory the content of the 'job'. Example below : * \brief Callback function that stocks in memory the content of the 'job'. Example below :
* "Trying 192.168.14.150... * "Trying 192.168.14.150...
@ -172,6 +175,8 @@ escl_newjob (capabilities_t *scanner, const ESCL_Device *device, SANE_Status *st
format_ext = formatExtPNG; format_ext = formatExtPNG;
else if (!strcmp(scanner->default_format, "image/tiff")) else if (!strcmp(scanner->default_format, "image/tiff"))
format_ext = formatExtTIFF; format_ext = formatExtTIFF;
else if (!strcmp(scanner->default_format, "application/pdf"))
format_ext = formatExtPDF;
else else
format_ext = f_ext; format_ext = f_ext;
} }