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

The name of the device, allows to disable the use of the PDF format.

See merge request sane-project/backends!651
release-1.1.x
Ordissimo 2021-09-26 06:35:31 +00:00
rodzic 66f2673d71 88934578ec
commit 65b6684984
4 zmienionych plików z 107 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
backend/escl.conf.in
Wyświetl plik

@ -11,6 +11,11 @@
# You can also configure a device on a single line starting with 'device'
# by writing a complete URL and an optional model name.
# Name of the device not using the PDF format. Spaces are replaced by _. Please report the devices having this problem on sane-devel
# Uncomment the line to add your device
#pdfblacklist Brother_DCP-L2530DW_series
#device http://123.456.789.10:8080 OptionalModel1
#device https://123.456.789.10:443 "Optional Model 2"
#device https://123.456.789.10:443 "HP Color LaserJet FlowMFP M578" "hack=localhost"

37
backend/escl/escl.c
Wyświetl plik

@ -432,7 +432,7 @@ attach_one_config(SANEI_Config __sane_unused__ *config, const char *line,
int port = 0;
SANE_Status status;
static ESCL_Device *escl_device = NULL;
if (*line == '#') return SANE_STATUS_GOOD;
if (strncmp(line, "device", 6) == 0) {
char *name_str = NULL;
char *opt_model = NULL;
@ -1135,6 +1135,37 @@ finish_hack:
fclose(fp);
}
static char*
_get_blacklist_pdf(void)
{
FILE *fp;
char *blacklist = NULL;
SANE_Char line[PATH_MAX];
/* open configuration file */
fp = sanei_config_open (ESCL_CONFIG_FILE);
if (!fp)
{
DBG (2, "_get_blacklit: couldn't access %s\n", ESCL_CONFIG_FILE);
DBG (3, "_get_blacklist: exit\n");
}
/* loop reading the configuration file, all line beginning by "option " are
* parsed for value to store in configuration structure, other line are
* used are device to try to attach
*/
while (sanei_config_read (line, PATH_MAX, fp))
{
if (!strncmp(line, "pdfblacklist", 12)) {
blacklist = strdup(line);
goto finish_;
}
}
finish_:
DBG (3, "_get_blacklist_pdf: finish\n");
fclose(fp);
return blacklist;
}
/**
@ -1149,6 +1180,7 @@ finish_hack:
SANE_Status
sane_open(SANE_String_Const name, SANE_Handle *h)
{
char *blacklist = NULL;
DBG (10, "escl sane_open\n");
SANE_Status status;
escl_sane_t *handler = NULL;
@ -1173,7 +1205,8 @@ sane_open(SANE_String_Const name, SANE_Handle *h)
return (SANE_STATUS_NO_MEM);
}
handler->device = device; // Handler owns device now.
handler->scanner = escl_capabilities(device, &status);
blacklist = _get_blacklist_pdf();
handler->scanner = escl_capabilities(device, blacklist, &status);
if (status != SANE_STATUS_GOOD) {
escl_free_handler(handler);
return (status);

1
backend/escl/escl.h
Wyświetl plik

@ -231,6 +231,7 @@ SANE_Status escl_status(const ESCL_Device *device,
SANE_Status *job);
capabilities_t *escl_capabilities(ESCL_Device *device,
char *blacklist,
SANE_Status *status);
char *escl_newjob(capabilities_t *scanner,

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

@ -201,10 +201,10 @@ find_valor_of_array_variables(xmlNode *node, capabilities_t *scanner, int type)
{
const char *name = (const char *)node->name;
if (strcmp(name, "ColorMode") == 0) {
const char *color = (SANE_String_Const)xmlNodeGetContent(node);
if (type == PLATEN || strcmp(color, "BlackAndWhite1"))
const char *color = (SANE_String_Const)xmlNodeGetContent(node);
if (type == PLATEN || strcmp(color, "BlackAndWhite1"))
scanner->caps[type].ColorModes = char_to_array(scanner->caps[type].ColorModes, &scanner->caps[type].ColorModesSize, (SANE_String_Const)xmlNodeGetContent(node), 1);
}
}
else if (strcmp(name, "ContentType") == 0)
scanner->caps[type].ContentTypes = char_to_array(scanner->caps[type].ContentTypes, &scanner->caps[type].ContentTypesSize, (SANE_String_Const)xmlNodeGetContent(node), 0);
else if (strcmp(name, "DocumentFormat") == 0)
@ -404,6 +404,16 @@ find_true_variables(xmlNode *node, capabilities_t *scanner, int type)
return (0);
}
static char*
replace_char(char* str, char find, char replace){
char *current_pos = strchr(str,find);
while (current_pos) {
*current_pos = replace;
current_pos = strchr(current_pos,find);
}
return str;
}
/**
* \fn static int print_xml_c(xmlNode *node, capabilities_t *scanner)
* \brief Function that browses the xml file, node by node.
@ -473,6 +483,37 @@ _reduce_color_modes(capabilities_t *scanner)
}
}
static void
_delete_pdf(capabilities_t *scanner)
{
int type = 0;
for (type = 0; type < 3; type++) {
if (scanner->caps[type].ColorModesSize) {
if (scanner->caps[type].default_format) {
scanner->caps[type].have_pdf = -1;
if (!strcmp(scanner->caps[type].default_format, "application/pdf")) {
free(scanner->caps[type].default_format);
if (scanner->caps[type].have_tiff > -1)
scanner->caps[type].default_format = strdup("image/tiff");
else if (scanner->caps[type].have_png > -1)
scanner->caps[type].default_format = strdup("image/png");
else if (scanner->caps[type].have_jpeg > -1)
scanner->caps[type].default_format = strdup("image/jpeg");
}
free(scanner->caps[type].ColorModes);
scanner->caps[type].ColorModes = NULL;
scanner->caps[type].ColorModesSize = 0;
scanner->caps[type].ColorModes = char_to_array(scanner->caps[type].ColorModes,
&scanner->caps[type].ColorModesSize,
(SANE_String_Const)SANE_VALUE_SCAN_MODE_GRAY, 0);
scanner->caps[type].ColorModes = char_to_array(scanner->caps[type].ColorModes,
&scanner->caps[type].ColorModesSize,
(SANE_String_Const)SANE_VALUE_SCAN_MODE_COLOR, 0);
}
}
}
}
/**
* \fn capabilities_t *escl_capabilities(const ESCL_Device *device, SANE_Status *status)
* \brief Function that finally recovers all the capabilities of the scanner, using curl.
@ -482,7 +523,7 @@ _reduce_color_modes(capabilities_t *scanner)
* \return scanner (the structure that stocks all the capabilities elements)
*/
capabilities_t *
escl_capabilities(ESCL_Device *device, SANE_Status *status)
escl_capabilities(ESCL_Device *device, char *blacklist, SANE_Status *status)
{
capabilities_t *scanner = (capabilities_t*)calloc(1, sizeof(capabilities_t));
CURL *curl_handle = NULL;
@ -492,6 +533,7 @@ escl_capabilities(ESCL_Device *device, SANE_Status *status)
xmlNode *node = NULL;
int i = 0;
const char *scanner_capabilities = "/eSCL/ScannerCapabilities";
SANE_Bool use_pdf = SANE_TRUE;
*status = SANE_STATUS_GOOD;
if (device == NULL)
@ -543,7 +585,26 @@ escl_capabilities(ESCL_Device *device, SANE_Status *status)
for (i = 0; i < 4; i++)
scanner->Sources[i] = NULL;
print_xml_c(node, device, scanner, -1);
_reduce_color_modes(scanner);
DBG (3, "1-blacklist_pdf: %s\n", (use_pdf ? "TRUE" : "FALSE") );
if (device->model_name != NULL) {
if (strcasestr(device->model_name, "MFC-J985DW")) {
DBG (3, "blacklist_pdf: device not support PDF\n");
use_pdf = SANE_FALSE;
}
else if (blacklist) {
char *model = strdup(device->model_name);
replace_char(model, ' ', '_');
if (strcasestr(blacklist, model)) {
use_pdf = SANE_FALSE;
}
free(model);
}
}
DBG (3, "1-blacklist_pdf: %s\n", (use_pdf ? "TRUE" : "FALSE") );
if (use_pdf)
_reduce_color_modes(scanner);
else
_delete_pdf(scanner);
clean:
xmlFreeDoc(data);
clean_data: