From 24af8c80d9dbe9ce42e3e609529a8adb813d5c8b Mon Sep 17 00:00:00 2001 From: Oliver Schirrmeister Date: Thu, 4 Mar 2004 12:37:41 +0000 Subject: [PATCH] enabled dropoutcolor for fi4x20C --- ChangeLog | 3 +++ backend/fujitsu.c | 21 +++------------------ 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index be6c94552..e84be5e02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2004-03-04 Oliver Schirrmeister + * backend/fujitsu.c + enabled dropoutcolor for fi4x20C 2004-03-04 Oliver Schirrmeister * backend/fujitsu.c enabled dropoutcolor for fi4530C diff --git a/backend/fujitsu.c b/backend/fujitsu.c index 5f212e832..a696d9e48 100644 --- a/backend/fujitsu.c +++ b/backend/fujitsu.c @@ -127,8 +127,8 @@ - inverted the image in mode color and grayscale - jpg hardware compression support (fi-4530C) 04-Mrz-2004 (oschirr@abm.de) - - enabled option dropoutcolor for the fi-4530C - + - enabled option dropoutcolor for the fi-4530C, and fi-4x20C + SANE FLOW DIAGRAM - sane_init() : initialize backend, attach scanners @@ -7459,7 +7459,6 @@ setDefaults3091 (struct fujitsu *scanner) scanner->opt[OPT_MATRIX4X4].cap = SANE_CAP_INACTIVE; scanner->opt[OPT_MATRIX5X5].cap = SANE_CAP_INACTIVE; - scanner->opt[OPT_DROPOUT_COLOR].cap = SANE_CAP_INACTIVE; scanner->dropout_color = MSEL_dropout_DEFAULT; scanner->sleep_time = 15; @@ -7618,11 +7617,6 @@ setMode3096 (struct fujitsu *scanner, int mode) scanner->opt[OPT_Y_RES].constraint_type = SANE_CONSTRAINT_WORD_LIST; scanner->opt[OPT_Y_RES].constraint.word_list = allowableResolutionsBW; */ - if (scanner->has_dropout_color) - { - scanner->opt[OPT_DROPOUT_COLOR].cap = - SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT; - } /* verify that the currently set resolutions aren't out of order */ /* - for this specific scanner that's not necessary since */ @@ -7662,11 +7656,7 @@ setMode3096 (struct fujitsu *scanner, int mode) scanner->opt[OPT_Y_RES].constraint_type = SANE_CONSTRAINT_WORD_LIST; scanner->opt[OPT_Y_RES].constraint.word_list = allowableResolutionsBW; */ - if (scanner->has_dropout_color) - { - scanner->opt[OPT_DROPOUT_COLOR].cap = - SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT; - } + /* verify that the currently set resolutions aren't out of order */ /* - for this specific scanner that's not necessary since */ /* monochrome mode supports the superset of resolutions */ @@ -7711,11 +7701,6 @@ setMode3096 (struct fujitsu *scanner, int mode) scanner->opt[OPT_Y_RES].constraint.word_list = allowableResolutionsGray; */ - if (scanner->has_dropout_color) - { - scanner->opt[OPT_DROPOUT_COLOR].cap = - SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT; - } /* verify that the currently set resolutions aren't out of order */ /* if (scanner->resolution_x == 240)