From 58912f68c2489bcee787599837447e0d64dfd61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 24 May 2017 21:03:56 +0200 Subject: New upstream version 1.0.27 --- backend/epson2-ops.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'backend/epson2-ops.c') diff --git a/backend/epson2-ops.c b/backend/epson2-ops.c index eac01b0..1ba2292 100644 --- a/backend/epson2-ops.c +++ b/backend/epson2-ops.c @@ -2087,7 +2087,6 @@ e2_block_read(struct Epson_Scanner *s) { SANE_Status status; SANE_Bool reorder = SANE_FALSE; - SANE_Bool needStrangeReorder = SANE_FALSE; START_READ: DBG(18, "%s: begin\n", __func__); @@ -2149,22 +2148,6 @@ e2_block_read(struct Epson_Scanner *s) * are doing this here: */ - /* - * Some scanners (e.g. the Perfection 1640 and GT-2200) seem - * to have the R and G channels swapped. - * The GT-8700 is the Asian version of the Perfection 1640. - * If the scanner name is one of these and the scan mode is - * RGB then swap the colors. - */ - - /* never used, beta testers required */ - needStrangeReorder = - (strstr(s->hw->model, "GT-2200") || - ((strstr(s->hw->model, "1640") - && strstr(s->hw->model, "Perfection")) - || strstr(s->hw->model, "GT-8700"))) - && s->params.format == SANE_FRAME_RGB; - /* * Certain Perfection 1650 also need this re-ordering of the two * color channels. These scanners are identified by the problem -- cgit v1.2.3 From 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 31 Jul 2019 16:59:49 +0200 Subject: New upstream version 1.0.28 --- backend/epson2-ops.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'backend/epson2-ops.c') diff --git a/backend/epson2-ops.c b/backend/epson2-ops.c index 1ba2292..ba0d9cb 100644 --- a/backend/epson2-ops.c +++ b/backend/epson2-ops.c @@ -66,7 +66,7 @@ * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set bay * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set threshold * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set focus position - * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request focus position + * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request focus position * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request extended identity * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request scanner status * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @@ -160,7 +160,7 @@ e2_dev_init(Epson_Device *dev, const char *devname, int conntype) dev->need_double_vertical = SANE_FALSE; dev->cct_profile = &epson_cct_profiles[0]; /* default profile */ - + dev->cmd = &epson_cmd[EPSON_LEVEL_DEFAULT]; /* Change default level when using a network connection */ @@ -936,8 +936,8 @@ e2_set_extended_scanning_parameters(Epson_Scanner * s) } if (s->val[OPT_MODE].w == MODE_INFRARED) { - /* only infrared in TPU mode (NOT in TPU2 or flatbeth) - * XXX investigate this ... only tested on GT-X800 + /* only infrared in TPU mode (NOT in TPU2 or flatbeth) + * XXX investigate this ... only tested on GT-X800 */ if (extensionCtrl == 1) /* test for TPU */ -- cgit v1.2.3