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

do not use request_identity2 with 

networked scanners, fixed generation of resolution list.
merge-requests/1/head
Alessandro Zummo 2009-01-15 19:18:05 +00:00
rodzic 1b57825ef3
commit 7ee4156e7d
2 zmienionych plików z 18 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
ChangeLog
Wyświetl plik

@ -1,3 +1,8 @@
2009-01-15 Alessandro Zummo <a.zummo@towertech.it>
* backend/epson2.c: do not use request_identity2 with
networked scanners, fixed generation of resolution
list.
2009-01-13 Louis Lagendijk <llagendijk-guest at users.alioth.debian.org>
* backend/pixma_bjnp.c: send broadcasts from bjnp port to make
firewalling easier

20
backend/epson2.c
Wyświetl plik

@ -1053,7 +1053,6 @@ e2_discover_capabilities(Epson_Scanner *s)
dev->TPU = SANE_TRUE;
}
/* fix problem with broken report of dpi */
fix_up_dpi(s);
}
@ -1066,7 +1065,7 @@ e2_discover_capabilities(Epson_Scanner *s)
* get the information from the scanner and store it in dev
*/
if (dev->cmd->request_identity2) {
if (dev->cmd->request_identity2 && dev->connection != SANE_EPSON_NET) {
unsigned char *buf;
status = esci_request_identity2(s, &buf);
if (status != SANE_STATUS_GOOD)
@ -1485,13 +1484,20 @@ attach(const char *name, Epson_Device * *devp, int type)
*/
if (dev->res_list_size == 0 && dev->connection == SANE_EPSON_NET) {
int val = 150;
DBG(1, "networked scanner, faking resolution list\n");
int val = (dev->dpi_range.min < 150) ? 150 : dev->dpi_range.min;
e2_add_resolution(s, 50);
e2_add_resolution(s, 75);
e2_add_resolution(s, 100);
DBG(1, "networked scanner, faking resolution list (%d-%d)\n",
dev->dpi_range.min, dev->dpi_range.max);
if (dev->dpi_range.min <= 50)
e2_add_resolution(s, 50);
if (dev->dpi_range.min <= 75)
e2_add_resolution(s, 75);
if (dev->dpi_range.min <= 100)
e2_add_resolution(s, 100);
while (val <= dev->dpi_range.max) {
e2_add_resolution(s, val);