diff --git a/backend/epsonds-ops.c b/backend/epsonds-ops.c index ce6acfbd2..f7a07fb26 100644 --- a/backend/epsonds-ops.c +++ b/backend/epsonds-ops.c @@ -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 || diff --git a/backend/epsonds.c b/backend/epsonds.c index 829426d8f..3faf31923 100644 --- a/backend/epsonds.c +++ b/backend/epsonds.c @@ -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); diff --git a/backend/epsonds.h b/backend/epsonds.h index 084fb664a..c6c09095c 100644 --- a/backend/epsonds.h +++ b/backend/epsonds.h @@ -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;