epsonds: fixed resolution setting bug, DS-60000 workaround is needed no more

merge-requests/1/head
Alessandro Zummo 2016-03-21 18:59:47 +01:00
rodzic 52bc4d241c
commit 41a416e4af
3 zmienionych plików z 4 dodań i 19 usunięć

Wyświetl plik

@ -69,10 +69,6 @@ eds_dev_post_init(struct epsonds_device *dev)
return SANE_STATUS_INVAL;
}
if (eds_is_model(dev, "DS-60000")) {
dev->has_stripes_bug = 1;
}
return SANE_STATUS_GOOD;
}
@ -221,15 +217,6 @@ eds_init_parameters(epsonds_scanner *s)
else
s->params.depth = s->val[OPT_DEPTH].w;
/* we have stripes on scanned pages in duplex @ 300dpi */
if (s->hw->has_stripes_bug && s->val[OPT_RESOLUTION].w == 300) {
DBG(0, "%s: artifacts will be produced at 300 dpi, lowering to 299.\n", __func__);
s->val[OPT_RESOLUTION].w = 299; // speed at 301 is too slow
}
dpi = s->val[OPT_RESOLUTION].w;
if (SANE_UNFIX(s->val[OPT_BR_Y].w) == 0 ||

Wyświetl plik

@ -12,8 +12,8 @@
*/
#define EPSONDS_VERSION 1
#define EPSONDS_REVISION 0
#define EPSONDS_BUILD 36
#define EPSONDS_REVISION 1
#define EPSONDS_BUILD 0
/* debugging levels:
*
@ -1159,9 +1159,9 @@ sane_start(SANE_Handle handle)
/* resolution (RSMi not always supported) */
if (s->val[OPT_RESOLUTION].w > 999) {
sprintf(buf, "#RSMi%07d", s->val[OPT_RESOLUTION].w);
sprintf(buf, "#RSMi%07d#RSSi%07d", s->val[OPT_RESOLUTION].w, s->val[OPT_RESOLUTION].w);
} else {
sprintf(buf, "#RSMd%03d", s->val[OPT_RESOLUTION].w);
sprintf(buf, "#RSMd%03d#RSSd%03d", s->val[OPT_RESOLUTION].w, s->val[OPT_RESOLUTION].w);
}
strcat(cmd, buf);

Wyświetl plik

@ -136,8 +136,6 @@ struct epsonds_device
SANE_Bool has_tpu; /* tpu */
SANE_Range tpu_x_range; /* transparency unit x range */
SANE_Range tpu_y_range; /* transparency unit y range */
SANE_Bool has_stripes_bug; /* artifacts at 300 dpi */
};
typedef struct epsonds_device epsonds_device;